Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1412904 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

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

am: fc4604f7

Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
parents edb9af3e fc4604f7

core/java/android/widget/Editor.java

+6 −5
Original line number Diff line number Diff line
@@ -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;

                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(mode);

                            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                }

            }



            if (mTextView.canPasteAsPlainText()) {