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

Merge "Don't show AUTOFILL menu when text is selected." into oc-dev

Browse Source
This commit is contained in:
Felipe Leme
2017-06-07 00:23:59 +00:00
committed by Android (Google) Code Review
parent 2c1d4f8f7b 1c1626ec76
commit 49231f183f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/Editor.java
View File

@@ -3842,11 +3842,12 @@ public class Editor {
}
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(mode);
final String selected = mTextView.getSelectedText();
if (selected == null || selected.isEmpty()) {
menu.add(Menu.NONE, TextView.ID_AUTOFILL, MENU_ITEM_ORDER_AUTOFILL,
com.android.internal.R.string.autofill)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
}
if (mTextView.canPasteAsPlainText()) {