drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide touch feedback drawable and wrapper"

Browse Source
This commit is contained in:
Alan Viverette
2014-03-25 02:55:27 +00:00
committed by Android (Google) Code Review
parent 5da8ca9189 840dede901
commit eebf17ad20
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/current.txt
View File

@ -10614,6 +10614,30 @@ package android.graphics.drawable {
method public final void setVariablePadding(boolean); method public final void setVariablePadding(boolean);
} }
public class DrawableWrapper extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
ctor public DrawableWrapper();
method public void draw(android.graphics.Canvas);
method public android.graphics.Rect getDirtyBounds();
method protected final android.graphics.drawable.Drawable getDrawable();
method public int getOpacity();
method public final int[] getState();
method public void invalidateDrawable(android.graphics.drawable.Drawable);
method public void scheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable, long);
method public void setAlpha(int);
method public final void setBounds(int, int, int, int);
method public final void setBounds(android.graphics.Rect);
method public void setColorFilter(android.graphics.ColorFilter);
method protected void setConstantState(android.graphics.drawable.DrawableWrapper.WrapperState, android.content.res.Resources);
method protected final void setDrawable(android.graphics.drawable.Drawable, android.content.res.Resources);
method public final boolean setState(int[]);
method public void setXfermode(android.graphics.Xfermode);
method public void unscheduleDrawable(android.graphics.drawable.Drawable, java.lang.Runnable);
}
public static abstract class DrawableWrapper.WrapperState extends android.graphics.drawable.Drawable.ConstantState {
method public int getChangingConfigurations();
}
public class GradientDrawable extends android.graphics.drawable.Drawable { public class GradientDrawable extends android.graphics.drawable.Drawable {
ctor public GradientDrawable(); ctor public GradientDrawable();
ctor public GradientDrawable(android.graphics.drawable.GradientDrawable.Orientation, int[]); ctor public GradientDrawable(android.graphics.drawable.GradientDrawable.Orientation, int[]);
@ -10809,6 +10833,9 @@ package android.graphics.drawable {
method public void addState(int[], android.graphics.drawable.Drawable); method public void addState(int[], android.graphics.drawable.Drawable);
} }
public class TouchFeedbackDrawable extends android.graphics.drawable.DrawableWrapper {
}
public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback { public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {
ctor public TransitionDrawable(android.graphics.drawable.Drawable[]); ctor public TransitionDrawable(android.graphics.drawable.Drawable[]);
method public boolean isCrossFadeEnabled(); method public boolean isCrossFadeEnabled();

4
graphics/java/android/graphics/drawable/DrawableWrapper.java
View File

@ -25,7 +25,7 @@ import android.graphics.Xfermode;
/** /**
* A Drawable that wraps another Drawable. * A Drawable that wraps another Drawable.
*/ */
class DrawableWrapper extends Drawable implements Drawable.Callback { public class DrawableWrapper extends Drawable implements Drawable.Callback {
private WrapperState mWrapperState; private WrapperState mWrapperState;
/** Local drawable backed by its own constant state. */ /** Local drawable backed by its own constant state. */
@ -300,7 +300,7 @@ class DrawableWrapper extends Drawable implements Drawable.Callback {
return mWrappedDrawable; return mWrappedDrawable;
} }
static abstract class WrapperState extends ConstantState { public static abstract class WrapperState extends ConstantState {
ConstantState mWrappedConstantState; ConstantState mWrappedConstantState;
WrapperState(WrapperState orig) { WrapperState(WrapperState orig) {

2
graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
View File

@ -41,7 +41,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
* @hide * Documentation pending.
*/ */
public class TouchFeedbackDrawable extends DrawableWrapper { public class TouchFeedbackDrawable extends DrawableWrapper {
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();