diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2015-05-06 09:10:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 09:10:27 +0000 |
| commit | fbb34dd8df7bc89ae972c545130e76c5bbb4176e (patch) | |
| tree | 5b95076d5cf96bed8a882d28e75808c31f387f36 /core/java/android | |
| parent | 7f76ff39b7d0ac7aa31c9528c179e1a99578c108 (diff) | |
| parent | 370ca9844fe614b5e741a3e7f6bd5ad5e1cbe905 (diff) | |
| download | frameworks_base-fbb34dd8df7bc89ae972c545130e76c5bbb4176e.zip frameworks_base-fbb34dd8df7bc89ae972c545130e76c5bbb4176e.tar.gz frameworks_base-fbb34dd8df7bc89ae972c545130e76c5bbb4176e.tar.bz2 | |
Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/SearchDialog.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index b1a5d21..fa11221 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) { |