summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAdam He <adamhe@google.com>2020-03-25 13:30:24 -0700
committerAdam He <adamhe@google.com>2020-03-25 13:30:24 -0700
commite2dbbce0dd8e2d221bf19eb314ac29bc7b3990a1 (patch)
tree3f1e8aa49abefabf4b7e5eecfc46b285013c8d44 /core/java
parent65b857a25c08b8551cd9c6f0de16745757d31c9b (diff)
Fix single field highlighting for autofill.
Bug: 150953184 Test: manual verification Change-Id: I0519fe7c1d1d08cbee4c1703c1ad263a6eb7ef20
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/View.java2
-rw-r--r--core/java/android/view/autofill/AutofillManager.java3
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);