Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev (8b3560d3) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -9346,6 +9346,7 @@ 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
		@@ -9382,7 +9383,6 @@ package android.graphics.drawable {
		method public android.graphics.drawable.Drawable getCurrent();
		method public int getIntrinsicHeight();
		method public int getIntrinsicWidth();
		method public int getLayoutDirection();
		method public final int getLevel();
		method public int getMinimumHeight();
		method public int getMinimumWidth();
		@@ -9410,7 +9410,6 @@ package android.graphics.drawable {
		method public void setColorFilter(int, android.graphics.PorterDuff.Mode);
		method public void setDither(boolean);
		method public void setFilterBitmap(boolean);
		method public void setLayoutDirection(int);
		method public final boolean setLevel(int);
		method public boolean setState(int[]);
		method public boolean setVisible(boolean, boolean);
		@@ -9539,6 +9538,7 @@ 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);
		}
		@@ -9632,6 +9632,7 @@ 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 {

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -378,6 +378,8 @@ public abstract class Drawable {
		*
		* @return One of {@link android.view.View#LAYOUT_DIRECTION_LTR},
		* {@link android.view.View#LAYOUT_DIRECTION_RTL}
		*
		* @hide
		*/
		public int getLayoutDirection() {
		return mLayoutDirection;
		@@ -388,8 +390,9 @@ public abstract class Drawable {
		* Drawable as no capacity to do the resolution on his own.
		*
		* @param layoutDirection One of {@link android.view.View#LAYOUT_DIRECTION_LTR},
		* {@link android.view.View#LAYOUT_DIRECTION_RTL},
		* {@link android.view.View#LAYOUT_DIRECTION_RTL}
		*
		* @hide
		*/
		public void setLayoutDirection(int layoutDirection) {
		if (getLayoutDirection() != layoutDirection) {