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

Commit d5a51a82 authored by Nader Jawad's avatar Nader Jawad Committed by Android (Google) Code Review
Browse files

Merge "Removed the @hide annotation on various StateListDrawable APIs to...

Merge "Removed the @hide annotation on various StateListDrawable APIs to better match the API surface exposed in ColorStateList."
parents c1b66305 4f614c88
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -15070,6 +15070,10 @@ 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 getStateCount();
    method public android.graphics.drawable.Drawable getStateDrawable(int);
    method public int getStateDrawableIndex(int[]);
    method public int[] getStateSet(int);
  }
  public class TransitionDrawable extends android.graphics.drawable.LayerDrawable implements android.graphics.drawable.Drawable.Callback {
+0 −4
Original line number Diff line number Diff line
@@ -1066,10 +1066,6 @@ Landroid/graphics/drawable/NinePatchDrawable;->mNinePatchState:Landroid/graphics
Landroid/graphics/drawable/RippleDrawable$RippleState;->mColor:Landroid/content/res/ColorStateList;
Landroid/graphics/drawable/RippleDrawable;->mState:Landroid/graphics/drawable/RippleDrawable$RippleState;
Landroid/graphics/drawable/StateListDrawable;->extractStateSet(Landroid/util/AttributeSet;)[I
Landroid/graphics/drawable/StateListDrawable;->getStateCount()I
Landroid/graphics/drawable/StateListDrawable;->getStateDrawable(I)Landroid/graphics/drawable/Drawable;
Landroid/graphics/drawable/StateListDrawable;->getStateDrawableIndex([I)I
Landroid/graphics/drawable/StateListDrawable;->getStateSet(I)[I
Landroid/graphics/drawable/StateListDrawable;->mStateListState:Landroid/graphics/drawable/StateListDrawable$StateListState;
Landroid/graphics/drawable/StateListDrawable;->updateStateFromTypedArray(Landroid/content/res/TypedArray;)V
Landroid/graphics/drawable/VectorDrawable$VGroup;->setRotation(F)V
+8 −12
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@

package android.graphics.drawable;

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.util.AttributeSet;
import android.util.StateSet;

import com.android.internal.R;

import org.xmlpull.v1.XmlPullParser;
@@ -24,14 +32,6 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.util.Arrays;

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.Theme;
import android.util.AttributeSet;
import android.util.StateSet;

/**
 * Lets you assign a number of graphic images to a single Drawable and swap out the visible item by a string
 * ID value.
@@ -235,7 +235,6 @@ public class StateListDrawable extends DrawableContainer {
     * Gets the number of states contained in this drawable.
     *
     * @return The number of states contained in this drawable.
     * @hide pending API council
     * @see #getStateSet(int)
     * @see #getStateDrawable(int)
     */
@@ -248,7 +247,6 @@ public class StateListDrawable extends DrawableContainer {
     *
     * @param index The index of the state set.
     * @return The state set at the index.
     * @hide pending API council
     * @see #getStateCount()
     * @see #getStateDrawable(int)
     */
@@ -261,7 +259,6 @@ public class StateListDrawable extends DrawableContainer {
     *
     * @param index The index of the drawable.
     * @return The drawable at the index.
     * @hide pending API council
     * @see #getStateCount()
     * @see #getStateSet(int)
     */
@@ -274,7 +271,6 @@ public class StateListDrawable extends DrawableContainer {
     *
     * @param stateSet the state set to look up
     * @return the index of the provided state set, or -1 if not found
     * @hide pending API council
     * @see #getStateDrawable(int)
     * @see #getStateSet(int)
     */