diff options
author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-05 19:06:15 -0700 |
---|---|---|
committer | Andrew Sapperstein <asapperstein@google.com> | 2014-08-05 19:06:15 -0700 |
commit | 90b60f1bc30e7b0494789365ce80e50ddf44f274 (patch) | |
tree | 02d34c90c29d70090eb1025a09ee91d4d9a3ffee /src | |
parent | 84b22ee19bb0e462e1bd4d946ca32c8132616372 (diff) | |
download | android_packages_apps_UnifiedEmail-90b60f1bc30e7b0494789365ce80e50ddf44f274.tar.gz android_packages_apps_UnifiedEmail-90b60f1bc30e7b0494789365ce80e50ddf44f274.tar.bz2 android_packages_apps_UnifiedEmail-90b60f1bc30e7b0494789365ce80e50ddf44f274.zip |
Migrate eml & full message viewers to appcompat.
Change-Id: If0fcff91c5b86ca634d59e98b83b1949c6460bc3
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/mail/browse/EmlMessageViewFragment.java | 4 | ||||
-rw-r--r-- | src/com/android/mail/ui/AccountFeedbackActivity.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/mail/browse/EmlMessageViewFragment.java b/src/com/android/mail/browse/EmlMessageViewFragment.java index 3ab9885cf..2a146f238 100644 --- a/src/com/android/mail/browse/EmlMessageViewFragment.java +++ b/src/com/android/mail/browse/EmlMessageViewFragment.java @@ -27,6 +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.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -166,7 +167,6 @@ public class EmlMessageViewFragment extends Fragment mViewController = new SecureConversationViewController(this); setHasOptionsMenu(true); - getActivity().getActionBar().setTitle(R.string.attached_message); } @Override @@ -343,7 +343,7 @@ public class EmlMessageViewFragment extends Fragment return; } - getActivity().getActionBar().setSubtitle( + ((ActionBarActivity) getActivity()).getSupportActionBar().setTitle( data.getString(data.getColumnIndex(OpenableColumns.DISPLAY_NAME))); } diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java index fca949b7c..cdf23d532 100644 --- a/src/com/android/mail/ui/AccountFeedbackActivity.java +++ b/src/com/android/mail/ui/AccountFeedbackActivity.java @@ -17,11 +17,11 @@ package com.android.mail.ui; -import android.app.ActionBar; -import android.app.Activity; 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.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 Activity +public abstract class AccountFeedbackActivity extends ActionBarActivity implements ConversationAccountController, AccountLoadCallbacks.AccountLoadCallbackListener { public static final String EXTRA_ACCOUNT_URI = "extra-account-uri"; @@ -58,7 +58,7 @@ public abstract class AccountFeedbackActivity extends Activity super.onCreate(savedInstanceState); setContentView(R.layout.account_feedback_activity); - final ActionBar actionBar = getActionBar(); + final ActionBar actionBar = getSupportActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); final Intent intent = getIntent(); |