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

Commit 51ec6d97 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by android-build-merger
Browse files

Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev 

am: fc1d11ed

* commit 'fc1d11ed':
  Make hasTransientState be true only if user created selection is active.

Change-Id: Ic28caa1dea935da7b6408282fb0266c889c29050
parents 7fc8b9ce fc1d11ed

core/java/android/widget/Editor.java

+3 −0
Original line number Diff line number Diff line
@@ -3640,6 +3640,9 @@ public class Editor { 
            }



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

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

                    mTextView.setHasTransientState(true);

                }

                return true;

            } else {

                return false;

core/java/android/widget/TextView.java

+4 −6
Original line number Diff line number Diff line
@@ -8289,14 +8289,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    newSelEnd = Selection.getSelectionEnd(buf);

                }



                if (newSelStart == newSelEnd && hasTransientState()) {

                    setHasTransientState(false);

                } else if (newSelStart != newSelEnd && !hasTransientState()) {

                    setHasTransientState(true);

                }



                if (mEditor != null) {

                    mEditor.refreshTextActionMode();

                    if (!hasSelection() && mEditor.mTextActionMode == null && hasTransientState()) {

                        // User generated selection has been removed.

                        setHasTransientState(false);

                    }

                }

                onSelectionChanged(newSelStart, newSelEnd);

            }

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

+22 −0
Original line number Diff line number Diff line
@@ -675,4 +675,26 @@ public class TextViewActivityTest extends ActivityInstrumentationTestCase2<TextV 
        assertFloatingToolbarContainsItem(

                getActivity().getString(com.android.internal.R.string.copy));

    }



    @SmallTest

    public void testTransientState() throws Exception {

        final String text = "abc def";

        onView(withId(R.id.textview)).perform(click());

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



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

        assertFalse(textView.hasTransientState());



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

        // hasTransientState should return true when user generated selection is active.

        assertTrue(textView.hasTransientState());

        onView(withId(R.id.textview)).perform(clickOnTextAtIndex(text.indexOf('d')));

        // hasTransientState should return false as the selection has been cleared.

        assertFalse(textView.hasTransientState());

        textView.post(

                () -> Selection.setSelection((Spannable) textView.getText(), 0, text.length()));

        getInstrumentation().waitForIdleSync();

        // hasTransientState should return false when selection is created by API.

        assertFalse(textView.hasTransientState());

    }

}