Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 370ca984 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

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
parent 6e761c5d

core/java/android/app/SearchDialog.java

+0 −16
Original line number Diff line number Diff line
@@ -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) {