From 04960dabaae6a2037813b1c3e88f880309531c0d Mon Sep 17 00:00:00 2001
From: yingying <yingying@codeaurora.org>
Date: Tue, 23 Jul 2013 03:52:15 -0400
Subject: Email: Remove "Sync mail..." option when create POP3/IMAP account

Needn't to show the "Sync mail..." option when create the POP3/IMAP account, which
match the account setting interface after create the account.

CRs-Fixed: 440989

Change-Id: I467e2807bb7ea914876fbf46027ab9d0e68211cb
---
 res/layout/account_setup_options.xml                          | 3 ++-
 src/com/android/email/activity/setup/AccountSetupOptions.java | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index c4f17242e..f0d4a24ed 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -80,7 +80,8 @@
             android:id="@+id/account_sync_email"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:text="@string/account_setup_options_sync_email_label" />
+            android:text="@string/account_setup_options_sync_email_label"
+            android:visibility="gone" />
 
         <CheckBox
             android:id="@+id/account_background_attachments"
diff --git a/src/com/android/email/activity/setup/AccountSetupOptions.java b/src/com/android/email/activity/setup/AccountSetupOptions.java
index faf63ce04..13c911976 100644
--- a/src/com/android/email/activity/setup/AccountSetupOptions.java
+++ b/src/com/android/email/activity/setup/AccountSetupOptions.java
@@ -135,7 +135,10 @@ public class AccountSetupOptions extends AccountSetupActivity implements OnClick
         if (mServiceInfo.syncCalendar) {
             mSyncCalendarView.setVisibility(View.VISIBLE);
             mSyncCalendarView.setChecked(true);
-            UiUtilities.setVisibilitySafe(this, R.id.account_sync_calendar_divider, View.VISIBLE);
+            mSyncEmailView.setVisibility(View.VISIBLE);
+            mSyncEmailView.setChecked(true);
+            // Show the associated dividers
+            UiUtilities.setVisibilitySafe(this, R.id.account_sync_contacts_divider, View.VISIBLE);
         }
 
         if (!mServiceInfo.offerAttachmentPreload) {
-- 
cgit v1.2.3