diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-04-20 12:00:17 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-04-20 12:00:43 -0700 |
commit | c919a4fa94cfbfaff9a90dddfbfff096741c1574 (patch) | |
tree | be838adca8f43d4f01a4351b1fe3b4e8036c31a1 /src | |
parent | f589eebbec1d6826f15d15b09eb712b8b8a30f43 (diff) | |
download | android_packages_apps_Trebuchet-c919a4fa94cfbfaff9a90dddfbfff096741c1574.tar.gz android_packages_apps_Trebuchet-c919a4fa94cfbfaff9a90dddfbfff096741c1574.tar.bz2 android_packages_apps_Trebuchet-c919a4fa94cfbfaff9a90dddfbfff096741c1574.zip |
Kepping the rotation setting UI always enabled and accessible
Bug: 77654352
Change-Id: Iade9ef33bc70fdbdac9ab39d6fa77113fb21549a
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/SettingsActivity.java | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java index 738a8645a..7bd65574a 100644 --- a/src/com/android/launcher3/SettingsActivity.java +++ b/src/com/android/launcher3/SettingsActivity.java @@ -87,7 +87,6 @@ public class SettingsActivity extends Activity { public static class LauncherSettingsFragment extends PreferenceFragment { private IconBadgingObserver mIconBadgingObserver; - private RotationLockObserver mRotationLockObserver; private String mPreferenceKey; private boolean mPreferenceHighlighted = false; @@ -134,12 +133,6 @@ public class SettingsActivity extends Activity { // Launcher supports rotation by default. No need to show this setting. getPreferenceScreen().removePreference(rotationPref); } else { - mRotationLockObserver = new RotationLockObserver(rotationPref, resolver); - - // Register a content observer to listen for system setting changes while - // this UI is active. - mRotationLockObserver.register(Settings.System.ACCELEROMETER_ROTATION); - // Initialize the UI once rotationPref.setDefaultValue(getAllowRotationDefaultValue()); } @@ -201,10 +194,6 @@ public class SettingsActivity extends Activity { mIconBadgingObserver.unregister(); mIconBadgingObserver = null; } - if (mRotationLockObserver != null) { - mRotationLockObserver.unregister(); - mRotationLockObserver = null; - } super.onDestroy(); } @@ -228,23 +217,6 @@ public class SettingsActivity extends Activity { } } - private static class RotationLockObserver extends SettingsObserver.System { - - private final Preference mRotationPref; - - public RotationLockObserver(Preference rotationPref, ContentResolver resolver) { - super(resolver); - mRotationPref = rotationPref; - } - - @Override - public void onSettingChanged(boolean enabled) { - mRotationPref.setEnabled(enabled); - mRotationPref.setSummary(enabled - ? R.string.allow_rotation_desc : R.string.allow_rotation_blocked_desc); - } - } - /** * Content observer which listens for system badging setting changes, * and updates the launcher badging setting subtext accordingly. |