Kepping the rotation setting UI always enabled and accessible

Bug: 77654352
Change-Id: Iade9ef33bc70fdbdac9ab39d6fa77113fb21549a
This commit is contained in:
Sunny Goyal
2018-04-20 12:00:17 -07:00
parent f589eebbec
commit c919a4fa94
3 changed files with 1 additions and 30 deletions

View File

@@ -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.