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

Commit c91531a8 authored by Tor Norbye's avatar Tor Norbye
Browse files

Fix resource type annotations for obtainStyledAttributes 

Change-Id: I7681249ff46d687675d0dcd7d4f077646efba687
parent a21e7663

core/java/android/content/Context.java

+6 −5
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.content;

package android.content;





import android.annotation.AttrRes;

import android.annotation.CheckResult;

import android.annotation.CheckResult;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;
@@ -474,8 +475,7 @@ public abstract class Context { 
     *

     *

     * @see android.content.res.Resources.Theme#obtainStyledAttributes(int[])

     * @see android.content.res.Resources.Theme#obtainStyledAttributes(int[])

     */

     */

    public final TypedArray obtainStyledAttributes(

    public final TypedArray obtainStyledAttributes(@StyleableRes int[] attrs) {

            int[] attrs) {

        return getTheme().obtainStyledAttributes(attrs);

        return getTheme().obtainStyledAttributes(attrs);

    }

    }
@@ -487,7 +487,7 @@ public abstract class Context { 
     * @see android.content.res.Resources.Theme#obtainStyledAttributes(int, int[])

     * @see android.content.res.Resources.Theme#obtainStyledAttributes(int, int[])

     */

     */

    public final TypedArray obtainStyledAttributes(

    public final TypedArray obtainStyledAttributes(

            @StyleableRes int resid, int[] attrs) throws Resources.NotFoundException {

            @StyleRes int resid, @StyleableRes int[] attrs) throws Resources.NotFoundException {

        return getTheme().obtainStyledAttributes(resid, attrs);

        return getTheme().obtainStyledAttributes(resid, attrs);

    }

    }
@@ -499,7 +499,7 @@ public abstract class Context { 
     * @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)

     * @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)

     */

     */

    public final TypedArray obtainStyledAttributes(

    public final TypedArray obtainStyledAttributes(

            AttributeSet set, int[] attrs) {

            AttributeSet set, @StyleableRes int[] attrs) {

        return getTheme().obtainStyledAttributes(set, attrs, 0, 0);

        return getTheme().obtainStyledAttributes(set, attrs, 0, 0);

    }

    }
@@ -511,7 +511,8 @@ public abstract class Context { 
     * @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)

     * @see android.content.res.Resources.Theme#obtainStyledAttributes(AttributeSet, int[], int, int)

     */

     */

    public final TypedArray obtainStyledAttributes(

    public final TypedArray obtainStyledAttributes(

            AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) {

            AttributeSet set, @StyleableRes int[] attrs, @AttrRes int defStyleAttr,

            @StyleRes int defStyleRes) {

        return getTheme().obtainStyledAttributes(

        return getTheme().obtainStyledAttributes(

            set, attrs, defStyleAttr, defStyleRes);

            set, attrs, defStyleAttr, defStyleRes);

    }

    }

core/java/android/content/res/Resources.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -16,7 +16,10 @@ 




package android.content.res;

package android.content.res;





import android.annotation.AttrRes;

import android.annotation.ColorInt;

import android.annotation.ColorInt;

import android.annotation.StyleRes;

import android.annotation.StyleableRes;

import com.android.internal.util.XmlUtils;

import com.android.internal.util.XmlUtils;





import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParser;
@@ -1473,7 +1476,7 @@ public class Resources { 
         * @see #obtainStyledAttributes(int, int[])

         * @see #obtainStyledAttributes(int, int[])

         * @see #obtainStyledAttributes(AttributeSet, int[], int, int)

         * @see #obtainStyledAttributes(AttributeSet, int[], int, int)

         */

         */

        public TypedArray obtainStyledAttributes(int[] attrs) {

        public TypedArray obtainStyledAttributes(@StyleableRes int[] attrs) {

            final int len = attrs.length;

            final int len = attrs.length;

            final TypedArray array = TypedArray.obtain(Resources.this, len);

            final TypedArray array = TypedArray.obtain(Resources.this, len);

            array.mTheme = this;

            array.mTheme = this;
@@ -1501,7 +1504,8 @@ public class Resources { 
         * @see #obtainStyledAttributes(int[])

         * @see #obtainStyledAttributes(int[])

         * @see #obtainStyledAttributes(AttributeSet, int[], int, int)

         * @see #obtainStyledAttributes(AttributeSet, int[], int, int)

         */

         */

        public TypedArray obtainStyledAttributes(int resid, int[] attrs) throws NotFoundException {

        public TypedArray obtainStyledAttributes(@StyleRes int resid, @StyleableRes int[] attrs)

                throws NotFoundException {

            final int len = attrs.length;

            final int len = attrs.length;

            final TypedArray array = TypedArray.obtain(Resources.this, len);

            final TypedArray array = TypedArray.obtain(Resources.this, len);

            array.mTheme = this;

            array.mTheme = this;
@@ -1584,7 +1588,7 @@ public class Resources { 
         * @see #obtainStyledAttributes(int, int[])

         * @see #obtainStyledAttributes(int, int[])

         */

         */

        public TypedArray obtainStyledAttributes(AttributeSet set,

        public TypedArray obtainStyledAttributes(AttributeSet set,

                int[] attrs, int defStyleAttr, int defStyleRes) {

                @StyleableRes int[] attrs, @AttrRes int defStyleAttr, @StyleRes int defStyleRes) {

            final int len = attrs.length;

            final int len = attrs.length;

            final TypedArray array = TypedArray.obtain(Resources.this, len);

            final TypedArray array = TypedArray.obtain(Resources.this, len);