Merge "Unhide touch feedback drawable and wrapper" (eebf17ad) · Commits · e / os / android_frameworks_base

api/current.txt

+27 −0

Original line number	Diff line number	Diff line
		@@ -10614,6 +10614,30 @@ package android.graphics.drawable {
		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 {
		ctor public GradientDrawable();
		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);
		}

		public class TouchFeedbackDrawable extends android.graphics.drawable.DrawableWrapper {
		}

		public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {
		ctor public TransitionDrawable(android.graphics.drawable.Drawable[]);
		method public boolean isCrossFadeEnabled();

graphics/java/android/graphics/drawable/DrawableWrapper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.graphics.Xfermode;
		/**
		* A Drawable that wraps another Drawable.
		*/
		class DrawableWrapper extends Drawable implements Drawable.Callback {
		public class DrawableWrapper extends Drawable implements Drawable.Callback {
		private WrapperState mWrapperState;

		/** Local drawable backed by its own constant state. */
		@@ -300,7 +300,7 @@ class DrawableWrapper extends Drawable implements Drawable.Callback {
		return mWrappedDrawable;
		}

		static abstract class WrapperState extends ConstantState {
		public static abstract class WrapperState extends ConstantState {
		ConstantState mWrappedConstantState;

		WrapperState(WrapperState orig) {

graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import java.io.IOException;
		import java.util.ArrayList;

		/**
		* @hide
		* Documentation pending.
		*/
		public class TouchFeedbackDrawable extends DrawableWrapper {
		private final Rect mTempRect = new Rect();