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

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

Ignore smart selection for multi-word selections. 

Test: See: Ic273fd68f300671d8e7c0dabe4a3ae9470056fcc
Bug: 34831428
Bug: 34778597
Bug: 34778381
Change-Id: Ib15828996081a72f02f5075acac1f2f6c51d3601
parent 1275a924

core/java/android/widget/Editor.java

+5 −4
Original line number Diff line number Diff line
@@ -1984,12 +1984,12 @@ public class Editor { 
                if (mRestartActionModeOnNextRefresh) {

                    // To avoid distraction, newly start action mode only when selection action

                    // mode is being restarted.

                    startSelectionActionMode(getTextClassifierInfo(true));

                    startSelectionActionMode(null);

                }

            } else if (selectionController == null || !selectionController.isActive()) {

                // Insertion action mode is active. Avoid dismissing the selection.

                stopTextActionModeWithPreservingSelection();

                startSelectionActionMode(getTextClassifierInfo(true));

                startSelectionActionMode(null);

            } else {

                mTextActionMode.invalidateContentRect();

            }
@@ -5496,8 +5496,9 @@ public class Editor { 
                    resetDragAcceleratorState();



                    if (mTextView.hasSelection()) {

                        // TODO: Do not invoke the text assistant if this was a drag selection.

                        startSelectionActionMode(getTextClassifierInfo(true));

                        // Do not invoke the text assistant if this was a drag selection.

                        startSelectionActionMode(

                                mHaventMovedEnoughToStartDrag ? getTextClassifierInfo(true) : null);

                    }

                    break;

            }