Merge "Remove Auto-rotate screen setting if a required feature is missing." (3303e776) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/AccessibilitySettings.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -200,16 +200,20 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements

		mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
		mSettingsContentObserver.register(getContentResolver());
		if (RotationPolicy.isRotationSupported(getActivity())) {
		RotationPolicy.registerRotationPolicyListener(getActivity(),
		mRotationPolicyListener);
		}
		}

		@Override
		public void onPause() {
		mSettingsPackageMonitor.unregister();
		mSettingsContentObserver.unregister(getContentResolver());
		if (RotationPolicy.isRotationSupported(getActivity())) {
		RotationPolicy.unregisterRotationPolicyListener(getActivity(),
		mRotationPolicyListener);
		mSettingsContentObserver.unregister(getContentResolver());
		}
		super.onPause();
		}

		@@ -320,6 +324,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
		// Lock screen rotation.
		mToggleLockScreenRotationPreference =
		(CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
		if (!RotationPolicy.isRotationSupported(getActivity())) {
		mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
		}

		// Speak passwords.
		mToggleSpeakPasswordPreference =

+4 −2

Original line number	Diff line number	Diff line
		@@ -95,9 +95,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements

		mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
		mAccelerometer.setPersistent(false);
		if (RotationPolicy.isRotationLockToggleSupported(getActivity())) {
		if (!RotationPolicy.isRotationSupported(getActivity())
		\|\| RotationPolicy.isRotationLockToggleSupported(getActivity())) {
		// If rotation lock is supported, then we do not provide this option in
		// Display settings. However, is still available in Accessibility settings.
		// Display settings. However, is still available in Accessibility settings,
		// if the device supports rotation.
		getPreferenceScreen().removePreference(mAccelerometer);
		}