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

Commit 8556efe5 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between... 

am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread

Merge commit 'a29643a6' into gingerbread-plus-aosp

* commit 'a29643a6':
  DO NOT MERGE. Select word no longer selects spaces between words.
parents 196894cd a29643a6

core/java/android/widget/TextView.java

+1 −44
Original line number Diff line number Diff line
@@ -7243,49 +7243,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        int minOffset = selectionModifierCursorController.getMinTouchOffset();

        int maxOffset = selectionModifierCursorController.getMaxTouchOffset();

        

        if (minOffset == maxOffset) {

            int offset = Math.max(0, Math.min(minOffset, mTransformed.length()));



            // Tolerance, number of charaters around tapped position

            final int range = 1;

            final int max = mTransformed.length() - 1;



            // 'Smart' word selection: detect position between words

            for (int i = -range; i <= range; i++) {

                int index = offset + i;

                if (index >= 0 && index <= max) {

                    if (Character.isSpaceChar(mTransformed.charAt(index))) {

                        // Select current space

                        selectionStart = index;

                        selectionEnd = selectionStart + 1;



                        // Extend selection to maximum space range

                        while (selectionStart > 0 &&

                                Character.isSpaceChar(mTransformed.charAt(selectionStart - 1))) {

                            selectionStart--;

                        }

                        while (selectionEnd < max &&

                                Character.isSpaceChar(mTransformed.charAt(selectionEnd))) {

                            selectionEnd++;

                        }



                        Selection.setSelection((Spannable) mText, selectionStart, selectionEnd);

                        return;

                    }

                }

            }



            // 'Smart' word selection: detect position at beginning or end of text.

            if (offset <= range) {

                Selection.setSelection((Spannable) mText, 0, 0);

                return;

            }

            if (offset >= (max - range)) {

                Selection.setSelection((Spannable) mText, max + 1, max + 1);

                return;

            }

        }



        long wordLimits = getWordLimitsAt(minOffset);

        if (wordLimits >= 0) {

            selectionStart = (int) (wordLimits >>> 32);