Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I38076ed005f59dbc5d0e3ca433df84e515aaae5a
This commit is contained in:
Adam He
2020-03-26 19:18:54 +00:00
committed by Automerger Merge Worker
parent 382283a150 8c9f394c33
commit 380d789877
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -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 */

3
core/java/android/view/autofill/AutofillManager.java
View File

@@ -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);