Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-09-18 14:49:10 -07:00
committed by Android (Google) Code Review
parent 20586fa035 f358260af4
commit 8b3560d3e6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -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 {

5
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -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) {