Enable Text Selection Action Mode for seach boxes and action bar components.

Pre-M, these were disabled as the ActionMode would be rendered
in the ActionBar, obscuring the originating view. Now that we have
Floating Toolbars, this is no longer the case.

Also the TextViews in this situation used to show the paste popup
which has now been removed, so they require the floating toolbar to
avoid regressions.

BUG: 20205351
Change-Id: Ifdc96c3b0db5b40c890ae807c26b76aa2992edbc

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index c719a0e..b1a5d21 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -643,6 +643,10 @@ public class SearchDialog extends Dialog {
         @Override
         public ActionMode startActionModeForChild(
                 View child, ActionMode.Callback callback, int type) {
+            // Disable Primary Action Modes in the SearchBar, as they overlap.
+            if (type != ActionMode.TYPE_PRIMARY) {
+                return super.startActionModeForChild(child, callback, type);
+            }
             return null;
         }
     }