ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix confusing setup screen title."

Browse Source
This commit is contained in:
Makoto Onuki 2010-02-01 14:25:54 -08:00 committed by Android (Google) Code Review
commit b89bc81f54
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@ -295,6 +295,12 @@
<!-- Title of screen when setting up new email account --> <!-- Title of screen when setting up new email account -->
<string name="account_setup_basics_title">Set up email</string> <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. --> <!-- 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 name="accounts_welcome">You can configure Email for most accounts in just a few steps.
</string> </string>

7
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -197,7 +197,12 @@ public class AccountSetupBasics extends Activity
mManualSetupButton.setVisibility(View.GONE); mManualSetupButton.setVisibility(View.GONE);
// Swap welcome text for EAS-specific text // Swap welcome text for EAS-specific text
TextView welcomeView = (TextView) findViewById(R.id.instructions); 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_alternate
: R.string.accounts_welcome_exchange); : R.string.accounts_welcome_exchange);
} }