summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2015-10-17 01:18:20 +0200
committerSteve Kondik <steve@cyngn.com>2015-10-18 14:06:01 -0700
commite3c39f0e6d1834e8895e245905f570b8d23135c1 (patch)
tree6a7f5d5527ba7b6a78a4f34fb3ae52162374f3c5 /src
parent296d358d37cd9f6e8c6c7e5d08a484e98ef73a3f (diff)
downloadandroid_packages_apps_Email-e3c39f0e6d1834e8895e245905f570b8d23135c1.tar.gz
android_packages_apps_Email-e3c39f0e6d1834e8895e245905f570b8d23135c1.tar.bz2
android_packages_apps_Email-e3c39f0e6d1834e8895e245905f570b8d23135c1.zip
email: Add an ActionBar to the mail app's PreferenceActivity
Change-Id: Id2ed98d2c2cd6648e179fb2942f3bc4479049cd0 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/activity/setup/MailboxSettings.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java
index 108dc1b3d..ad09c253c 100644
--- a/src/com/android/email/activity/setup/MailboxSettings.java
+++ b/src/com/android/email/activity/setup/MailboxSettings.java
@@ -67,6 +67,7 @@ import com.android.mail.preferences.notifications.FolderNotificationLightPrefere
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider;
import com.android.mail.ui.MailAsyncTaskLoader;
+import com.android.mail.ui.settings.BasePreferenceActivity;
import com.android.mail.utils.LogUtils;
import com.google.common.base.Preconditions;
@@ -89,7 +90,7 @@ import java.util.Map;
* sync window may result in removal of messages. Instead, we only save to the database in {@link
* #onDestroy()}, unless it's called for configuration changes.
*/
-public class MailboxSettings extends PreferenceActivity {
+public class MailboxSettings extends BasePreferenceActivity {
public static final String PREFERENCE_SYNC_SETTINGS = "account_sync_settings";
public static final String PREFERENCE_PER_FOLDER_NOTIFICATIONS =
"account_per_folder_notifications";
@@ -134,10 +135,6 @@ public class MailboxSettings extends PreferenceActivity {
// Always show "app up" as we expect our parent to be an Email activity.
ActionBar actionBar = getActionBar();
if (actionBar != null) {
- actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
- // Hide the app icon.
- actionBar.setIcon(android.R.color.transparent);
- actionBar.setDisplayUseLogoEnabled(false);
if (mType != null && mType.equals(PREFERENCE_SYNC_SETTINGS)) {
actionBar.setTitle(getString(R.string.mailbox_settings_activity_title));
} else if (mType != null && mType.equals(PREFERENCE_PER_FOLDER_NOTIFICATIONS)) {