summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2017-05-18 11:20:48 -0700
committerAurimas Liutikas <aurimas@google.com>2017-05-18 11:20:48 -0700
commit69951ecebbf58d0d2ea41c3200174e9ebe91e964 (patch)
tree5697fcbb50f8818229622d1c7e4a0408ac7920c8
parentf36de8308fa56556b1b8a7b8403dc348cfcab824 (diff)
downloadandroid_packages_apps_UnifiedEmail-69951ecebbf58d0d2ea41c3200174e9ebe91e964.tar.gz
android_packages_apps_UnifiedEmail-69951ecebbf58d0d2ea41c3200174e9ebe91e964.tar.bz2
android_packages_apps_UnifiedEmail-69951ecebbf58d0d2ea41c3200174e9ebe91e964.zip
Remove usages of ActionBarActivity.
ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: I5d1295b253381810b8e6936705ea4bd4198a700d
-rw-r--r--src/com/android/mail/browse/EmlMessageViewFragment.java4
-rw-r--r--src/com/android/mail/compose/ComposeActivity.java4
-rw-r--r--src/com/android/mail/ui/AccountFeedbackActivity.java4
-rw-r--r--src/com/android/mail/ui/MailboxSelectionActivity.java4
-rw-r--r--src/com/android/mail/ui/RestrictedActivity.java10
5 files changed, 13 insertions, 13 deletions
diff --git a/src/com/android/mail/browse/EmlMessageViewFragment.java b/src/com/android/mail/browse/EmlMessageViewFragment.java
index 306c138c7..2fbbb7206 100644
--- a/src/com/android/mail/browse/EmlMessageViewFragment.java
+++ b/src/com/android/mail/browse/EmlMessageViewFragment.java
@@ -27,7 +27,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.provider.OpenableColumns;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -337,7 +337,7 @@ public class EmlMessageViewFragment extends Fragment
return;
}
- ((ActionBarActivity) getActivity()).getSupportActionBar().setTitle(
+ ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(
data.getString(data.getColumnIndex(OpenableColumns.DISPLAY_NAME)));
}
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 7b05ffaa1..738111f90 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -51,7 +51,7 @@ import android.os.ParcelFileDescriptor;
import android.provider.BaseColumns;
import android.support.v4.app.RemoteInput;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.view.ActionMode;
import android.text.Editable;
import android.text.Html;
@@ -138,7 +138,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-public class ComposeActivity extends ActionBarActivity
+public class ComposeActivity extends AppCompatActivity
implements OnClickListener, ActionBar.OnNavigationListener,
RespondInlineListener, TextWatcher,
AttachmentAddedOrDeletedListener, OnAccountChangedListener,
diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java
index 89a736d37..e3cb59275 100644
--- a/src/com/android/mail/ui/AccountFeedbackActivity.java
+++ b/src/com/android/mail/ui/AccountFeedbackActivity.java
@@ -21,7 +21,7 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
@@ -37,7 +37,7 @@ import com.android.mail.utils.Utils;
* as well as showing settings/help/send feedback in the action
* overflow menu.
*/
-public abstract class AccountFeedbackActivity extends ActionBarActivity
+public abstract class AccountFeedbackActivity extends AppCompatActivity
implements ConversationAccountController, AccountLoadCallbacks.AccountLoadCallbackListener {
public static final String EXTRA_ACCOUNT_URI = "extra-account-uri";
diff --git a/src/com/android/mail/ui/MailboxSelectionActivity.java b/src/com/android/mail/ui/MailboxSelectionActivity.java
index e52408348..9605f09b3 100644
--- a/src/com/android/mail/ui/MailboxSelectionActivity.java
+++ b/src/com/android/mail/ui/MailboxSelectionActivity.java
@@ -36,7 +36,7 @@ import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
@@ -49,7 +49,7 @@ import android.widget.TextView;
* An activity that shows the list of all the available accounts and return the
* one selected in onResult().
*/
-public class MailboxSelectionActivity extends ActionBarActivity implements OnClickListener,
+public class MailboxSelectionActivity extends AppCompatActivity implements OnClickListener,
LoaderManager.LoaderCallbacks<Cursor>, AdapterView.OnItemClickListener {
// Used to save our instance state
diff --git a/src/com/android/mail/ui/RestrictedActivity.java b/src/com/android/mail/ui/RestrictedActivity.java
index 50ea6985c..364f677f7 100644
--- a/src/com/android/mail/ui/RestrictedActivity.java
+++ b/src/com/android/mail/ui/RestrictedActivity.java
@@ -36,9 +36,9 @@ import android.view.Window;
/**
* {@link RestrictedActivity} gives access to a subset of
- * {@link android.support.v7.app.ActionBarActivity} methods.
+ * {@link android.support.v7.app.AppCompatActivity} methods.
* These methods match the signatures from
- * {@link android.support.v7.app.ActionBarActivity}.
+ * {@link android.support.v7.app.AppCompatActivity}.
*/
public interface RestrictedActivity {
/*
@@ -57,7 +57,7 @@ public interface RestrictedActivity {
void finish();
/**
- * @see android.support.v7.app.ActionBarActivity#getSupportActionBar()
+ * @see android.support.v7.app.AppCompatActivity#getSupportActionBar()
*/
ActionBar getSupportActionBar();
@@ -102,7 +102,7 @@ public interface RestrictedActivity {
Window getWindow();
/**
- * @see android.support.v7.app.ActionBarActivity#supportInvalidateOptionsMenu()
+ * @see android.support.v7.app.AppCompatActivity#supportInvalidateOptionsMenu()
*/
void supportInvalidateOptionsMenu();
@@ -147,7 +147,7 @@ public interface RestrictedActivity {
void showDialog(int id);
/**
- * @see android.support.v7.app.ActionBarActivity#startSupportActionMode(ActionMode.Callback)
+ * @see android.support.v7.app.AppCompatActivity#startSupportActionMode(ActionMode.Callback)
*/
ActionMode startSupportActionMode(ActionMode.Callback callback);