Update touch selection notification names, add ESTABLISHED.

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 org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeActivity;
@@ skipping 36 matching lines @@
     private final Handler mRunnableHandler;
     private final float mPxToDp;
     private final Pattern mContainsWordPattern;
 
     private String mSelectedText;
     private SelectionType mSelectionType;
     private boolean mWasTapGestureDetected;
     private boolean mIsSelectionBeingModified;
     private boolean mWasLastTapValid;
     private boolean mIsWaitingForInvalidTapDetection;
+    private boolean mIsSelectionDissolved;
     private boolean mShouldHandleSelectionModification;
     private boolean mDidExpandSelection;
 
     private float mX;
     private float mY;
 
     private class ContextualSearchGestureStateListener extends GestureStateListener {
         @Override
         public void onScrollStarted(int scrollOffsetY, int scrollExtentY) {
             mHandler.handleScroll();
@@ skipping 103 matching lines @@
         }
         if (mIsSelectionBeingModified) {
             mSelectedText = selection;
             mHandler.handleSelectionModification(selection, mX, mY);
         } else if (mWasTapGestureDetected) {
             mSelectedText = selection;
             mSelectionType = SelectionType.TAP;
             handleSelection(selection, mSelectionType);
             mWasTapGestureDetected = false;
         }
+        mIsSelectionDissolved = false;
     }
 
     /**
      * Handles a notification that a selection event took place.
      * @param eventType The type of event that took place.
      * @param posXPix The x coordinate of the selection start handle.
      * @param posYPix The y coordinate of the selection start handle.
      */
     void handleSelectionEvent(int eventType, float posXPix, float posYPix) {
         boolean shouldHandleSelection = false;
         switch (eventType) {
-            case SelectionEventType.SELECTION_SHOWN:
+            case SelectionEventType.SELECTION_HANDLES_SHOWN:
                 mWasTapGestureDetected = false;
                 mSelectionType = SelectionType.LONG_PRESS;
                 shouldHandleSelection = true;
+                mIsSelectionDissolved = false;

[jdduke (slow), 2015/07/16 22:34:40]

Please use the inverse of this, SELECTION_ESTABLISHED, to set the bit.

[Donn Denman, 2015/07/16 22:53:09]

Done.

                 break;
-            case SelectionEventType.SELECTION_CLEARED:
+            case SelectionEventType.SELECTION_HANDLES_CLEARED:
                 mHandler.handleSelectionDismissal();
                 resetAllStates();
                 break;
-            case SelectionEventType.SELECTION_DRAG_STARTED:
+            case SelectionEventType.SELECTION_HANDLE_DRAG_STARTED:
                 mIsSelectionBeingModified = true;
                 break;
-            case SelectionEventType.SELECTION_DRAG_STOPPED:
+            case SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED:
                 mIsSelectionBeingModified = false;
                 shouldHandleSelection = mShouldHandleSelectionModification;
                 break;
+            case SelectionEventType.SELECTION_DISSOLVED:
+                mIsSelectionDissolved = true;
+                break;

[jdduke (slow), 2015/07/16 22:34:40]

It's a bit of a shame to keep this bit solely for tests =/. Don't have a strong
opinion though. Maybe rename the boolean to "mSelectionEstablished" so it can
start of in a more "truthful" state?

[Donn Denman, 2015/07/16 22:53:09]

On 2015/07/16 22:34:40, jdduke wrote:
Don't have a strong
Good point!  Done.
I'll check in the next CL to see if this notification will help us get rid of
the OnSingleTap API.

             default:
         }
 
         if (shouldHandleSelection) {
             ContentViewCore baseContentView = getBaseContentView();
             if (baseContentView != null) {
                 String selection = baseContentView.getSelectedText();
                 if (selection != null) {
                     mX = posXPix;
                     mY = posYPix;
                     mSelectedText = selection;
                     handleSelection(selection, SelectionType.LONG_PRESS);
                 }
             }
         }
     }
 
     /**
      * Re-enables selection modification handling and invokes
      * ContextualSearchSelectionHandler.handleSelection().
      * @param selection The text that was selected.
      * @param type The type of selection made by the user.
      */
     private void handleSelection(String selection, SelectionType type) {
         mShouldHandleSelectionModification = true;
         mHandler.handleSelection(selection, isValidSelection(selection), type, mX, mY);
     }
 
-
     /**
      * Resets all internal state of this class, including the tap state.
      */
     private void resetAllStates() {
         resetSelectionStates();
         mWasLastTapValid = false;
     }
 
     /**
      * Resets all of the internal state of this class that handles the selection.
@@ skipping 110 matching lines @@
     }
 
     /**
      * @return whether a tap gesture has been detected, for testing.
      */
     @VisibleForTesting
     boolean wasAnyTapGestureDetected() {
         return mIsWaitingForInvalidTapDetection;
     }
 
+    /**
+     * @return whether the selection has been dissolved, for testing.
+     */
+    @VisibleForTesting
+    boolean isSelectionDissolved() {
+        return mIsSelectionDissolved;
+    }
+
     /** Determines if the given selection is valid or not.
      * @param selection The selection portion of the context.
      * @return whether the given selection is considered a valid target for a search.
      */
     private boolean isValidSelection(String selection) {
         return isValidSelection(selection, getBaseContentView());
     }
 
     @VisibleForTesting
     boolean isValidSelection(String selection, ContentViewCore baseContentView) {
         if (selection.length() > MAX_SELECTION_LENGTH || !doesContainAWord(selection)) {
             return false;
         }
         return baseContentView != null && !baseContentView.isFocusedNodeEditable();
     }
 
     /**
      * Determines if the given selection contains a word or not.
      * @param selection The the selection to check for a word.
      * @return Whether the selection contains a word anywhere within it or not.
      */
     @VisibleForTesting
     public boolean doesContainAWord(String selection) {
         return mContainsWordPattern.matcher(selection).find();
     }
 }