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

Change exchange setup screen per #2025029

Browse Source 
Change-Id: Ib94713857902e336984b847f70c96e04826b9b74
This commit is contained in:
Marc Blank 2009-09-11 19:00:18 -07:00
parent c7897acf56
commit 60c7502b67
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/account_setup_exchange.xml
View File

@ -32,7 +32,7 @@
android:layout_weight="1"
android:orientation="vertical" >
<TextView
android:text="@string/account_setup_incoming_username_label"
android:text="@string/account_setup_exchange_username_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"

6
res/values/strings.xml
View File

@ -358,9 +358,11 @@
<string name="account_setup_exchange_title">Exchange server settings</string>
<!-- On "Exchange" setup screen, the name of the server -->
<string name="account_setup_exchange_server_label">Exchange Server</string>
<!-- On "Exchange" setup screen, the domain name label -->
<!-- On "Exchange" setup screen, the domain\\username -->
<string name="account_setup_exchange_username_label">Domain\\Username</string>
<!-- Deprecated: On "Exchange" setup screen, the domain name label -->
<string name="account_setup_exchange_domain_label">Domain</string>
<!-- On "Exchange" setup screen, the domain name hint -->
<!-- Deprecated: On "Exchange" setup screen, the domain name hint -->
<string name="account_setup_exchange_domain_hint">Enter domain here</string>
<!-- On "Exchange" setup screen, the use-SSL checkbox label -->
<string name="account_setup_exchange_ssl_label">Use secure connection (SSL)</string>

12
src/com/android/email/activity/setup/AccountSetupExchange.java
View File

@ -150,7 +150,8 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
}
if (username != null) {
mUsernameView.setText(username);
// Add a backslash to the start of the username as an affordance
mUsernameView.setText("\\" + username);
}
if (password != null) {
@ -236,8 +237,13 @@ public class AccountSetupExchange extends Activity implements OnClickListener,
boolean sslRequired = mSslSecurityView.isChecked();
boolean trustCertificates = mTrustCertificatesView.isChecked();
String scheme = (sslRequired) ? (trustCertificates ? "eas+tssl+" : "eas+ssl+") : "eas";
String userInfo = mUsernameView.getText().toString().trim() + ":" +
mPasswordView.getText().toString().trim();
String userName = mUsernameView.getText().toString().trim();
// Remove a leading backslash, if there is one, since we now automatically put one at
// the start of the username field
if (userName.startsWith("\\")) {
userName = userName.substring(1);
}
String userInfo = userName + ":" + mPasswordView.getText().toString().trim();
String host = mServerView.getText().toString().trim();
String path = null;