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

Commit 26454141 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Fix selection expansion detection logic. 

The logic to detect vertical expansion is inverted on RTL
text. As a result, the selection handle cannot be moved
when it's dragged toward vertically expanding and
horizontally shrinking direction.

Bug: 25893288
Change-Id: I096595d287261b1287862c6ad27ae7f6f0a73262
parent 5f71b5af

core/java/android/widget/Editor.java

+7 −2
Original line number Diff line number Diff line
@@ -4223,10 +4223,15 @@ public class Editor { 


            boolean isExpanding;

            final float xDiff = x - mPrevX;

            if (isStartHandle()) {

                isExpanding = currLine < mPreviousLineTouched;

            } else {

                isExpanding = currLine > mPreviousLineTouched;

            }

            if (atRtl == isStartHandle()) {

                isExpanding = xDiff > 0 || currLine > mPreviousLineTouched;

                isExpanding |= xDiff > 0;

            } else {

                isExpanding = xDiff < 0 || currLine < mPreviousLineTouched;

                isExpanding |= xDiff < 0;

            }



            if (mTextView.getHorizontallyScrolling()) {

core/tests/coretests/res/layout/activity_text_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 
    <EditText

            android:id="@+id/textview"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />

            android:layout_height="wrap_content" />



</LinearLayout>

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

+34 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static android.widget.espresso.FloatingToolbarEspressoUtils.assertFloatin 
import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.action.ViewActions.click;

import static android.support.test.espresso.action.ViewActions.pressKey;

import static android.support.test.espresso.action.ViewActions.replaceText;

import static android.support.test.espresso.action.ViewActions.typeTextIntoFocusedView;

import static android.support.test.espresso.assertion.ViewAssertions.matches;

import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
@@ -218,6 +219,39 @@ public class TextViewActivityTest extends ActivityInstrumentationTestCase2<TextV 
        onView(withId(R.id.textview)).check(hasSelection("abcd\nefg\nhijk\nlmn\nopqr"));

    }



    @SmallTest

    public void testSelectionHandles_multiLine_rtl() throws Exception {

        // Arabic text.

        final String text = "\u062A\u062B\u062C\n" + "\u062D\u062E\u062F\n"

                + "\u0630\u0631\u0632\n" + "\u0633\u0634\u0635\n" + "\u0636\u0637\u0638\n"

                + "\u0639\u063A\u063B";

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

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

        onView(withId(R.id.textview)).perform(clickOnTextAtIndex(text.length()));

        onView(withId(R.id.textview)).perform(doubleClickOnTextAtIndex(text.indexOf('\u0634')));



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

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

                .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('\u062E')));

        onView(withId(R.id.textview)).check(hasSelection(

                text.substring(text.indexOf('\u062D'), text.indexOf('\u0635') + 1)));



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

                .perform(dragHandle(textView, Handle.SELECTION_START, text.indexOf('\u062A')));

        onView(withId(R.id.textview)).check(hasSelection(

                text.substring(text.indexOf('\u062A'), text.indexOf('\u0635') + 1)));



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

                .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('\u0638')));

        onView(withId(R.id.textview)).check(hasSelection(

                text.substring(text.indexOf('\u062A'), text.indexOf('\u0638') + 1)));



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

                .perform(dragHandle(textView, Handle.SELECTION_END, text.indexOf('\u063B')));

        onView(withId(R.id.textview)).check(hasSelection(text));

    }





    @SmallTest

    public void testSelectionHandles_doesNotPassAnotherHandle() throws Exception {

        final String text = "abcd efg hijk lmn";