From e5c3c98e9a85198e0b023fd25529512baeb88cdb Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 1 Feb 2010 13:36:53 -0800
Subject: [PATCH] Fix confusing setup screen title.

Change the title of the screen for adding an exchange account from "Set up email" to "Add an Exchange account".

Bug: 2159019
---
 res/values/strings.xml                                     | 6 ++++++
 .../android/email/activity/setup/AccountSetupBasics.java   | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c34ac0976..94f0766c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -295,6 +295,12 @@
 
     <!-- Title of screen when setting up new email account -->
     <string name="account_setup_basics_title">Set up email</string>
+    <!-- Title of the screen when adding exchange account -->
+    <string name="account_setup_basics_exchange_title">
+        Add an Exchange account</string>
+    <!-- Title of the screen when adding exchange account -->
+    <string name="account_setup_basics_exchange_title_alternate">
+        Add an Exchange ActiveSync account</string>
     <!-- On "Set up email" screen, enthusiastic welcome message. -->
     <string name="accounts_welcome">You can configure Email for most accounts in just a few steps.
         </string>
diff --git a/src/com/android/email/activity/setup/AccountSetupBasics.java b/src/com/android/email/activity/setup/AccountSetupBasics.java
index 7243f775e..d1d5540b7 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasics.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasics.java
@@ -197,7 +197,12 @@ public class AccountSetupBasics extends Activity
             mManualSetupButton.setVisibility(View.GONE);
             // Swap welcome text for EAS-specific text
             TextView welcomeView = (TextView) findViewById(R.id.instructions);
-            welcomeView.setText(VendorPolicyLoader.getInstance(this).useAlternateExchangeStrings()
+            final boolean alternateStrings =
+                    VendorPolicyLoader.getInstance(this).useAlternateExchangeStrings();
+            setTitle(alternateStrings
+                    ? R.string.account_setup_basics_exchange_title_alternate
+                    : R.string.account_setup_basics_exchange_title);
+            welcomeView.setText(alternateStrings
                     ? R.string.accounts_welcome_exchange_alternate
                     : R.string.accounts_welcome_exchange);
         }