Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c3a0d0b0: am fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev

Browse Source 
* commit 'c3a0d0b0022bac895b1cdbd6e4219a26a421adac':
  Allow Floating ActionModes in SearchDialog.
This commit is contained in:
Clara Bayarri
2015-05-06 09:45:55 +00:00
committed by Android Git Automerger
parent 0ee273f5fa c3a0d0b002
commit 385d59e43c
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/SearchDialog.java
View File

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