From 1b37d3506472065199c5bf04b05dc7cdee6a1203 Mon Sep 17 00:00:00 2001 From: Imanol Fernandez Date: Thu, 21 Nov 2019 20:33:17 +0100 Subject: [PATCH] Don't keep the text selected after it's copied. (#2342) --- .../org/mozilla/vrbrowser/ui/views/NavigationURLBar.java | 1 + .../org/mozilla/vrbrowser/ui/widgets/WindowWidget.java | 5 +++++ 2 files changed, 6 insertions(+) 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 index bcb48bb8d..c16a9dc9a 100644 --- 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 index 556477b40..f4a736824 100644 --- 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