commit 54523413f8897c7149a47c5786ab796e0ab0aed1
author Svet Ganov <svetoslavganov@google.com> Wed Apr 26 15:53:26 2017 -0700
committer Svet Ganov <svetoslavganov@google.com> Thu Apr 27 12:32:08 2017 -0700
tree e50fe4439f007b05623adb014e42362b164277b1
parent 38439169bd855886b6f1f90e844864838adc362b

Force autofill on overflow only if empty

Test: manual

bug:37244196

Change-Id: I0953546492ade815617d30f698e92282a1172302

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 4ae3510..27e3fe5 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -3836,9 +3836,11 @@
             }
 
             if (mTextView.canRequestAutofill()) {
+                final int mode = mTextView.getText().length() <= 0
+                        ? MenuItem.SHOW_AS_ACTION_IF_ROOM : MenuItem.SHOW_AS_ACTION_NEVER;
                 menu.add(Menu.NONE, TextView.ID_AUTOFILL, MENU_ITEM_ORDER_AUTOFILL,
                         com.android.internal.R.string.autofill)
-                        .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+                        .setShowAsAction(mode);
             }
 
             updateSelectAllItem(menu);