diff --git a/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml b/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml index 1438724d0..d18684daa 100644 --- a/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml +++ b/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml @@ -23,14 +23,12 @@ @@ -38,7 +36,6 @@ @@ -46,7 +43,6 @@ @@ -54,7 +50,6 @@ @@ -62,7 +57,6 @@ diff --git a/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml b/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml index dd9807b74..969332aad 100644 --- a/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml +++ b/samples/Support7Demos/res/layout/action_bar_settings_action_provider.xml @@ -20,8 +20,8 @@ android:layout_gravity="center" android:focusable="true" android:addStatesFromChildren="true" - android:background="?android:attr/actionBarItemBackground" - style="?android:attr/actionButtonStyle"> + android:background="?attr/actionBarItemBackground" + style="?attr/actionButtonStyle"> + android:title="@string/display_options_menu_item" + app:showAsAction="ifRoom" /> 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 f35844372..87e41871d 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarDisplayOptions.java @@ -15,17 +15,17 @@ */ package com.example.android.supportv7.app; -import com.example.android.supportv7.R; - import android.os.Bundle; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar.Tab; import android.support.v7.app.ActionBarActivity; -import android.support.v7.view.Menu; import android.view.Gravity; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup.LayoutParams; +import com.example.android.supportv7.R; /** * This demo shows how various action bar display option flags can be combined and their effects. @@ -63,11 +63,17 @@ public class ActionBarDisplayOptions extends ActionBarActivity } @Override - public boolean onCreateSupportOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(Menu menu) { getSupportMenuInflater().inflate(R.menu.display_options_actions, menu); return true; } + @Override + public boolean onSupportNavigateUp() { + finish(); + return true; + } + @Override public void onClick(View v) { final ActionBar bar = getSupportActionBar(); diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarFragmentMenu.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarFragmentMenu.java index 388a0e2c5..207631e78 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarFragmentMenu.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarFragmentMenu.java @@ -16,6 +16,9 @@ package com.example.android.supportv7.app; +import android.support.v4.view.MenuItemCompat; +import android.view.Menu; +import android.view.MenuItem; import com.example.android.supportv7.R; import android.os.Bundle; @@ -23,11 +26,7 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBarActivity; -import android.support.v7.app.ActionBarFragment; -import android.support.v7.app.ActionBarFragmentCallbacks; -import android.support.v7.view.Menu; -import android.support.v7.view.MenuInflater; -import android.support.v7.view.MenuItem; +import android.view.MenuInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; @@ -128,7 +127,7 @@ public class ActionBarFragmentMenu extends ActionBarActivity { * have a UI (it does not implement onCreateView), but it could also * have one if it wanted. */ - public static class MenuFragment extends ActionBarFragment { + public static class MenuFragment extends Fragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -136,14 +135,14 @@ public class ActionBarFragmentMenu extends ActionBarActivity { } @Override - public void onCreateSupportOptionsMenu(Menu menu, MenuInflater inflater) { - menu.add("Menu 1a").setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - menu.add("Menu 1b").setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - super.onCreateSupportOptionsMenu(menu, inflater); + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + MenuItemCompat.setShowAsAction(menu.add("Menu 1a"), MenuItem.SHOW_AS_ACTION_IF_ROOM); + MenuItemCompat.setShowAsAction(menu.add("Menu 1b"), MenuItem.SHOW_AS_ACTION_IF_ROOM); + super.onCreateOptionsMenu(menu, inflater); } @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { if (item.getTitle().equals("Menu 1a")) { Toast.makeText(getActivity(), "Selected Menu 1a.", Toast.LENGTH_SHORT).show(); return true; @@ -152,17 +151,14 @@ public class ActionBarFragmentMenu extends ActionBarActivity { Toast.makeText(getActivity(), "Selected Menu 1b.", Toast.LENGTH_SHORT).show(); return true; } - return super.onSupportOptionsItemSelected(item); + return super.onOptionsItemSelected(item); } } /** * Second fragment with a menu. - * This one demonstrates that you can extend any other fragment as long - * as you implement the callback interface. */ - public static class Menu2Fragment extends Fragment - implements ActionBarFragmentCallbacks { + public static class Menu2Fragment extends Fragment { Menu3Fragment mFragment3; @Override @@ -181,20 +177,12 @@ public class ActionBarFragmentMenu extends ActionBarActivity { } @Override - public void onCreateSupportOptionsMenu(Menu menu, MenuInflater inflater) { - menu.add("Menu 2").setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + MenuItemCompat.setShowAsAction(menu.add("Menu 2"), MenuItem.SHOW_AS_ACTION_IF_ROOM); } @Override - public void onDestroySupportOptionsMenu() { - } - - @Override - public void onPrepareSupportOptionsMenu(Menu menu) { - } - - @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { if (item.getTitle().equals("Menu 2")) { Toast.makeText(getActivity(), "Selected Menu 2.", Toast.LENGTH_SHORT).show(); return true; @@ -207,7 +195,7 @@ public class ActionBarFragmentMenu extends ActionBarActivity { * Third fragment with a menu. * This one is nested within the second. */ - public static class Menu3Fragment extends ActionBarFragment { + public static class Menu3Fragment extends Fragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -215,35 +203,35 @@ public class ActionBarFragmentMenu extends ActionBarActivity { } @Override - public void onCreateSupportOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { Toast.makeText(getActivity(), "Created nested fragment's menu.", Toast.LENGTH_SHORT).show(); inflater.inflate(R.menu.display_options_actions, menu); - super.onCreateSupportOptionsMenu(menu, inflater); + super.onCreateOptionsMenu(menu, inflater); } @Override - public void onDestroySupportOptionsMenu() { + public void onDestroyOptionsMenu() { Toast.makeText(getActivity(), "Destroyed nested fragment's menu.", Toast.LENGTH_SHORT).show(); - super.onDestroySupportOptionsMenu(); + super.onDestroyOptionsMenu(); } @Override - public void onPrepareSupportOptionsMenu(Menu menu) { + public void onPrepareOptionsMenu(Menu menu) { Toast.makeText(getActivity(), "Prepared nested fragment's menu.", Toast.LENGTH_SHORT).show(); - super.onPrepareSupportOptionsMenu(menu); + super.onPrepareOptionsMenu(menu); } @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == R.id.simple_item) { Toast.makeText(getActivity(), "Selected nested fragment's menu item.", Toast.LENGTH_SHORT).show(); return true; } - return super.onSupportOptionsItemSelected(item); + return super.onOptionsItemSelected(item); } } } diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java index da899b159..ed4b97bd5 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarMechanics.java @@ -16,10 +16,11 @@ package com.example.android.supportv7.app; import android.os.Bundle; +import android.support.v4.view.MenuItemCompat; import android.support.v4.view.WindowCompat; import android.support.v7.app.ActionBarActivity; -import android.support.v7.view.Menu; -import android.support.v7.view.MenuItem; +import android.view.Menu; +import android.view.MenuItem; import android.widget.Toast; /** @@ -43,7 +44,7 @@ public class ActionBarMechanics extends ActionBarActivity { } @Override - public boolean onCreateSupportOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(Menu menu) { // Menu items default to never show in the action bar. On most devices this means // they will show in the standard options menu panel when the menu button is pressed. // On xlarge-screen devices a "More" button will appear in the far right of the @@ -55,7 +56,7 @@ public class ActionBarMechanics extends ActionBarActivity { // Items that show as actions should favor the "if room" setting, which will // prevent too many buttons from crowding the bar. Extra items will show in the // overflow area. - actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); + MenuItemCompat.setShowAsAction(actionItem, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); // Items that show as actions are strongly encouraged to use an icon. // These icons are shown without a text description, and therefore should @@ -65,7 +66,7 @@ public class ActionBarMechanics extends ActionBarActivity { } @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show(); 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 5c70b702f..a36585025 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarSettingsActionProviderActivity.java @@ -16,19 +16,18 @@ package com.example.android.supportv7.app; -import com.example.android.supportv7.R; - import android.content.Context; import android.content.Intent; import android.provider.Settings; import android.support.v7.app.ActionBarActivity; -import android.support.v7.view.ActionProvider; -import android.support.v7.view.Menu; -import android.support.v7.view.MenuItem; +import android.support.v4.view.ActionProvider; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.ImageButton; import android.widget.Toast; +import com.example.android.supportv7.R; /** * This activity demonstrates how to implement an {@link android.view.ActionProvider} @@ -38,14 +37,14 @@ import android.widget.Toast; */ public class ActionBarSettingsActionProviderActivity extends ActionBarActivity { @Override - public boolean onCreateSupportOptionsMenu(Menu menu) { - super.onCreateSupportOptionsMenu(menu); + public boolean onCreateOptionsMenu(Menu menu) { + super.onCreateOptionsMenu(menu); getSupportMenuInflater().inflate(R.menu.action_bar_settings_action_provider, menu); return true; } @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { // If this callback does not handle the item click, onPerformDefaultAction // of the ActionProvider is invoked. Hence, the provider encapsulates the // complete functionality of the menu item. diff --git a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java index f0ee271e6..aaa916cf3 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarTabs.java @@ -15,19 +15,18 @@ */ package com.example.android.supportv7.app; -import com.example.android.supportv7.R; - +import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar.Tab; -import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; +import com.example.android.supportv7.R; /** * This demonstrates the use of action bar tabs and how they interact 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 729e652bd..49d94b14d 100644 --- a/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java +++ b/samples/Support7Demos/src/com/example/android/supportv7/app/ActionBarUsage.java @@ -15,20 +15,18 @@ */ package com.example.android.supportv7.app; -import com.example.android.supportv7.R; - import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.SearchViewCompat; import android.support.v7.app.ActionBarActivity; -import android.support.v7.view.Menu; -import android.support.v7.view.MenuInflater; -import android.support.v7.view.MenuItem; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; -import android.widget.SearchView; -import android.widget.SearchView.OnQueryTextListener; import android.widget.TextView; import android.widget.Toast; +import com.example.android.supportv7.R; /** * This demonstrates idiomatic usage of the Action Bar. The default Honeycomb theme @@ -48,25 +46,25 @@ public class ActionBarUsage extends ActionBarActivity { } @Override - public boolean onCreateSupportOptionsMenu(Menu menu) { + public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getSupportMenuInflater(); inflater.inflate(R.menu.actions, menu); - View searchView = menu.findItem(R.id.action_search).getActionView(); + View searchView = MenuItemCompat.getActionView(menu.findItem(R.id.action_search)); SearchViewCompat.setOnQueryTextListener(searchView, mOnQueryTextListener); return true; } @Override - public boolean onPrepareSupportOptionsMenu(Menu menu) { + public boolean onPrepareOptionsMenu(Menu menu) { if (mSortMode != -1) { Drawable icon = menu.findItem(mSortMode).getIcon(); menu.findItem(R.id.action_sort).setIcon(icon); } - return super.onPrepareSupportOptionsMenu(menu); + return super.onPrepareOptionsMenu(menu); } @Override - public boolean onSupportOptionsItemSelected(MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show(); return true; }