diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-03-30 20:04:56 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2015-03-30 20:04:57 +0000 |
| commit | e13f3754119af2db2fdf461755bcebdada670963 (patch) | |
| tree | 78962384109e2867bcac49252c2e30210e9cc9dc /java/res | |
| parent | 4b43b8798c5ed01b78f96a664f01f2111323fea8 (diff) | |
| parent | 66f139889d98c247bd82806ae2f8384de0ce036e (diff) | |
| download | latinime-e13f3754119af2db2fdf461755bcebdada670963.tar.gz latinime-e13f3754119af2db2fdf461755bcebdada670963.tar.xz latinime-e13f3754119af2db2fdf461755bcebdada670963.zip | |
Merge "Don't hide sync settings, v2 (cleaner)"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_accounts.xml | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 5655a5529..d64872cdd 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 f2ade91e1..75fff52c6 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" |