Merge "API 23 is now the latest." into studio-1.3-release

5 files changed, 9 insertions, 6 deletions

diff --git a/device_validator/dvlib/src/main/resources/com/android/dvlib/devices-2.xsd b/device_validator/dvlib/src/main/resources/com/android/dvlib/devices-2.xsd
index be7c368e66..fdd35cf3e8 100644
--- a/device_validator/dvlib/src/main/resources/com/android/dvlib/devices-2.xsd
+++ b/device_validator/dvlib/src/main/resources/com/android/dvlib/devices-2.xsd
@@ -518,6 +518,7 @@
                         <xsd:enumeration value="280dpi" />
                         <xsd:enumeration value="xhdpi" />
                         <xsd:enumeration value="400dpi" />
+                        <xsd:enumeration value="420dpi" />
                         <xsd:enumeration value="xxhdpi" />
                         <xsd:enumeration value="560dpi" />
                         <xsd:enumeration value="xxxhdpi" />
diff --git a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/Bridge.java b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/Bridge.java
index 16af2483c0..9e6d77c900 100644
--- a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/Bridge.java
+++ b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/Bridge.java
@@ -35,7 +35,7 @@ import java.util.Map;
 @SuppressWarnings({"MethodMayBeStatic", "UnusedDeclaration"})
 public abstract class Bridge {
 
-    public static final int API_CURRENT = 15;
+    public static final int API_CURRENT = 16;
 
     /**
      * Returns the API level of the layout library.
diff --git a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java
index ec7da145f9..5fe7a3fa85 100644
--- a/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java
+++ b/layoutlib-api/src/main/java/com/android/ide/common/rendering/api/ResourceValue.java
@@ -25,7 +25,7 @@ import com.android.resources.ResourceType;
 @SuppressWarnings("deprecation")
 public class ResourceValue extends ResourceReference implements IResourceValue {
     private final ResourceType mType;
-    protected String mValue = null;
+    protected String mValue;
 
     public ResourceValue(ResourceType type, String name, boolean isFramework) {
         super(name, isFramework);
diff --git a/layoutlib-api/src/main/java/com/android/resources/Density.java b/layoutlib-api/src/main/java/com/android/resources/Density.java
index 15c81f5cc3..e6bfe7fdea 100644
--- a/layoutlib-api/src/main/java/com/android/resources/Density.java
+++ b/layoutlib-api/src/main/java/com/android/resources/Density.java
@@ -26,6 +26,7 @@ public enum Density implements ResourceEnum {
     XXXHIGH("xxxhdpi", "XXX-High Density", 640, 18), //$NON-NLS-1$
     DPI_560("560dpi",  "560 DPI Density",  560,  1), //$NON-NLS-1$
     XXHIGH( "xxhdpi",  "XX-High Density",  480, 16), //$NON-NLS-1$
+    DPI_420("420dpi",  "420 DPI Density",  420, 23), //$NON-NLS-1$
     DPI_400("400dpi",  "400 DPI Density",  400,  1), //$NON-NLS-1$
     DPI_360("360dpi",  "360 DPI Density",  360, 23), //$NON-NLS-1$
     XHIGH(  "xhdpi",   "X-High Density",   320,  8), //$NON-NLS-1$
@@ -143,6 +144,7 @@ public enum Density implements ResourceEnum {
             case DPI_280:
             case DPI_360:
             case DPI_400:
+            case DPI_420:
             case DPI_560:
                 return false;
             default:
diff --git a/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java b/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
index cfedbf1a8f..6d6491b740 100755
--- a/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/SdkVersionInfo.java
@@ -35,7 +35,7 @@ public class SdkVersionInfo {
     /**
      * Like {@link #HIGHEST_KNOWN_API} but does not include preview platforms
      */
-    public static final int HIGHEST_KNOWN_STABLE_API = 22;
+    public static final int HIGHEST_KNOWN_STABLE_API = 23;
 
    /**
     * The lowest active API level in the ecosystem. This number will change over time
@@ -90,7 +90,7 @@ public class SdkVersionInfo {
             case 20: return "4.4";
             case 21: return "5.0";
             case 22: return "5.1";
-            case 23: return "5.X";
+            case 23: return "6.0";
             // If you add more versions here, also update #getBuildCodes and
             // #HIGHEST_KNOWN_API
 
@@ -136,7 +136,7 @@ public class SdkVersionInfo {
             case 22:
                 return "Lollipop";
             case 23:
-                return "MNC";
+                return "Marshmallow";
 
             // If you add more versions here, also update #getBuildCodes and
             // #HIGHEST_KNOWN_API
@@ -180,7 +180,7 @@ public class SdkVersionInfo {
             case 20: return "KITKAT_WATCH"; //$NON-NLS-1$
             case 21: return "LOLLIPOP"; //$NON-NLS-1$
             case 22: return "LOLLIPOP_MR1"; //$NON-NLS-1$
-            case 23: return "MNC"; //$NON-NLS-1$
+            case 23: return "MARSHMALLOW"; //$NON-NLS-1$
             // If you add more versions here, also update #getAndroidName and
             // #HIGHEST_KNOWN_API
         }