Don't hide sync settings, v2 (cleaner)
Bug:19961809
Change-Id: I02d6bd773dc20112c8fa3b83ac305d0cdbbd58d0
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 5655a55..d64872c 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -82,6 +82,10 @@
<string name="add_account_to_enable_sync">
Please add a Google account to this device to enable this feature
</string>
+ <!-- Text to tell the user that sync feature is disabled because they have Google Apps for Business account(s) on their device. [CHAR LIMIT=75]-->
+ <string name="cloud_sync_summary_disabled_work_profile">
+ Sync is not available for devices with Google Apps for Business accounts
+ </string>
<!-- Option name for including other IMEs in the language switch list [CHAR LIMIT=30] -->
<string name="include_other_imes_in_language_switch_list">Switch to other input methods</string>
diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml
index f2ade91..75fff52 100644
--- a/java/res/xml/prefs_screen_accounts.xml
+++ b/java/res/xml/prefs_screen_accounts.xml
@@ -26,7 +26,8 @@
android:key="account_switcher"
android:persistent="false"
android:title="@string/switch_accounts"
- android:summary="@string/no_accounts_selected" />
+ android:summary="@string/no_accounts_selected"
+ android:enabled="false" />
<!-- Summary will be set programmatically to reflect the account status -->
<CheckBoxPreference
@@ -34,7 +35,8 @@
android:title="@string/cloud_sync_title"
android:defaultValue="false"
android:persistent="true"
- android:disableDependentsState="false" />
+ android:disableDependentsState="false"
+ android:enabled="false" />
<!-- This preference (acts like a button) enables the user to initiate an one time sync. -->
<Preference android:key="pref_sync_now"