Merge "Make Drawable RTL APIs public"

Author: Fabrice Di Meglio

api/current.txt

@@ -9065,6 +9065,7 @@ package android.graphics.drawable {
     method public int getMinimumWidth();
     method public abstract int getOpacity();
     method public boolean getPadding(android.graphics.Rect);
+    method public int getResolvedLayoutDirectionSelf();
     method public int[] getState();
     method public android.graphics.Region getTransparentRegion();
     method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
@@ -9099,6 +9100,10 @@ package android.graphics.drawable {
     method public abstract void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
   }
 
+  public static abstract interface Drawable.Callback2 implements android.graphics.drawable.Drawable.Callback {
+    method public abstract int getResolvedLayoutDirection(android.graphics.drawable.Drawable);
+  }
+
   public static abstract class Drawable.ConstantState {
     ctor public Drawable.ConstantState();
     method public abstract int getChangingConfigurations();
@@ -23109,7 +23114,7 @@ package android.view {
     method public void recycle();
   }
 
-  public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {
+  public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.graphics.drawable.Drawable.Callback2 android.view.KeyEvent.Callback {
     ctor public View(android.content.Context);
     ctor public View(android.content.Context, android.util.AttributeSet);
     ctor public View(android.content.Context, android.util.AttributeSet, int);

core/java/android/widget/ImageView.java

@@ -193,9 +193,6 @@ public void invalidateDrawable(Drawable dr) {
         }
     }
 
-    /**
-     * @hide
-     */
     @Override
     public int getResolvedLayoutDirection(Drawable dr) {
         return (dr == mDrawable) ?

core/java/android/widget/ProgressBar.java

@@ -910,9 +910,6 @@ public void invalidateDrawable(Drawable dr) {
         }
     }
 
-    /**
-     * @hide
-     */
     @Override
     public int getResolvedLayoutDirection(Drawable who) {
         return (who == mProgressDrawable || who == mIndeterminateDrawable) ?

core/java/android/widget/TextView.java

@@ -4396,9 +4396,6 @@ public void invalidateDrawable(Drawable drawable) {
         }
     }
 
-    /**
-     * @hide
-     */
     @Override
     public int getResolvedLayoutDirection(Drawable who) {
         if (who == null) return View.LAYOUT_DIRECTION_LTR;

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

@@ -24,7 +24,6 @@
 import android.graphics.*;
 import android.view.Gravity;
 import android.util.AttributeSet;
-import android.view.View;
 
 import java.io.IOException;
 

graphics/java/android/graphics/drawable/Drawable.java

@@ -296,8 +296,6 @@ public static interface Callback {
 
     /**
      * Implement this interface if you want to create an drawable that is RTL aware
-     *
-     * @hide
      */
     public static interface Callback2 extends Callback {
         /**
@@ -387,8 +385,6 @@ public void unscheduleSelf(Runnable what) {
     /**
      * Use the current {@link android.graphics.drawable.Drawable.Callback2} implementation to get
      * the resolved layout direction of this Drawable.
-     *
-     * @hide
      */
     public int getResolvedLayoutDirectionSelf() {
         final Callback callback = getCallback();

graphics/java/android/graphics/drawable/ScaleDrawable.java

@@ -24,7 +24,6 @@
 import android.graphics.*;
 import android.view.Gravity;
 import android.util.AttributeSet;
-import android.view.View;
 
 import java.io.IOException;