Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev (fbb34dd8) · Commits · e / os / android_frameworks_base

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) {