From 840dede901e6247f3bb55009c1500f8623829375 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 24 Mar 2014 19:54:34 -0700
Subject: [PATCH] Unhide touch feedback drawable and wrapper

Change-Id: I98926d4adfb6e8c6130b31c8f4534a1a382d0f3b
---
 api/current.txt                               | 27 +++++++++++++++++++
 .../graphics/drawable/DrawableWrapper.java    |  4 +--
 .../drawable/TouchFeedbackDrawable.java       |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 453204e880c6b..2ba5e5c4da031 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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();
diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java
index e6a755fd9a106..2eb7b90388042 100644
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -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) {
diff --git a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
index ef91494da3b59..47a93746d6029 100644
--- a/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
+++ b/graphics/java/android/graphics/drawable/TouchFeedbackDrawable.java
@@ -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();