Merge "Remove usages of ActionBarActivity." into oc-dev
diff --git a/common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java b/common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
index 482f6ed..db5e856 100644
--- a/common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
+++ b/common/src/java/com/example/android/common/actionbarcompat/MultiSelectionUtil.java
@@ -17,7 +17,7 @@
package com.example.android.common.actionbarcompat;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.ActionMode;
import android.util.Pair;
import android.util.SparseBooleanArray;
@@ -33,7 +33,7 @@
/**
* Utilities for handling multiple selection in list views. Contains functionality similar to {@link
- * AbsListView#CHOICE_MODE_MULTIPLE_MODAL} which works with {@link ActionBarActivity} and
+ * AbsListView#CHOICE_MODE_MULTIPLE_MODAL} which works with {@link AppCompatActivity} and
* backward-compatible action bars.
*/
public class MultiSelectionUtil {
@@ -48,7 +48,7 @@
* @return the attached Controller instance.
*/
public static Controller attachMultiSelectionController(final ListView listView,
- final ActionBarActivity activity, final MultiChoiceModeListener listener) {
+ final AppCompatActivity activity, final MultiChoiceModeListener listener) {
return new Controller(listView, activity, listener);
}
@@ -63,7 +63,7 @@
public static class Controller {
private final ListView mListView;
- private final ActionBarActivity mActivity;
+ private final AppCompatActivity mActivity;
private final MultiChoiceModeListener mListener;
private final Callbacks mCallbacks;
@@ -83,7 +83,7 @@
}
};
- private Controller(ListView listView, ActionBarActivity activity,
+ private Controller(ListView listView, AppCompatActivity activity,
MultiChoiceModeListener listener) {
mListView = listView;
mActivity = activity;
@@ -105,7 +105,7 @@
}
/**
- * This method should be called from your {@link ActionBarActivity} or
+ * This method should be called from your {@link AppCompatActivity} or
* {@link android.support.v4.app.Fragment Fragment} to allow the controller to restore any
* instance state.
*
@@ -126,7 +126,7 @@
/**
* This method should be called from
- * {@link ActionBarActivity#onSaveInstanceState(android.os.Bundle)} or
+ * {@link AppCompatActivity#onSaveInstanceState(android.os.Bundle)} or
* {@link android.support.v4.app.Fragment#onSaveInstanceState(android.os.Bundle)
* Fragment.onSaveInstanceState(Bundle)} to allow the controller to save its instance
* state.
diff --git a/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
index 8414ffb..2e61187 100644
--- a/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
+++ b/media/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
@@ -31,7 +31,7 @@
import android.os.SystemClock;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.MediaRouteActionProvider;
import android.support.v7.app.MediaRouteDiscoveryFragment;
import android.support.v7.media.MediaControlIntent;
@@ -75,7 +75,7 @@
* targets.
* </p>
*/
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
private static final String DISCOVERY_FRAGMENT_TAG = "DiscoveryFragment";
diff --git a/system/AppUsageStatistics/Application/src/main/java/com/example/android/appusagestatistics/AppUsageStatisticsActivity.java b/system/AppUsageStatistics/Application/src/main/java/com/example/android/appusagestatistics/AppUsageStatisticsActivity.java
index 4def465..0f73398 100644
--- a/system/AppUsageStatistics/Application/src/main/java/com/example/android/appusagestatistics/AppUsageStatisticsActivity.java
+++ b/system/AppUsageStatistics/Application/src/main/java/com/example/android/appusagestatistics/AppUsageStatisticsActivity.java
@@ -17,12 +17,12 @@
package com.example.android.appusagestatistics;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
/**
* Launcher Activity for the App Usage Statistics sample app.
*/
-public class AppUsageStatisticsActivity extends ActionBarActivity {
+public class AppUsageStatisticsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -34,4 +34,4 @@
.commit();
}
}
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
index 8d3506f..f3b14dc 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
@@ -26,10 +26,10 @@
* This sample shows you how to use ActionBarCompat to create a basic Activity which displays
* action items. It covers inflating items from a menu resource, as well as adding an item in code.
*
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
+ * This Activity extends from {@link AppCompatActivity}, which provides all of the function
* necessary to display a compatible Action Bar on devices running Android v2.1+.
*/
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/README.md b/ui/actionbarcompat/ActionBarCompat-Basic/README.md
index c1aebb5..e98edbb 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/README.md
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/README.md
@@ -22,7 +22,7 @@
Using an ActionBar with the support library requires the following steps:
-1. Create your activity by extending ActionBarActivity.
+1. Create your activity by extending AppCompatActivity.
2. Use (or extend) one of the Theme.AppCompat themes for your activity.
Once this is done, action items will be created for any options menu items that
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
index ffb0de5..80f6569 100644
--- a/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Basic/template-params.xml
@@ -56,7 +56,7 @@
for more details. -->
<api_refs>
<android>android.app.ActionBar</android>
- <android>android.support.v7.app.ActionBarActivity</android>
+ <android>android.support.v7.app.AppCompatActivity</android>
<android>android.support.v4.view.MenuItemCompat</android>
</api_refs>
<description>
@@ -81,7 +81,7 @@
Using an ActionBar with the support library requires the following steps:
-1. Create your activity by extending ActionBarActivity.
+1. Create your activity by extending AppCompatActivity.
2. Use (or extend) one of the Theme.AppCompat themes for your activity.
Once this is done, action items will be created for any options menu items that
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
index 13a77f3..4594a0c 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
@@ -17,7 +17,7 @@
package com.example.android.actionbarcompat.listpopupmenu;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
/**
* This sample shows you how to use {@link android.support.v7.widget.PopupMenu PopupMenu} from
@@ -25,10 +25,10 @@
* <p>
* The interesting part of this sample is in {@link PopupListFragment}.
*
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
+ * This Activity extends from {@link AppCompatActivity}, which provides all of the function
* necessary to display a compatible Action Bar on devices running Android v2.1+.
*/
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
index f8fed22..ec47067 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/CheeseListFragment.java
@@ -17,7 +17,7 @@
import android.os.Bundle;
import android.support.v4.app.ListFragment;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.ActionMode;
import android.util.SparseBooleanArray;
import android.view.Menu;
@@ -60,7 +60,7 @@
// Attach a MultiSelectionUtil.Controller to the ListView, giving it an instance of
// ModalChoiceListener (see below)
mMultiSelectController = MultiSelectionUtil
- .attachMultiSelectionController(getListView(), (ActionBarActivity) getActivity(),
+ .attachMultiSelectionController(getListView(), (AppCompatActivity) getActivity(),
new ModalChoiceListener());
// Allow the Controller to restore itself
@@ -158,4 +158,4 @@
public void onDestroyActionMode(ActionMode actionMode) {
}
}
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
index ef278bd..61c19de 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/src/main/java/com/example/android/actionbarcompat/listviewmodalselect/MainActivity.java
@@ -17,18 +17,18 @@
package com.example.android.actionbarcompat.listviewmodalselect;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
/**
* This sample shows you how a provide a ListView which allows the user to select multiple items
* in a modal selection mode with ActionBarCompat, backwards compatible to API v7.
* <p>
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
+ * This Activity extends from {@link AppCompatActivity}, which provides all of the function
* necessary to display a compatible Action Bar on devices running Android v2.1+.
* <p>
* The interesting part of this sample is in {@link CheeseListFragment}.
*/
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -38,4 +38,4 @@
setContentView(R.layout.sample_main);
}
-}
\ No newline at end of file
+}
diff --git a/ui/actionbarcompat/ActionBarCompat-SearchView/src/main/src/com/example/android/actionbarcompat/searchview/SearchActivity.java b/ui/actionbarcompat/ActionBarCompat-SearchView/src/main/src/com/example/android/actionbarcompat/searchview/SearchActivity.java
index c0cbdda..6fb7bd9 100644
--- a/ui/actionbarcompat/ActionBarCompat-SearchView/src/main/src/com/example/android/actionbarcompat/searchview/SearchActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-SearchView/src/main/src/com/example/android/actionbarcompat/searchview/SearchActivity.java
@@ -18,7 +18,7 @@
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView;
import android.view.Menu;
import android.view.MenuItem;
@@ -27,10 +27,10 @@
* This sample shows you how to use {@link SearchView} to provide a search function in a single
* Activity, when utilizing ActionBarCompat.
*
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
+ * This Activity extends from {@link AppCompatActivity}, which provides all of the function
* necessary to display a compatible Action Bar on devices running Android v2.1+.
*/
-public class SearchActivity extends ActionBarActivity {
+public class SearchActivity extends AppCompatActivity {
private AppListFragment mAppListFragment;
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
index 19fe3a1..04163ef 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
@@ -19,14 +19,14 @@
import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
/**
* This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a split
* action bar when running on a device with a narrow display, and show three tabs.
*
- * This Activity extends from {@link ActionBarActivity}, which provides all of the function
+ * This Activity extends from {@link AppCompatActivity}, which provides all of the function
* necessary to display a compatible Action Bar on devices running Android v2.1+.
*
* The interesting bits of this sample start in the theme files
@@ -35,7 +35,7 @@
* Many of the drawables used in this sample were generated with the
* 'Android Action Bar Style Generator': http://jgilfelt.github.io/android-actionbarstylegenerator
*/
-public class MainActivity extends ActionBarActivity implements ActionBar.TabListener {
+public class MainActivity extends AppCompatActivity implements ActionBar.TabListener {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/README.md b/ui/actionbarcompat/ActionBarCompat-Styled/README.md
index 2c0a666..3aa3180 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/README.md
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/README.md
@@ -11,7 +11,7 @@
This sample shows how to style an ActionBar using the [support library][1] on devices running
Android v2.1+ using a custom theme.
-This Activity extends from ActionBarActivity, which provides all of the function
+This Activity extends from AppCompatActivity, which provides all of the function
necessary to display a compatible Action Bar on devices running Android v2.1+.
A custom application theme and styles are defined in XML.
diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
index 4e0c8e7..f6e7222 100644
--- a/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
+++ b/ui/actionbarcompat/ActionBarCompat-Styled/template-params.xml
@@ -47,7 +47,7 @@
</screenshots>
<api_refs>
- <android>android.support.v7.app.ActionBarActivity</android>
+ <android>android.support.v7.app.AppCompatActivity</android>
</api_refs>
<description>
@@ -61,7 +61,7 @@
This sample shows how to style an ActionBar using the [support library][1] on devices running
Android v2.1+ using a custom theme.
-This Activity extends from ActionBarActivity, which provides all of the function
+This Activity extends from AppCompatActivity, which provides all of the function
necessary to display a compatible Action Bar on devices running Android v2.1+.
A custom application theme and styles are defined in XML.
