am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings

* commit '800d544a81ae7fca7040a766344d680a6b767caf':
  Remove app icon from Setup and Mailbox Settings
This commit is contained in:
Tony Mantler 2014-11-02 17:29:32 +00:00 committed by Android Git Automerger
commit 3fb948e4ba
2 changed files with 11 additions and 0 deletions

View File

@ -18,6 +18,7 @@ package com.android.email.activity.setup;
import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountAuthenticatorResponse;
import android.accounts.AccountManager; import android.accounts.AccountManager;
import android.app.ActionBar;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
@ -212,6 +213,13 @@ public class AccountSetupFinal extends AccountSetupActivity
setContentView(R.layout.account_setup_activity); 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) { if (savedInstanceState != null) {
mIsProcessing = savedInstanceState.getBoolean(SAVESTATE_KEY_IS_PROCESSING, false); mIsProcessing = savedInstanceState.getBoolean(SAVESTATE_KEY_IS_PROCESSING, false);
mState = savedInstanceState.getInt(SAVESTATE_KEY_STATE, STATE_OPTIONS); mState = savedInstanceState.getInt(SAVESTATE_KEY_STATE, STATE_OPTIONS);

View File

@ -105,6 +105,9 @@ public class MailboxSettings extends PreferenceActivity {
ActionBar actionBar = getActionBar(); ActionBar actionBar = getActionBar();
if (actionBar != null) { if (actionBar != null) {
actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP); 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);
} }
} }