Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1559cdf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API Review: StateListDrawables#getDrawableForState"

parents 900fa920 071149a9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

  }

























core/java/android/widget/PopupWindow.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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.

































graphics/java/android/graphics/drawable/StateListDrawable.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);















    }