diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-03-02 20:25:50 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 20:25:50 +0000 |
| commit | 49ef421bca1eceffc02a369894f4d51128d9b68a (patch) | |
| tree | ba13f2853abc999816b7e1f81a8777c431dd07b1 /java/res | |
| parent | d3b6619d9c825f8acdd3cff14b6f65bb2076a395 (diff) | |
| parent | 55d9651929729548c16270de0a83e3a01c7f2a9b (diff) | |
| download | latinime-49ef421bca1eceffc02a369894f4d51128d9b68a.tar.gz latinime-49ef421bca1eceffc02a369894f4d51128d9b68a.tar.xz latinime-49ef421bca1eceffc02a369894f4d51128d9b68a.zip | |
am 55d96519: Merge "Turn off cloud sync if we have managed profiles"
* commit '55d9651929729548c16270de0a83e3a01c7f2a9b':
Turn off cloud sync if we have managed profiles
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/xml/prefs_screen_accounts.xml | 7 | ||||
| -rw-r--r-- | java/res/xml/prefs_screen_advanced.xml | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml index e4baf7984..f2ade91e1 100644 --- a/java/res/xml/prefs_screen_accounts.xml +++ b/java/res/xml/prefs_screen_accounts.xml @@ -48,4 +48,11 @@ android:title="@string/clear_sync_data_title" android:summary="@string/clear_sync_data_summary" android:dependency="pref_enable_cloud_sync" /> + + <!-- Title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:defaultValue="true" + android:persistent="true" /> </PreferenceScreen> diff --git a/java/res/xml/prefs_screen_advanced.xml b/java/res/xml/prefs_screen_advanced.xml index 402132e67..6038f9947 100644 --- a/java/res/xml/prefs_screen_advanced.xml +++ b/java/res/xml/prefs_screen_advanced.xml @@ -43,12 +43,6 @@ android:summary="@string/prefs_enable_emoji_alt_physical_key_summary" android:defaultValue="true" android:persistent="true" /> - <!-- title will be set programmatically to embed application name --> - <CheckBoxPreference - android:key="pref_enable_metrics_logging" - android:summary="@string/enable_metrics_logging_summary" - android:defaultValue="true" - android:persistent="true" /> <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.DebugSettingsFragment" android:key="screen_debug" |