From e2dbbce0dd8e2d221bf19eb314ac29bc7b3990a1 Mon Sep 17 00:00:00 2001 From: Adam He Date: Wed, 25 Mar 2020 13:30:24 -0700 Subject: Fix single field highlighting for autofill. Bug: 150953184 Test: manual verification Change-Id: I0519fe7c1d1d08cbee4c1703c1ad263a6eb7ef20 --- core/java/android/view/View.java | 2 +- core/java/android/view/autofill/AutofillManager.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 708a09467247..68f436bbe9eb 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -3474,7 +3474,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 */ diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 39a9ed4a82e7..267a5a6561af 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -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); -- cgit v1.2.3-59-g8ed1b