Update Support7Demos for action bar compat API changes.
Change-Id: I61914ff777a0eada9525db6fad7d53c97303eb36
diff --git a/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml b/samples/Support7Demos/res/layout/action_bar_fragment_menu.xml
index 1438724..d18684d 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 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/action_bar_fragment_menu_msg" />
<CheckBox android:id="@+id/menu1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:checked="true"
android:text="@string/action_bar_fragment_menu1">
</CheckBox>
@@ -38,7 +36,6 @@
<CheckBox android:id="@+id/menu2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:checked="true"
android:text="@string/action_bar_fragment_menu2">
</CheckBox>
@@ -46,7 +43,6 @@
<CheckBox android:id="@+id/menu3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:checked="true"
android:text="@string/action_bar_fragment_menu3">
</CheckBox>
@@ -54,7 +50,6 @@
<CheckBox android:id="@+id/has_options_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:checked="true"
android:text="@string/action_bar_fragment_has_options_menu">
</CheckBox>
@@ -62,7 +57,6 @@
<CheckBox android:id="@+id/menu_visibility"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:checked="true"
android:text="@string/action_bar_fragment_menu_visibility">
</CheckBox>
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 dd9807b..969332a 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">
<ImageButton android:id="@+id/button"
android:background="@drawable/ic_launcher_settings"
diff --git a/samples/Support7Demos/res/menu/display_options_actions.xml b/samples/Support7Demos/res/menu/display_options_actions.xml
index 8feb6aa..344e40d 100644
--- a/samples/Support7Demos/res/menu/display_options_actions.xml
+++ b/samples/Support7Demos/res/menu/display_options_actions.xml
@@ -16,5 +16,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/simple_item"
- android:title="@string/display_options_menu_item" />
+ android:title="@string/display_options_menu_item"
+ app:showAsAction="ifRoom" />
</menu>
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 f358443..87e4187 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,12 +63,18 @@
}
@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();
int flags = 0;
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 388a0e2..207631e 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.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 @@
* 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 @@
}
@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 @@
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 @@
}
@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 @@
* 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 @@
}
@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 da899b1..ed4b97b 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 @@
}
@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 @@
// 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 @@
}
@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 5c70b70..a365850 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 @@
*/
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 f0ee271..aaa916c 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 729e652..49d94b1 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 @@
}
@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;
}
