From 854edce6ddd7ed2d64406b66f746480741d61b15 Mon Sep 17 00:00:00 2001 From: Jatin Matani Date: Thu, 26 Feb 2015 13:05:49 -0800 Subject: Turn off cloud sync if we have managed profiles UserManager#getUserProfiles > 1 implies managed profile. Workflow: - Disable sync prefs - Execute an async task to check for managed profile; if managed profile is found, remove the sync prefs. If not, enable the preference; - Move the logging pref from Advanced to Account & Privacy. Bug:19230544 Change-Id: I4dbd1fe8433b3263ccc74c35dc0ee0bb371122b3 --- .../latin/settings/AdvancedSettingsFragment.java | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java') diff --git a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java index 9366726e2..f2e1aed4c 100644 --- a/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/settings/AdvancedSettingsFragment.java @@ -87,22 +87,6 @@ public final class AdvancedSettingsFragment extends SubScreenFragment { Settings.readKeyPreviewPopupEnabled(prefs, res)); } - // If metrics logging isn't supported, or account sign in is enabled - // don't show the logging preference. - // TODO: Eventually when we enable account sign in by default, - // we'll remove logging preference from here. - if (ProductionFlags.IS_METRICS_LOGGING_SUPPORTED) { - final Preference enableMetricsLogging = - findPreference(Settings.PREF_ENABLE_METRICS_LOGGING); - if (enableMetricsLogging != null) { - final String enableMetricsLoggingTitle = res.getString( - R.string.enable_metrics_logging, getApplicationName()); - enableMetricsLogging.setTitle(enableMetricsLoggingTitle); - } - } else { - removePreference(Settings.PREF_ENABLE_METRICS_LOGGING); - } - setupKeypressVibrationDurationSettings(); setupKeypressSoundVolumeSettings(); setupKeyLongpressTimeoutSettings(); -- cgit v1.2.3-83-g751a