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

am 26752706: am 8942438f: Update Support7Demos for MenuInflater change:

Browse Source 
* commit '267527061f47e8bb8452f2a1430e282dd260fc2d':
  Update Support7Demos for MenuInflater change:
This commit is contained in:
Chris Banes
2013-05-03 14:54:07 -07:00
committed by Android Git Automerger
parent 7ac9efd779 267527061f
commit 07d1aebb6f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java
View File

@@ -64,7 +64,7 @@ public class ActionBarDisplayOptions extends ActionBarActivity
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getSupportMenuInflater().inflate(R.menu.display_options_actions, menu); getMenuInflater().inflate(R.menu.display_options_actions, menu);
return true; return true;
} }

2
samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java
View File

@@ -39,7 +39,7 @@ public class ActionBarSettingsActionProviderActivity extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
getSupportMenuInflater().inflate(R.menu.action_bar_settings_action_provider, menu); getMenuInflater().inflate(R.menu.action_bar_settings_action_provider, menu);
return true; return true;
} }

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

@@ -47,7 +47,7 @@ public class ActionBarUsage extends ActionBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getSupportMenuInflater(); 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)); View searchView = MenuItemCompat.getActionView(menu.findItem(R.id.action_search));
SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener); SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener);