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

Merge "Fix selection expansion detection logic."

Browse Source
This commit is contained in:
Keisuke Kuroyanagi
2015-12-10 07:18:21 +00:00
committed by Android (Google) Code Review
parent 155aecb18b 26454141a8
commit ff37557795
3 changed files with 44 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

@@ -4299,10 +4299,15 @@ public class Editor {
boolean isExpanding;
final float xDiff = x - mPrevX;
if (atRtl == isStartHandle()) {
isExpanding = xDiff > 0 || currLine > mPreviousLineTouched;
if (isStartHandle()) {
isExpanding = currLine < mPreviousLineTouched;
} else {
isExpanding = xDiff < 0 || currLine < mPreviousLineTouched;
isExpanding = currLine > mPreviousLineTouched;
}
if (atRtl == isStartHandle()) {
isExpanding |= xDiff > 0;
} else {
isExpanding |= xDiff < 0;
}
if (mTextView.getHorizontallyScrolling()) {

4
core/tests/coretests/res/layout/activity_text_view.xml
View File

@@ -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>
</LinearLayout>

34
core/tests/coretests/src/android/widget/TextViewActivityTest.java
View File

@@ -31,6 +31,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.ViewMatchers.isDisplayed;
@@ -213,6 +214,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";