Cleanup of Account setup flows
* Remove AccountSetupCheckSettings and related resources
* Remove all handling of EDIT flow in setup activities
Change-Id: I7b87d87978533b52b9c974d006920749389418d8
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e761459..2a6cb86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -115,14 +115,6 @@
android:label="@string/account_setup_names_title"
>
</activity>
- <!-- XXX Note: this activity is hacked to ignore config changes,
- since it doesn't currently handle them correctly in code. -->
- <activity
- android:name=".activity.setup.AccountSetupCheckSettings"
- android:label="@string/account_setup_check_settings_title"
- android:configChanges="keyboardHidden|orientation"
- >
- </activity>
<activity
android:name=".activity.setup.AccountSettingsXL"
android:label="@string/account_settings_action"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42454a6..290ce68 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,6 +24,8 @@
<string name="message_compose_attachments_skipped_toast" translatable="false"></string>
<!-- Do Not Translate. Unused string. -->
<string name="status_loading_more" translatable="false"></string>
+ <!-- Do Not Translate. Unused string. -->
+ <string name="account_setup_check_settings_canceling_msg"></string>
<!-- Messages that are not currently used, but will probably reused in the near future -->
<!-- STOPSHIP Remove them if they're not used after all -->
@@ -389,16 +391,16 @@
This login is already in use for the account \"<xliff:g id="duplicate">%s</xliff:g>\".
</string>
- <!-- Do Not Translate. Activity Title for check-settings screen -->
- <string name="account_setup_check_settings_title" translatable="false"></string>
<!-- On check-settings screen, this is the initially-displayed message. -->
- <string name="account_setup_check_settings_retr_info_msg">Retrieving account information\u2026</string>
+ <string name="account_setup_check_settings_retr_info_msg">
+ Retrieving account information\u2026</string>
<!-- Appears on screen while system is checking incoming server settings -->
- <string name="account_setup_check_settings_check_incoming_msg">Checking incoming server settings\u2026</string>
+ <string name="account_setup_check_settings_check_incoming_msg">
+ Checking incoming server settings\u2026</string>
<!-- Appears on screen while system is checking outgoing server settings -->
- <string name="account_setup_check_settings_check_outgoing_msg">Checking outgoing server settings\u2026</string>
- <!-- On check-settings screen, displayed briefly when user cancels the operation. -->
- <string name="account_setup_check_settings_canceling_msg">Canceling\u2026</string>
+ <string name="account_setup_check_settings_check_outgoing_msg">
+ Checking outgoing server settings\u2026</string>
+
<!-- Title of "Set up email" screen after success -->
<string name="account_setup_names_title">Set up email</string>
<!-- Text that appears on top of "Set up email" screen after successfully setting up an account -->
