wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Exchange setup view.

Browse source
This commit is contained in:
Kris Wong 2011-01-28 22:45:10 +00:00
parent 13898f7edf
commit 88d0af16a5
3 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
res/layout/account_setup_incoming.xml
View file

@ -69,7 +69,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_security_label" /> android:contentDescription="@string/account_setup_incoming_security_label" />
<TextView <TextView
android:id="@+id/account_auth_type_label" android:id="@+id/account_auth_type_label"
android:text="@string/account_setup_incoming_auth_type_label" android:text="@string/account_setup_incoming_auth_type_label"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -122,10 +121,42 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_subscribed_folders_only_label" android:text="@string/account_setup_incoming_subscribed_folders_only_label"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/webdav_path_prefix_section" android:id="@+id/webdav_advanced_header"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/advanced"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
android:layout_marginTop="4px" />
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_mailbox_alias_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:text="@string/account_setup_incoming_webdav_mailbox_path_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/webdav_mailbox_path"
android:hint="@string/account_setup_incoming_webdav_mailbox_path_hint"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_mailbox_path_label" />
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_owa_path_section"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@ -137,14 +168,14 @@
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<EditText <EditText
android:id="@+id/webdav_path_prefix" android:id="@+id/webdav_path_prefix"
android:hint="@string/account_setup_incoming_imap_path_prefix_hint" android:hint="@string/account_setup_incoming_webdav_path_prefix_hint"
android:singleLine="true" android:singleLine="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_path_prefix_label" /> android:contentDescription="@string/account_setup_incoming_webdav_path_prefix_label" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/webdav_path_debug_section" android:id="@+id/webdav_auth_path_section"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@ -161,19 +192,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_auth_path_label" /> android:contentDescription="@string/account_setup_incoming_webdav_auth_path_label" />
<TextView
android:text="@string/account_setup_incoming_webdav_mailbox_path_label"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/webdav_mailbox_path"
android:hint="@string/account_setup_incoming_webdav_mailbox_path_hint"
android:singleLine="true"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:contentDescription="@string/account_setup_incoming_webdav_mailbox_path_label" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/compression_label" android:id="@+id/compression_label"

6
res/values/strings.xml
View file

@ -391,7 +391,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_incoming_password_label">Password</string> <string name="account_setup_incoming_password_label">Password</string>
<string name="account_setup_incoming_pop_server_label">POP3 server</string> <string name="account_setup_incoming_pop_server_label">POP3 server</string>
<string name="account_setup_incoming_imap_server_label">IMAP server</string> <string name="account_setup_incoming_imap_server_label">IMAP server</string>
<string name="account_setup_incoming_webdav_server_label">WebDAV (Exchange) server</string> <string name="account_setup_incoming_webdav_server_label">Exchange server</string>
<string name="account_setup_incoming_port_label">Port</string> <string name="account_setup_incoming_port_label">Port</string>
<string name="account_setup_incoming_security_label">Security type</string> <string name="account_setup_incoming_security_label">Security type</string>
<string name="account_setup_incoming_auth_type_label">Authentication type</string> <string name="account_setup_incoming_auth_type_label">Authentication type</string>
@ -438,12 +438,12 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string> <string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>
<string name="account_setup_auto_expand_folder">Auto-expand folder</string> <string name="account_setup_auto_expand_folder">Auto-expand folder</string>
<string name="account_setup_incoming_webdav_path_prefix_label">WebDAV (Exchange) path</string> <string name="account_setup_incoming_webdav_path_prefix_label">OWA path</string>
<string name="account_setup_incoming_webdav_path_prefix_hint">Optional</string> <string name="account_setup_incoming_webdav_path_prefix_hint">Optional</string>
<string name="account_setup_incoming_webdav_auth_path_label">Authentication path</string> <string name="account_setup_incoming_webdav_auth_path_label">Authentication path</string>
<string name="account_setup_incoming_webdav_auth_path_hint">Optional</string> <string name="account_setup_incoming_webdav_auth_path_hint">Optional</string>
<string name="account_setup_incoming_webdav_mailbox_path_label">Mailbox path</string> <string name="account_setup_incoming_webdav_mailbox_path_label">Mailbox alias</string>
<string name="account_setup_incoming_webdav_mailbox_path_hint">Optional</string> <string name="account_setup_incoming_webdav_mailbox_path_hint">Optional</string>
<string name="account_setup_outgoing_title">Outgoing server settings</string> <string name="account_setup_outgoing_title">Outgoing server settings</string>

21
src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View file

@ -263,15 +263,16 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
serverLabelView.setText(R.string.account_setup_incoming_pop_server_label); serverLabelView.setText(R.string.account_setup_incoming_pop_server_label);
mAccountPorts = popPorts; mAccountPorts = popPorts;
mAccountSchemes = popSchemes; mAccountSchemes = popSchemes;
findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE); findViewById(R.id.imap_path_prefix_section).setVisibility(View.GONE);
findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE); findViewById(R.id.webdav_advanced_header).setVisibility(View.GONE);
findViewById(R.id.webdav_mailbox_alias_section).setVisibility(View.GONE);
findViewById(R.id.webdav_owa_path_section).setVisibility(View.GONE);
findViewById(R.id.webdav_auth_path_section).setVisibility(View.GONE);
findViewById(R.id.account_auth_type_label).setVisibility(View.GONE); findViewById(R.id.account_auth_type_label).setVisibility(View.GONE);
findViewById(R.id.account_auth_type).setVisibility(View.GONE); findViewById(R.id.account_auth_type).setVisibility(View.GONE);
findViewById(R.id.compression_section).setVisibility(View.GONE); findViewById(R.id.compression_section).setVisibility(View.GONE);
findViewById(R.id.compression_label).setVisibility(View.GONE); findViewById(R.id.compression_label).setVisibility(View.GONE);
mAccount.setDeletePolicy(Account.DELETE_POLICY_NEVER); mAccount.setDeletePolicy(Account.DELETE_POLICY_NEVER);
} }
else if (uri.getScheme().startsWith("imap")) else if (uri.getScheme().startsWith("imap"))
{ {
@ -283,15 +284,17 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
{ {
mImapPathPrefixView.setText(uri.getPath().substring(1)); mImapPathPrefixView.setText(uri.getPath().substring(1));
} }
findViewById(R.id.webdav_path_prefix_section).setVisibility(View.GONE);
findViewById(R.id.webdav_path_debug_section).setVisibility(View.GONE); findViewById(R.id.webdav_advanced_header).setVisibility(View.GONE);
findViewById(R.id.webdav_mailbox_alias_section).setVisibility(View.GONE);
findViewById(R.id.webdav_owa_path_section).setVisibility(View.GONE);
findViewById(R.id.webdav_auth_path_section).setVisibility(View.GONE);
mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE); mAccount.setDeletePolicy(Account.DELETE_POLICY_ON_DELETE);
if (! Intent.ACTION_EDIT.equals(getIntent().getAction())) if (!Intent.ACTION_EDIT.equals(getIntent().getAction()))
{ {
findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE); findViewById(R.id.imap_folder_setup_section).setVisibility(View.GONE);
} }
} }
else if (uri.getScheme().startsWith("webdav")) else if (uri.getScheme().startsWith("webdav"))
{ {
@ -372,14 +375,12 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
subscribedFoldersOnly.setChecked(mAccount.subscribedFoldersOnly()); subscribedFoldersOnly.setChecked(mAccount.subscribedFoldersOnly());
validateFields(); validateFields();
} }
catch (Exception e) catch (Exception e)
{ {
failure(e); failure(e);
} }
} }
@Override @Override