Blink handle selection handle visibility

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.contextualsearch;
 
 import android.os.Handler;
+import android.text.TextUtils;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchBlacklist.BlacklistReason;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.ui.touch_selection.SelectionEventType;
@@ skipping 44 matching lines @@
     private final float mPxToDp;
     private final Pattern mContainsWordPattern;
 
     private String mSelectedText;
     private SelectionType mSelectionType;
     private boolean mWasTapGestureDetected;
     // Reflects whether the last tap was valid and whether we still have a tap-based selection.
     private ContextualSearchTapState mLastTapState;
     private TapSuppressionHeuristics mTapHeuristics;
     private boolean mIsWaitingForInvalidTapDetection;
-    private boolean mIsSelectionEstablished;
     private boolean mShouldHandleSelectionModification;
     private boolean mDidExpandSelection;
 
     // Position of the selection.
     private float mX;
     private float mY;
 
     // The time of the most last scroll activity, or 0 if none.
     private long mLastScrollTimeNs;
 
@@ skipping 206 matching lines @@
                     unscheduleInvalidTapNotification();
                 }
                 break;
             case SelectionEventType.SELECTION_HANDLES_CLEARED:
                 mHandler.handleSelectionDismissal();
                 resetAllStates();
                 break;
             case SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED:
                 shouldHandleSelection = mShouldHandleSelectionModification;
                 break;
-            case SelectionEventType.SELECTION_ESTABLISHED:
-                mIsSelectionEstablished = true;
-                break;
-            case SelectionEventType.SELECTION_DISSOLVED:
-                mIsSelectionEstablished = false;
-                break;
             default:
         }
 
         if (shouldHandleSelection) {
             ContentViewCore baseContentView = getBaseContentView();
             if (baseContentView != null) {
                 String selection = baseContentView.getSelectedText();
                 if (selection != null) {
                     mX = posXPix;
                     mY = posYPix;
@@ skipping 191 matching lines @@
 
     /**
      * @return whether a tap gesture has been detected, for testing.
      */
     @VisibleForTesting
     boolean wasAnyTapGestureDetected() {
         return mIsWaitingForInvalidTapDetection;
     }
 
     /**
-     * @return whether the selection has been established, for testing.
+     * @return whether selection is empty, for testing.
      */
     @VisibleForTesting
-    boolean isSelectionEstablished() {
-        return mIsSelectionEstablished;
+    boolean isSelectionEmpty() {
+        return TextUtils.isEmpty(mSelectedText);
     }
 
     /**
      * Evaluates whether the given selection is valid and notifies the handler about potential
      * selection suppression.
      * TODO(pedrosimonetti): substitute this once the system supports suppressing selections.
      * @param selection The given selection.
      * @return Whether the selection is valid.
      */
     private boolean validateSelectionSuppression(String selection) {
@@ skipping 69 matching lines @@
         // Starts are inclusive and ends are non-inclusive for both GSAContext & matcher.
         while (matcher.find()) {
             if (startOffset >= matcher.start() && endOffset <= matcher.end()) {
                 return true;
             }
         }
 
         return false;
     }
 }