diff options
| author | 2018-09-05 23:33:57 +0000 | |
|---|---|---|
| committer | 2018-09-05 23:33:57 +0000 | |
| commit | b1559cdfacaed48290fa3598ff816f8676e7943a (patch) | |
| tree | 87b66d0c138d1fdf7f9e0783c4e4e1a668a0fdfd | |
| parent | 900fa92042ba1f1e28280f4df1231b3ede65274d (diff) | |
| parent | 071149a9e74b1855742379f11995be1cdf59e066 (diff) | |
Merge "API Review: StateListDrawables#getDrawableForState"
| -rwxr-xr-x | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/StateListDrawable.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 47a0811ef16c..8bdafa9c2755 100755 --- a/api/current.txt +++ b/api/current.txt @@ -15137,9 +15137,9 @@ 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 int findStateDrawableIndex(int[]); method public int getStateCount(); method public android.graphics.drawable.Drawable getStateDrawable(int); - method public int getStateDrawableIndex(int[]); method public int[] getStateSet(int); } diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 0da47fd802b3..18838090f58b 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -545,7 +545,7 @@ public class PopupWindow { StateListDrawable stateList = (StateListDrawable) mBackground; // Find the above-anchor view - this one's easy, it should be labeled as such. - int aboveAnchorStateIndex = stateList.getStateDrawableIndex(ABOVE_ANCHOR_STATE_SET); + int aboveAnchorStateIndex = stateList.findStateDrawableIndex(ABOVE_ANCHOR_STATE_SET); // Now, for the below-anchor view, look for any other drawable specified in the // StateListDrawable which is not for the above-anchor state and use that. diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index 8de8f813283f..2855227a1002 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -280,7 +280,7 @@ public class StateListDrawable extends DrawableContainer { * @see #getStateDrawable(int) * @see #getStateSet(int) */ - public int getStateDrawableIndex(int[] stateSet) { + public int findStateDrawableIndex(int[] stateSet) { return mStateListState.indexOfStateSet(stateSet); } |