summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-07-29 15:12:04 -0700
committerTony Mantler <nicoya@google.com>2014-07-29 15:12:04 -0700
commit751a029c315e642e5ea979f38927ede34d82edfa (patch)
tree669a83fb3ce9b352a2bbacd8073ab9a9d3d49b94 /AndroidManifest.xml
parent6e976f1d05c1896070efc9df57267e37d8ae2152 (diff)
downloadandroid_packages_apps_Email-751a029c315e642e5ea979f38927ede34d82edfa.tar.gz
android_packages_apps_Email-751a029c315e642e5ea979f38927ede34d82edfa.tar.bz2
android_packages_apps_Email-751a029c315e642e5ea979f38927ede34d82edfa.zip
Convert server settings to dialog
b/8134410 Change-Id: I3c4c9a02a37571a9c7af10971840fbe39458244e
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml15
1 files changed, 10 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3776a8110..89c709c84 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -165,7 +165,10 @@
<activity
android:name=".activity.setup.AccountCredentials"
- android:label="@string/sign_in_title">
+ android:label="@string/sign_in_title"
+ android:exported="false"
+ android:excludeFromRecents="true"
+ android:theme="@style/AccountSetupDialogActivityTheme">
</activity>
<activity
@@ -301,10 +304,12 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name=".activity.setup.AccountServerSettingsActivity"
- android:label="@string/mailbox_settings_activity_title"
- android:exported="false">
- </activity>
+ <activity
+ android:name=".activity.setup.AccountServerSettingsActivity"
+ android:label="@string/mailbox_settings_activity_title"
+ android:exported="false"
+ android:excludeFromRecents="true"
+ android:theme="@style/AccountSetupDialogActivityTheme" />
<!-- a Headless Activity to load the account from the account id before navigating to the
Incoming Account Settings fragment -->
<activity