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

Commit e461d549 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Remove unsafe methods that take TypedArray" into lmp-dev

parents e9939c11 5171dee2

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -39119,9 +39119,7 @@ package android.widget { 
    method public float getShadowRadius();

    method public final boolean getShowSoftInputOnFocus();

    method public java.lang.CharSequence getText();

    method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);

    method public final android.content.res.ColorStateList getTextColors();

    method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);

    method public java.util.Locale getTextLocale();

    method public float getTextScaleX();

    method public float getTextSize();

api/removed.txt

+9 −0
Original line number Diff line number Diff line
@@ -70,3 +70,12 @@ package android.view.inputmethod { 


}



package android.widget {



  public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {

    method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);

    method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);

  }



}

core/java/android/widget/TextView.java

+4 −0
Original line number Diff line number Diff line
@@ -8178,6 +8178,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * Returns the TextView_textColor attribute from the TypedArray, if set, or

     * the TextAppearance_textColor from the TextView_textAppearance attribute,

     * if TextView_textColor was not set directly.

     *

     * @removed

     */

    public static ColorStateList getTextColors(Context context, TypedArray attrs) {

        // It's not safe to use this method from apps. The parameter 'attrs'
@@ -8205,6 +8207,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * AttributeSet, if set, or the default color from the

     * TextAppearance_textColor from the TextView_textAppearance attribute, if

     * TextView_textColor was not set directly.

     *

     * @removed

     */

    public static int getTextColor(Context context, TypedArray attrs, int def) {

        final ColorStateList colors = getTextColors(context, attrs);