diff options
| author | Tony Mantler <nicoya@google.com> | 2014-06-27 17:52:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-27 15:56:14 +0000 |
| commit | 88580cd5e04bd21a5a87ad4702a728ebbb57618c (patch) | |
| tree | 3a73511d8e3d8ff0d0067504db941421b8ae51b1 /AndroidManifest.xml | |
| parent | 9a311806cab6e70c960a26a0207d44a6c01ccac9 (diff) | |
| parent | 06415a635f5f01d8e1620b29f44d68dc4dfdf435 (diff) | |
| download | android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.tar.gz android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.tar.bz2 android_packages_apps_Email-88580cd5e04bd21a5a87ad4702a728ebbb57618c.zip | |
Merge "Unify settings activity" into ub-mail-master
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4ddf48243..c1f043a13 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -272,30 +272,40 @@ android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> - <!-- Must be exported in order for the AccountManager to launch it --> <activity android:name=".activity.setup.AccountSettings" android:label="@string/settings_activity_title" - android:exported="true" - > + android:exported="false" > <intent-filter> - <action android:name="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY" /> + <action android:name="android.intent.action.EDIT" /> + <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> + <data + android:scheme="content" + android:host="ui.email.android.com" + android:pathPrefix="/settings" + /> </intent-filter> + </activity> + <activity + android:name="com.android.mail.ui.settings.PublicPreferenceActivity" + android:label="@string/settings_activity_title" + android:exported="true" + android:theme="@android:style/Theme.NoDisplay" > + <!-- Must be exported in order for the AccountManager to launch it --> <intent-filter> - <action android:name="android.intent.action.EDIT" /> + <action android:name="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY" /> <category android:name="android.intent.category.DEFAULT" /> - <data - android:scheme="content" - android:host="ui.email.android.com" - android:pathPrefix="/settings" - /> </intent-filter> <intent-filter> <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" /> <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> <!-- a Headless Activity to load the account from the account id before navigating to the Incoming Account Settings fragment --> <activity |