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

Commit 2ec0a4e6 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Fix single field highlighting for autofill." into rvc-dev am:... 

Merge "Fix single field highlighting for autofill." into rvc-dev am: cc45f332 am: 8c9f394c am: ba68dbfd

Change-Id: I20c0484703066bca86f977ef2964ed1bdc2d9801
parents a65b21d8 ba68dbfd

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -3475,7 +3475,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    /**

     * Flag indicating the field should not have yellow highlight when autofilled.

     */

    private static final int PFLAG4_AUTOFILL_HIDE_HIGHLIGHT = 0x100;

    private static final int PFLAG4_AUTOFILL_HIDE_HIGHLIGHT = 0x200;















    /* End of masks for mPrivateFlags4 */







































core/java/android/view/autofill/AutofillManager.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -1242,9 +1242,10 @@ public final class AutofillManager {













                if (mLastAutofilledData.containsKey(id)) {















                    value = view.getAutofillValue();















                    valueWasRead = true;













                    final boolean hideHighlight = mLastAutofilledData.keySet().size() == 1;































                    if (Objects.equals(mLastAutofilledData.get(id), value)) {













                        view.setAutofilled(true, false);













                        view.setAutofilled(true, hideHighlight);















                    } else {















                        view.setAutofilled(false, false);















                        mLastAutofilledData.remove(id);