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

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

Merge "Make Resources.Theme.rebase() public API"

parents 1987dfa0 173f573a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12357,6 +12357,7 @@ package android.content.res { 
    method @NonNull public android.content.res.TypedArray obtainStyledAttributes(@NonNull @StyleableRes int[]);

    method @NonNull public android.content.res.TypedArray obtainStyledAttributes(@StyleRes int, @NonNull @StyleableRes int[]) throws android.content.res.Resources.NotFoundException;

    method @NonNull public android.content.res.TypedArray obtainStyledAttributes(@Nullable android.util.AttributeSet, @NonNull @StyleableRes int[], @AttrRes int, @StyleRes int);

    method public void rebase();

    method public boolean resolveAttribute(int, android.util.TypedValue, boolean);

    method public void setTo(android.content.res.Resources.Theme);

  }

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

+0 −2
Original line number Diff line number Diff line
@@ -1721,8 +1721,6 @@ public class Resources { 
         * Rebases the theme against the parent Resource object's current

         * configuration by re-applying the styles passed to

         * {@link #applyStyle(int, boolean)}.

         *

         * @hide

         */

        public void rebase() {

            mThemeImpl.rebase();