am dff42ac3: am c389a545: Fix launching Account settings
* commit 'dff42ac37e5176046da495411709793d0a49d52c':
Fix launching Account settings
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7f29928..f5cf5e2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -251,10 +251,12 @@
android:label="@string/account_setup_names_title"
>
</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:theme="@android:style/Theme.Holo.Light"
+ android:exported="true"
>
<intent-filter>
<action
diff --git a/build/res/values/strings.xml b/build/res/values/strings.xml
index f0b3eed..591a418 100644
--- a/build/res/values/strings.xml
+++ b/build/res/values/strings.xml
@@ -21,7 +21,7 @@
<string name="account_manager_type_imap" translatable="false">com.android.email</string>
<string name="account_manager_type_legacy_imap" translatable="false">com.android.email</string>
<string name="intent_exchange" translatable="false">com.android.email.EXCHANGE_INTENT</string>
- <string name="intent_account_manager_entry" translatable="false">com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT</string>
+ <string name="intent_account_manager_entry" translatable="false">com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY</string>
<string name="authority_email_provider" translatable="false">com.android.email.provider</string>
<string name="protocol_legacy_imap" translatable="false">imap</string>
<string name="protocol_imap" translatable="false">imap</string>