Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev

Author: Dianne Hackborn

api/17.txt

@@ -9354,7 +9354,6 @@ package android.graphics.drawable {
     method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
     method public void setAlpha(int);
     method public void setColorFilter(android.graphics.ColorFilter);
-    method public void setLayoutDirection(int);
     method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
     field public static final int HORIZONTAL = 1; // 0x1
     field public static final int VERTICAL = 2; // 0x2
@@ -9546,7 +9545,6 @@ package android.graphics.drawable {
     method public boolean setDrawableByLayerId(int, android.graphics.drawable.Drawable);
     method public void setId(int, int);
     method public void setLayerInset(int, int, int, int, int);
-    method public void setLayoutDirection(int);
     method public void setOpacity(int);
     method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
   }
@@ -9640,7 +9638,6 @@ package android.graphics.drawable {
   public class StateListDrawable extends android.graphics.drawable.DrawableContainer {
     ctor public StateListDrawable();
     method public void addState(int[], android.graphics.drawable.Drawable);
-    method public void setLayoutDirection(int);
   }
 
   public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {

api/current.txt

@@ -413,7 +413,7 @@ public static class VERSION_CODES {
         public static final int JELLY_BEAN = 16;
 
         /**
-         * Moar jelly beans!
+         * Android 4.2: Moar jelly beans!
          *
          * <p>Applications targeting this or a later release will get these
          * new changes in behavior:</p>
@@ -422,6 +422,12 @@ public static class VERSION_CODES {
          * {@code false}. See
          * <a href="{@docRoot}guide/topics/manifest/provider-element.html#exported">
          * the android:exported section</a> in the provider documentation for more details.</li>
+         * <li>{@link android.view.View#getLayoutDirection() View.getLayoutDirection()}
+         * can return different values than {@link android.view.View#LAYOUT_DIRECTION_LTR}
+         * based on the locale etc.
+         * <li> {@link android.webkit.WebView#addJavascriptInterface(Object, String)
+         * WebView.addJavascriptInterface} requires explicit annotations on methods
+         * for them to be accessible from Javascript.
          * </ul>
          */
         public static final int JELLY_BEAN_MR1 = 17;

core/java/android/os/Build.java

@@ -1981,9 +1981,9 @@
   <public type="attr" name="importantForAccessibility" id="0x010103aa" />
   <public type="attr" name="keyboardLayout" id="0x010103ab" />
   <public type="attr" name="fontFamily" id="0x010103ac" />
-
   <public type="attr" name="mediaRouteButtonStyle" id="0x010103ad" />
   <public type="attr" name="mediaRouteTypes" id="0x010103ae" />
+
   <public type="style" name="Widget.Holo.MediaRouteButton" id="0x010301d5" />
   <public type="style" name="Widget.Holo.Light.MediaRouteButton" id="0x010301d6" />
   <public type="style" name="Widget.DeviceDefault.MediaRouteButton" id="0x010301d7" />
@@ -1993,30 +1993,35 @@
      Resources added in version 17 of the platform (Jelly Bean MR1)
      =============================================================== -->
   <eat-comment />
-  <public type="attr" name="supportsRtl" />
-  <public type="attr" name="textDirection" />
-  <public type="attr" name="textAlignment" />
-  <public type="attr" name="layoutDirection" />
-  <public type="attr" name="paddingStart"/>
-  <public type="attr" name="paddingEnd"/>
-  <public type="attr" name="layout_marginStart"/>
-  <public type="attr" name="layout_marginEnd"/>
-  <public type="attr" name="layout_toStartOf" />
-  <public type="attr" name="layout_toEndOf" />
-  <public type="attr" name="layout_alignStart" />
-  <public type="attr" name="layout_alignEnd" />
-  <public type="attr" name="layout_alignParentStart" />
-  <public type="attr" name="layout_alignParentEnd" />
-  <public type="attr" name="listPreferredItemPaddingStart" />
-  <public type="attr" name="listPreferredItemPaddingEnd" />
-  <public type="attr" name="singleUser" />
-  <public type="attr" name="presentationTheme" />
-  <public type="attr" name="subtypeId"/>
-  <public type="attr" name="initialKeyguardLayout" />
-  <public type="attr" name="widgetFeatures" />
-  <public type="attr" name="widgetCategory" />
-  <public type="attr" name="permissionGroupFlags" />
-  <public type="attr" name="labelFor" />
-  <public type="attr" name="permissionFlags" />
+  <public type="attr" name="supportsRtl" id="0x010103af" />
+  <public type="attr" name="textDirection" id="0x010103b0" />
+  <public type="attr" name="textAlignment" id="0x010103b1" />
+  <public type="attr" name="layoutDirection" id="0x010103b2" />
+  <public type="attr" name="paddingStart" id="0x010103b3" />
+  <public type="attr" name="paddingEnd" id="0x010103b4" />
+  <public type="attr" name="layout_marginStart" id="0x010103b5" />
+  <public type="attr" name="layout_marginEnd" id="0x010103b6" />
+  <public type="attr" name="layout_toStartOf" id="0x010103b7" />
+  <public type="attr" name="layout_toEndOf" id="0x010103b8" />
+  <public type="attr" name="layout_alignStart" id="0x010103b9" />
+  <public type="attr" name="layout_alignEnd" id="0x010103ba" />
+  <public type="attr" name="layout_alignParentStart" id="0x010103bb" />
+  <public type="attr" name="layout_alignParentEnd" id="0x010103bc" />
+  <public type="attr" name="listPreferredItemPaddingStart" id="0x010103bd" />
+  <public type="attr" name="listPreferredItemPaddingEnd" id="0x010103be" />
+  <public type="attr" name="singleUser" id="0x010103bf" />
+  <public type="attr" name="presentationTheme" id="0x010103c0" />
+  <public type="attr" name="subtypeId" id="0x010103c1" />
+  <public type="attr" name="initialKeyguardLayout" id="0x010103c2" />
+  <public type="attr" name="widgetFeatures" id="0x010103c3" />
+  <public type="attr" name="widgetCategory" id="0x010103c4" />
+  <public type="attr" name="permissionGroupFlags" id="0x010103c5" />
+  <public type="attr" name="labelFor" id="0x010103c6" />
+  <public type="attr" name="permissionFlags" id="0x010103c7" />
 
+
+<!-- ===============================================================
+     Resources added in next version of platform
+     =============================================================== -->
+
 </resources>

core/res/res/values/public.xml

@@ -239,6 +239,7 @@ public ConstantState getConstantState() {
         return null;
     }
 
+    /** @hide */
     @Override
     public void setLayoutDirection(int layoutDirection) {
         mClipState.mDrawable.setLayoutDirection(layoutDirection);

graphics/java/android/graphics/drawable/ClipDrawable.java

@@ -590,6 +590,7 @@ public Drawable mutate() {
         return this;
     }
 
+    /** @hide */
     @Override
     public void setLayoutDirection(int layoutDirection) {
         if (getLayoutDirection() != layoutDirection) {

graphics/java/android/graphics/drawable/LayerDrawable.java

@@ -261,6 +261,7 @@ public Drawable mutate() {
         return this;
     }
 
+    /** @hide */
     @Override
     public void setLayoutDirection(int layoutDirection) {
         final int numStates = getStateCount();