Update Support7Demos for MenuInflater change:
I7a4504aeae2795e8d9d6f4cd4ecd20b8d4ea7602 Change-Id: I4896483669c877f3d8ed05a81d789750b39ab32d Signed-off-by: Chris Banes <chrisbanes@google.com>
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
Reference in New Issue
Block a user