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

Commit deb2f49f authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

Show selection handles even when toolbar is empty. 

Bug: 64245206
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Change-Id: I2e985b12865bc3786f25b88bf6738048cc0e05a4
parent a51bf213

core/java/android/widget/Editor.java

+3 −7
Original line number Diff line number Diff line
@@ -3842,14 +3842,10 @@ public class Editor { 
                mProcessTextIntentActionsHandler.onInitializeMenu(menu);

            }



            if (menu.hasVisibleItems() || mode.getCustomView() != null) {

            if (mHasSelection && !mTextView.hasTransientState()) {

                mTextView.setHasTransientState(true);

            }

            return true;

            } else {

                return false;

            }

        }



        private Callback getCustomCallback() {

core/tests/coretests/src/android/widget/TextViewActivityTest.java

+35 −0
Original line number Diff line number Diff line
@@ -636,6 +636,41 @@ public class TextViewActivityTest { 
        onView(withId(R.id.textview)).check(hasSelection("hijk"));

    }



    @Test

    public void testSelectionHandles_visibleEvenWithEmptyMenu() {

        ((TextView) mActivity.findViewById(R.id.textview)).setCustomSelectionActionModeCallback(

                new ActionMode.Callback() {

                    @Override

                    public boolean onCreateActionMode(ActionMode mode, Menu menu) {

                        menu.clear();

                        return true;

                    }



                    @Override

                    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {

                        menu.clear();

                        return true;

                    }



                    @Override

                    public boolean onActionItemClicked(ActionMode mode, MenuItem item) {

                        return false;

                    }



                    @Override

                    public void onDestroyActionMode(ActionMode mode) {}

                });

        final String text = "abcd efg hijk lmn";

        onView(withId(R.id.textview)).perform(replaceText(text));



        onView(withId(R.id.textview)).perform(longPressOnTextAtIndex(text.indexOf('f')));



        onHandleView(com.android.internal.R.id.selection_start_handle)

                .check(matches(isDisplayed()));

        onHandleView(com.android.internal.R.id.selection_end_handle)

                .check(matches(isDisplayed()));

    }



    @Test

    public void testSetSelectionAndActionMode() throws Throwable {

        final TextView textView = mActivity.findViewById(R.id.textview);