diff options
| author | Tony Mantler <nicoya@google.com> | 2014-11-02 15:32:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 15:32:23 +0000 |
| commit | 800d544a81ae7fca7040a766344d680a6b767caf (patch) | |
| tree | 769b5ef91f82435236a75f29bbd10946f644b617 | |
| parent | 34a686ab019d4a748850f297687fc81278b69154 (diff) | |
| parent | 8c6a01f876ae015167dd7b3097453ef97e4c2ae3 (diff) | |
| download | android_packages_apps_Email-800d544a81ae7fca7040a766344d680a6b767caf.tar.gz android_packages_apps_Email-800d544a81ae7fca7040a766344d680a6b767caf.tar.bz2 android_packages_apps_Email-800d544a81ae7fca7040a766344d680a6b767caf.zip | |
am 8c6a01f8: Remove app icon from Setup and Mailbox Settings
* commit '8c6a01f876ae015167dd7b3097453ef97e4c2ae3':
Remove app icon from Setup and Mailbox Settings
| -rw-r--r-- | src/com/android/email/activity/setup/AccountSetupFinal.java | 8 | ||||
| -rw-r--r-- | src/com/android/email/activity/setup/MailboxSettings.java | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java index 0150b4b0f..85ee24e99 100644 --- a/src/com/android/email/activity/setup/AccountSetupFinal.java +++ b/src/com/android/email/activity/setup/AccountSetupFinal.java @@ -18,6 +18,7 @@ package com.android.email.activity.setup; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; +import android.app.ActionBar; import android.app.ActivityManager; import android.app.AlertDialog; import android.app.Dialog; @@ -212,6 +213,13 @@ public class AccountSetupFinal extends AccountSetupActivity setContentView(R.layout.account_setup_activity); + final ActionBar actionBar = getActionBar(); + if (actionBar != null) { + // Hide the app icon. + actionBar.setIcon(android.R.color.transparent); + actionBar.setDisplayUseLogoEnabled(false); + } + if (savedInstanceState != null) { mIsProcessing = savedInstanceState.getBoolean(SAVESTATE_KEY_IS_PROCESSING, false); mState = savedInstanceState.getInt(SAVESTATE_KEY_STATE, STATE_OPTIONS); diff --git a/src/com/android/email/activity/setup/MailboxSettings.java b/src/com/android/email/activity/setup/MailboxSettings.java index 33eb6a93b..42ae407dd 100644 --- a/src/com/android/email/activity/setup/MailboxSettings.java +++ b/src/com/android/email/activity/setup/MailboxSettings.java @@ -105,6 +105,9 @@ public class MailboxSettings extends PreferenceActivity { 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); } } |