diff options
| author | Chris Banes <chrisbanes@google.com> | 2013-04-30 12:07:57 +0100 |
|---|---|---|
| committer | Chris Banes <chrisbanes@google.com> | 2013-04-30 12:07:57 +0100 |
| commit | 8942438f38c17bcaf3c5cb2fb0805d1e22aa9558 (patch) | |
| tree | ab88345fa2bf132e3591233670d41716624da472 /samples | |
| parent | 04c8633deeb6eaa3f699f97d4a4e59e596e83ff0 (diff) | |
| download | android_development-8942438f38c17bcaf3c5cb2fb0805d1e22aa9558.tar.gz android_development-8942438f38c17bcaf3c5cb2fb0805d1e22aa9558.tar.bz2 android_development-8942438f38c17bcaf3c5cb2fb0805d1e22aa9558.zip | |
Update Support7Demos for MenuInflater change:
I7a4504aeae2795e8d9d6f4cd4ecd20b8d4ea7602
Change-Id: I4896483669c877f3d8ed05a81d789750b39ab32d
Signed-off-by: Chris Banes <chrisbanes@google.com>
Diffstat (limited to 'samples')
3 files changed, 3 insertions, 3 deletions
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java index 87e41871d..b0d00fc69 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java @@ -64,7 +64,7 @@ public class ActionBarDisplayOptions extends ActionBarActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - getSupportMenuInflater().inflate(R.menu.display_options_actions, menu); + getMenuInflater().inflate(R.menu.display_options_actions, menu); return true; } diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java index a36585025..ba1ccbe28 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java @@ -39,7 +39,7 @@ public class ActionBarSettingsActionProviderActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu 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; } diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java index 49d94b14d..d6152cc5e 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java @@ -47,7 +47,7 @@ public class ActionBarUsage extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getSupportMenuInflater(); + MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.actions, menu); View searchView = MenuItemCompat.getActionView(menu.findItem(R.id.action_search)); SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener); |