Don't keep the text selected after it's copied. (MozillaReality#2342)

lissyx · Jan 21, 2020 · 1b37d35 · 1b37d35
1 parent 210aec4
commit 1b37d35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -603,6 +603,7 @@ public void onAction(String action) {
                     } else if (action.equals(GeckoSession.SelectionActionDelegate.ACTION_COPY) && selectionValid) {
                         String selectedText = mBinding.urlEditText.getText().toString().substring(startSelection, endSelection);
                         clipboard.setPrimaryClip(ClipData.newPlainText("text", selectedText));
+                        mBinding.urlEditText.setSelection(endSelection);
                     } else if (action.equals(GeckoSession.SelectionActionDelegate.ACTION_PASTE) && clipboard.hasPrimaryClip()) {
                         ClipData.Item item = clipboard.getPrimaryClip().getItemAt(0);
                         if (selectionValid) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -1676,6 +1676,11 @@ public void onAction(String action) {
                 if (aSelection.isActionAvailable(action)) {
                     aSelection.execute(action);
                 }
+                if (GeckoSession.SelectionActionDelegate.ACTION_COPY.equals(action) &&
+                        aSelection.isActionAvailable(GeckoSession.SelectionActionDelegate.ACTION_UNSELECT)) {
+                    // Don't keep the text selected after it's copied.
+                    aSelection.execute(GeckoSession.SelectionActionDelegate.ACTION_UNSELECT);
+                }
             }
 
             @Override