LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am fe17cee4: Fix ActionBarUsage in Support7Demos

Browse Source 
* commit 'fe17cee4e41993e3f12685d1dda26f26b7013c12':
  Fix ActionBarUsage in Support7Demos
This commit is contained in:
Chris Banes
2013-07-31 06:53:25 -07:00
committed by Android Git Automerger
parent e86297fc27 fe17cee4e4
commit 4a331512cb
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Support7Demos/res/menu/actions.xml
View File

@@ -19,7 +19,7 @@
android:icon="@android:drawable/ic_menu_search" android:icon="@android:drawable/ic_menu_search"
android:title="@string/action_bar_search" android:title="@string/action_bar_search"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
app:actionProviderClass="android.support.v7.widget.SearchActionProvider" /> app:actionViewClass="android.support.v7.widget.SearchView" />
<item android:id="@+id/action_add" <item android:id="@+id/action_add"
android:icon="@android:drawable/ic_menu_add" android:icon="@android:drawable/ic_menu_add"
android:title="@string/action_bar_add" /> android:title="@string/action_bar_add" />

18
samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java
View File

@@ -15,18 +15,19 @@
*/ */
package com.example.android.supportv7.app; package com.example.android.supportv7.app;
import com.example.android.supportv7.R;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.SearchViewCompat;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.SearchView;
import android.text.TextUtils;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.example.android.supportv7.R;
/** /**
* This demonstrates idiomatic usage of the Action Bar. The default Honeycomb theme * This demonstrates idiomatic usage of the Action Bar. The default Honeycomb theme
@@ -49,8 +50,9 @@ public class ActionBarUsage extends ActionBarActivity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater(); MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.actions, menu); inflater.inflate(R.menu.actions, menu);
View searchView = MenuItemCompat.getActionView(menu.findItem(R.id.action_search)); SearchView searchView = (SearchView) MenuItemCompat
SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener); .getActionView(menu.findItem(R.id.action_search));
searchView.setOnQueryTextListener(mOnQueryTextListener);
return true; return true;
} }
@@ -80,11 +82,11 @@ public class ActionBarUsage extends ActionBarActivity {
// The following callbacks are called for the SearchView.OnQueryChangeListener // The following callbacks are called for the SearchView.OnQueryChangeListener
// For more about using SearchView, see src/.../view/SearchView1.java and SearchView2.java // For more about using SearchView, see src/.../view/SearchView1.java and SearchView2.java
private final SearchViewCompat.OnQueryTextListenerCompat mOnQueryTextListener = private final SearchView.OnQueryTextListener mOnQueryTextListener =
new SearchViewCompat.OnQueryTextListenerCompat() { new SearchView.OnQueryTextListener() {
@Override @Override
public boolean onQueryTextChange(String newText) { public boolean onQueryTextChange(String newText) {
newText = newText.isEmpty() ? "" : "Query so far: " + newText; newText = TextUtils.isEmpty(newText) ? "" : "Query so far: " + newText;
mSearchText.setText(newText); mSearchText.setText(newText);
return true; return true;
} }