Remove old fashioned expand/collapse techniques in SearchView examples.
These are not the recommended patterns any more.
Bug: 5086888
Change-Id: If354ea5af0eaff33d0e572177a9e804d899d07e1
diff --git a/samples/ApiDemos/res/layout/searchview_actionbar.xml b/samples/ApiDemos/res/layout/searchview_actionbar.xml
index 37736cd..2ed62d4 100644
--- a/samples/ApiDemos/res/layout/searchview_actionbar.xml
+++ b/samples/ApiDemos/res/layout/searchview_actionbar.xml
@@ -19,22 +19,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <Button
- android:id="@+id/open_button"
- android:text="@string/open_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- />
-
- <Button
- android:id="@+id/close_button"
- android:text="@string/close_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- />
-
<TextView
android:id="@+id/status_text"
android:layout_width="match_parent"
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.java b/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.java
index 8ffa3b9..bffeb96 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/SearchViewActionBar.java
@@ -39,12 +39,9 @@
* This demonstrates the usage of SearchView in an ActionBar as a menu item.
* It sets a SearchableInfo on the SearchView for suggestions and submitting queries to.
*/
-public class SearchViewActionBar extends Activity implements SearchView.OnQueryTextListener,
- SearchView.OnCloseListener, Button.OnClickListener {
+public class SearchViewActionBar extends Activity implements SearchView.OnQueryTextListener {
private SearchView mSearchView;
- private Button mOpenButton;
- private Button mCloseButton;
private TextView mStatusView;
@Override
@@ -55,10 +52,6 @@
setContentView(R.layout.searchview_actionbar);
mStatusView = (TextView) findViewById(R.id.status_text);
- mOpenButton = (Button) findViewById(R.id.open_button);
- mCloseButton = (Button) findViewById(R.id.close_button);
- mOpenButton.setOnClickListener(this);
- mCloseButton.setOnClickListener(this);
}
@Override
@@ -99,7 +92,6 @@
}
mSearchView.setOnQueryTextListener(this);
- mSearchView.setOnCloseListener(this);
}
public boolean onQueryTextChange(String newText) {
@@ -117,14 +109,6 @@
return false;
}
- public void onClick(View view) {
- if (view == mCloseButton) {
- mSearchView.setIconified(true);
- } else if (view == mOpenButton) {
- mSearchView.setIconified(false);
- }
- }
-
protected boolean isAlwaysExpanded() {
return false;
}
