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

Commit 2a8ff264 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Read the autofill highlight from rootView context" into oc-dev am: f51b5f99 

am: cc5a7192

Change-Id: I2a4bf3bfb8edf9129f48eb3fb1f1cef8b1579e34
parents 1d392ef5 cc5a7192

core/java/android/view/View.java

+3 −2
Original line number Diff line number Diff line
@@ -20430,9 +20430,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    @Nullable private Drawable getAutofilledDrawable() {

        // Lazily load the isAutofilled drawable.

        if (mAttachInfo.mAutofilledDrawable == null) {

            TypedArray a = mContext.getTheme().obtainStyledAttributes(AUTOFILL_HIGHLIGHT_ATTR);

            Context rootContext = getRootView().getContext();

            TypedArray a = rootContext.getTheme().obtainStyledAttributes(AUTOFILL_HIGHLIGHT_ATTR);

            int attributeResourceId = a.getResourceId(0, 0);

            mAttachInfo.mAutofilledDrawable = mContext.getDrawable(attributeResourceId);

            mAttachInfo.mAutofilledDrawable = rootContext.getDrawable(attributeResourceId);

            a.recycle();

        }