Selection Action mode triggered like a context menu

content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.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.content.browser;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipData;
@@ skipping 100 matching lines @@
 
     private boolean mEditable;
     private boolean mIsPasswordType;
     private boolean mIsInsertion;
     private boolean mCanSelectAllForPastePopup;
     private boolean mCanEditRichlyForPastePopup;
 
     private boolean mUnselectAllOnDismiss;
     private String mLastSelectedText;
 
-    // Tracks whether a selection is currently active.  When applied to selected text, indicates
-    // whether the last selected text is still highlighted.
-    private boolean mHasSelection;
-
     // Lazily created paste popup menu, triggered either via long press in an
     // editable region or from tapping the insertion handle.
     private PastePopupMenu mPastePopupMenu;
     private boolean mWasPastePopupShowingOnInsertionDragStart;
 
     // The client that processes textual selection, or null if none exists.
     private SelectionClient mSelectionClient;
 
     // The classificaton result of the selected text if the selection exists and
     // SmartSelectionProvider was able to classify it, otherwise null.
@@ skipping 34 matching lines @@
                 final long hideDuration = getDefaultHideDuration();
                 // Ensure the next hide call occurs before the ActionMode reappears.
                 mView.postDelayed(mRepeatingHideRunnable, hideDuration - 1);
                 hideActionModeTemporarily(hideDuration);
             }
         };
 
         mSelectionClient =
                 SmartSelectionClient.create(new SmartSelectionCallback(), window, webContents);
 
+        mLastSelectedText = "";
         // TODO(timav): Use android.R.id.textAssist for the Assist item id once we switch to
         // Android O SDK and remove |mAssistMenuItemId|.
         if (BuildInfo.isAtLeastO()) {
             mAssistMenuItemId =
                     mContext.getResources().getIdentifier("textAssist", "id", "android");
         }
 
         nativeInit(webContents);
     }
 
@@ skipping 27 matching lines @@
     // True if action mode is initialized to a working (not a no-op) mode.
     private boolean isActionModeSupported() {
         return mCallback != EMPTY_CALLBACK;
     }
 
     @Override
     public void setAllowedMenuItems(int allowedMenuItems) {
         mAllowedMenuItems = allowedMenuItems;
     }
 
