commit a22aa8806b571b7cf7aa3f1aaa9918988a2ccc31
author Alan Viverette <alanv@google.com> Wed May 21 23:37:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 21 23:40:07 2014 +0000
tree a4c52b110af82e219ad05245de6a7faa3c9ed548
parent 7ec5b2e5a3da9c69df087311f4e480b45bfaf8c8
parent 53a3ed7c46c12c2e578d1b1df8b039c6db690eaa

Merge "Clean up hotspot bounds API"

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

diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 3ef1d68..d6fb9e0 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -495,7 +495,7 @@
     /**
      * Sets the bounds to which the hotspot is constrained, if they should be
      * different from the drawable bounds.
-     * 
+     *
      * @param left
      * @param top
      * @param right

graphics/java/android/graphics/drawable/DrawableContainer.java

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index ec5c6c6..04373d4 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -245,6 +245,13 @@
     }
 
     @Override
+    public void setHotspotBounds(int left, int top, int right, int bottom) {
+        if (mCurrDrawable != null) {
+            mCurrDrawable.setHotspotBounds(left, top, right, bottom);
+        }
+    }
+
+    @Override
     protected boolean onStateChange(int[] state) {
         if (mLastDrawable != null) {
             return mLastDrawable.setState(state);

graphics/java/android/graphics/drawable/InsetDrawable.java

diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java
index 3749339..2fa5929 100644
--- a/graphics/java/android/graphics/drawable/InsetDrawable.java
+++ b/graphics/java/android/graphics/drawable/InsetDrawable.java
@@ -192,6 +192,11 @@
     }
 
     @Override
+    public void setHotspotBounds(int left, int top, int right, int bottom) {
+        mInsetState.mDrawable.setHotspotBounds(left, top, right, bottom);
+    }
+
+    @Override
     public boolean setVisible(boolean visible, boolean restart) {
         mInsetState.mDrawable.setVisible(visible, restart);
         return super.setVisible(visible, restart);

graphics/java/android/graphics/drawable/LayerDrawable.java

diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index f446000..2e47d3a 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -571,6 +571,15 @@
     }
 
     @Override
+    public void setHotspotBounds(int left, int top, int right, int bottom) {
+        final ChildDrawable[] array = mLayerState.mChildren;
+        final int N = mLayerState.mNum;
+        for (int i = 0; i < N; i++) {
+            array[i].mDrawable.setHotspotBounds(left, top, right, bottom);
+        }
+    }
+
+    @Override
     public boolean setVisible(boolean visible, boolean restart) {
         final boolean changed = super.setVisible(visible, restart);
         final ChildDrawable[] array = mLayerState.mChildren;

graphics/java/android/graphics/drawable/RippleDrawable.java

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 6776e66..add3d84 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -460,9 +460,6 @@
         invalidateSelf();
     }
 
-    /**
-     * @hide
-     */
     @Override
     public void setHotspotBounds(int left, int top, int right, int bottom) {
         mOverrideBounds = true;