From 370ca9844fe614b5e741a3e7f6bd5ad5e1cbe905 Mon Sep 17 00:00:00 2001
From: Clara Bayarri <clarabayarri@google.com>
Date: Fri, 1 May 2015 15:21:41 +0100
Subject: [PATCH] Allow Floating ActionModes in SearchDialog.

The current implementation was always blocking them due to the override of
the typeless startActionModeForChild method. The typed method already
supports blocking PRIMARY types and lets FLOATING through, but the super
implementation always checks the typeless implementation, hence the
FLOATING action modes were also blocked.

Also cleaned up an unused field and its setter.

Change-Id: I115b4511f1b61512b293af3e53af72c22412ccb0
---
 core/java/android/app/SearchDialog.java | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java
index b1a5d214c2b9e..fa11221cc841e 100644
--- a/core/java/android/app/SearchDialog.java
+++ b/core/java/android/app/SearchDialog.java
@@ -165,8 +165,6 @@ public class SearchDialog extends Dialog {
         setContentView(com.android.internal.R.layout.search_bar);
 
         // get the view elements for local access
-        SearchBar searchBar = (SearchBar) findViewById(com.android.internal.R.id.search_bar);
-        searchBar.setSearchDialog(this);
         mSearchView = (SearchView) findViewById(com.android.internal.R.id.search_view);
         mSearchView.setIconified(false);
         mSearchView.setOnCloseListener(mOnCloseListener);
@@ -618,8 +616,6 @@ public class SearchDialog extends Dialog {
      */
     public static class SearchBar extends LinearLayout {
 
-        private SearchDialog mSearchDialog;
-
         public SearchBar(Context context, AttributeSet attrs) {
             super(context, attrs);
         }
@@ -628,18 +624,6 @@ public class SearchDialog extends Dialog {
             super(context);
         }
 
-        public void setSearchDialog(SearchDialog searchDialog) {
-            mSearchDialog = searchDialog;
-        }
-
-        /**
-         * Don't allow action modes in a SearchBar, it looks silly.
-         */
-        @Override
-        public ActionMode startActionModeForChild(View child, ActionMode.Callback callback) {
-            return null;
-        }
-
         @Override
         public ActionMode startActionModeForChild(
                 View child, ActionMode.Callback callback, int type) {