+    public void showSelectionMenu(int left, int top, int right, int bottom, boolean isEditable,
+            boolean isPasswordType, String selectionText, boolean canSelectAll,
+            boolean canRichlyEdit, boolean shouldSuggest) {
+        mSelectionRect.set(left, top, right, bottom);
+        mEditable = isEditable;
+        mLastSelectedText = selectionText;
+        mIsPasswordType = isPasswordType;
+        mCanSelectAllForPastePopup = canSelectAll;
+        mCanEditRichlyForPastePopup = canRichlyEdit;
+        mUnselectAllOnDismiss = true;
+        if (hasSelection()) {
+            if (mSelectionClient != null
+                    && mSelectionClient.requestSelectionPopupUpdates(shouldSuggest)) {
+                // Rely on |mSelectionClient| sending a classification request and the request
+                // always calling onClassified() callback.
+                mPendingShowActionMode = true;
+            } else {
+                showActionModeOrClearOnFailure();
+            }
+
+        } else {
+            createAndShowPastePopup();
+        }
+    }
+
     /**
      * Show (activate) android action mode by starting it.
      *
      * <p>Action mode in floating mode is tried first, and then falls back to
      * a normal one.
      * <p> If the action mode cannot be created the selection is cleared.
      */
     public void showActionModeOrClearOnFailure() {
         mPendingShowActionMode = false;
 
-        if (!isActionModeSupported() || !mHasSelection) return;
+        if (!isActionModeSupported() || !hasSelection()) return;
 
         // Just refresh the view if action mode already exists.
         if (isActionModeValid()) {
             // Try/catch necessary for framework bug, crbug.com/446717.
             try {
                 mActionMode.invalidate();
             } catch (NullPointerException e) {
                 Log.w(TAG, "Ignoring NPE from ActionMode.invalidate() as workaround for L", e);
             }
             hideActionMode(false);
@@ skipping 14 matching lines @@
         if (!isActionModeValid()) clearSelection();
     }
 
     @TargetApi(Build.VERSION_CODES.M)
     private ActionMode startFloatingActionMode() {
         ActionMode actionMode = mView.startActionMode(
                 new FloatingActionModeCallback(this, mCallback), ActionMode.TYPE_FLOATING);
         return actionMode;
     }
 
-    void createAndShowPastePopup(
-            int left, int top, int right, int bottom, boolean canSelectAll, boolean canEditRichly) {
+    private void createAndShowPastePopup() {
         if (mView.getParent() == null || mView.getVisibility() != View.VISIBLE) {
             return;
         }
 
         if (!supportsFloatingActionMode() && !canPaste()) return;
         destroyPastePopup();
-        mSelectionRect.set(left, top, right, bottom);
-        mCanSelectAllForPastePopup = canSelectAll;
-        mCanEditRichlyForPastePopup = canEditRichly;
         PastePopupMenuDelegate delegate = new PastePopupMenuDelegate() {
             @Override
             public void paste() {
                 mWebContents.paste();
                 mWebContents.dismissTextHandles();
             }
 
             @Override
             public void pasteAsPlainText() {
                 mWebContents.pasteAsPlainText();
@@ skipping 194 matching lines @@
         updateAssistMenuItem(descriptor);
 
         // TODO(ctzsm): Remove "paste as plain text" for now, need to add it back when
         // crrev.com/2785853002 landed.
         descriptor.removeItem(R.id.select_action_menu_paste_as_plain_text);
 
         if (!isSelectionEditable() || !canPaste()) {
             descriptor.removeItem(R.id.select_action_menu_paste);
         }
 
-        if (isInsertion()) {
+        if (!hasSelection()) {
             descriptor.removeItem(R.id.select_action_menu_select_all);
             descriptor.removeItem(R.id.select_action_menu_cut);
             descriptor.removeItem(R.id.select_action_menu_copy);
             descriptor.removeItem(R.id.select_action_menu_share);
             descriptor.removeItem(R.id.select_action_menu_web_search);
             return descriptor;
         }
 
         if (!isSelectionEditable()) {
             descriptor.removeItem(R.id.select_action_menu_cut);
@@ skipping 216 matching lines @@
         }
     }
 
     /**
      * Perform a select all action.
      */
     @VisibleForTesting
     void selectAll() {
         mWebContents.selectAll();
         mClassificationResult = null;
-        if (needsActionMenuUpdate()) showActionModeOrClearOnFailure();
-
         // Even though the above statement logged a SelectAll user action, we want to
         // track whether the focus was in an editable field, so log that too.
         if (isSelectionEditable()) {
             RecordUserAction.record("MobileActionMode.SelectAllWasEditable");
         } else {
             RecordUserAction.record("MobileActionMode.SelectAllWasNonEditable");
         }
     }
 
     /**
@@ skipping 156 matching lines @@
             return isAllowedByClient && isShareAvailable();
         }
         return isAllowedByClient;
     }
 
     @Override
     public void onReceivedProcessTextResult(int resultCode, Intent data) {
         if (mWebContents == null || resultCode != Activity.RESULT_OK || data == null) return;
 
         // Do not handle the result if no text is selected or current selection is not editable.
-        if (!mHasSelection || !isSelectionEditable()) return;
+        if (!hasSelection() || !isSelectionEditable()) return;

[yosin_UTC9, 2017/05/25 04:47:20]

It is better to have another patch to replace |mHasSelection| to
|hasSelection()|.

[amaralp1, 2017/05/25 07:11:56]

Done. https://codereview.chromium.org/2904033002

 
         CharSequence result = data.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT);
         if (result != null) {
             // TODO(hush): Use a variant of replace that re-selects the replaced text.
             // crbug.com/546710
             mWebContents.replace(result.toString());
         }
     }
 
     void restoreSelectionPopupsIfNecessary() {
-        if (mHasSelection && !isActionModeValid()) {
+        if (hasSelection() && !isActionModeValid()) {
             showActionModeOrClearOnFailure();
         }
     }
 
     // All coordinates are in DIP.
     @CalledByNative
     private void onSelectionEvent(int eventType, int left, int top, int right, int bottom) {
         // Ensure the provided selection coordinates form a non-empty rect, as required by
         // the selection action mode.
         if (left == right) ++right;
         if (top == bottom) ++bottom;
         switch (eventType) {
             case SelectionEventType.SELECTION_HANDLES_SHOWN:
-                mSelectionRect.set(left, top, right, bottom);
-                mHasSelection = true;
-                mUnselectAllOnDismiss = true;
-                if (mSelectionClient != null
-                        && mSelectionClient.requestSelectionPopupUpdates(true /* suggest */)) {
-                    // Rely on |mSelectionClient| sending a classification request and the request
-                    // always calling onClassified() callback.
-                    mPendingShowActionMode = true;
-                } else {
-                    showActionModeOrClearOnFailure();
-                }
                 break;
 
             case SelectionEventType.SELECTION_HANDLES_MOVED:
                 mSelectionRect.set(left, top, right, bottom);
                 if (mPendingShowActionMode) {
                     showActionModeOrClearOnFailure();
                 } else {
                     invalidateContentRect();
                 }
                 break;
 
             case SelectionEventType.SELECTION_HANDLES_CLEARED:
-                mHasSelection = false;
+                mLastSelectedText = "";
                 mUnselectAllOnDismiss = false;
                 mSelectionRect.setEmpty();
                 if (mSelectionClient != null) mSelectionClient.cancelAllRequests();
                 finishActionMode();
                 break;
 
             case SelectionEventType.SELECTION_HANDLE_DRAG_STARTED:
                 hideActionMode(true);
                 break;
 
             case SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED:
-                if (mSelectionClient != null
-                        && mSelectionClient.requestSelectionPopupUpdates(false /* suggest */)) {
-                    // Rely on |mSelectionClient| sending a classification request and the request
-                    // always calling onClassified() callback.
-                } else {
-                    hideActionMode(false);
-                }
+                mWebContents.showContextMenuAtTouchHandle(left, bottom);
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_SHOWN:
                 mSelectionRect.set(left, top, right, bottom);
                 mIsInsertion = true;
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_MOVED:
                 mSelectionRect.set(left, top, right, bottom);
                 if (!mScrollInProgress && isPastePopupShowing()) {
@@ skipping 101 matching lines @@
             mIsPasswordType = isPassword;
             if (isActionModeValid()) mActionMode.invalidate();
         }
     }
 
     /**
      * @return Whether the page has an active, touch-controlled selection region.
      */
     @VisibleForTesting
     public boolean hasSelection() {
-        return mHasSelection;
+        return mLastSelectedText.length() != 0;
     }
 
     @Override
     public String getSelectedText() {
-        return mHasSelection ? mLastSelectedText : "";
+        return mLastSelectedText;
     }
 
     private boolean isShareAvailable() {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setType("text/plain");
         return mContext.getPackageManager().queryIntentActivities(intent,
                 PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
     }
 
     // TODO(timav): Use |TextClassifier| instead of |Object| after we switch to Android SDK 26.
@@ skipping 20 matching lines @@
      */
     public Object getCustomTextClassifier() {
         return mSelectionClient == null ? null : mSelectionClient.getCustomTextClassifier();
     }
 
     // The callback class that delivers result from a SmartSelectionClient.
     private class SmartSelectionCallback implements SmartSelectionProvider.ResultCallback {
         @Override
         public void onClassified(SmartSelectionProvider.Result result) {
             // If the selection does not exist any more, discard |result|.
-            if (!mHasSelection) {
+            if (!hasSelection()) {
                 assert !mHidden;
                 assert mClassificationResult == null;
                 mPendingShowActionMode = false;
                 return;
             }
 
             // Do not allow classifier to shorten the selection. If the suggested selection is
             // smaller than the original we throw away classification result and show the menu.
             // TODO(amaralp): This was added to fix the SelectAll problem in
             // http://crbug.com/714106. Once we know the cause of the original selection we can
@@ skipping 25 matching lines @@
                 if (mPendingShowActionMode) return;
             }
 
             // Rely on this method to clear |mHidden| and unhide the action mode.
             showActionModeOrClearOnFailure();
         }
     };
 
     private native void nativeInit(WebContents webContents);
 }