diff options
| -rw-r--r-- | res/xml/accessibility_settings.xml | 5 | ||||
| -rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettings.java | 46 |
2 files changed, 0 insertions, 51 deletions
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 6c68786..a636a61 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -49,11 +49,6 @@ android:persistent="false"/> <SwitchPreference - android:key="toggle_lock_screen_rotation_preference" - android:title="@string/accelerometer_title" - android:persistent="false"/> - - <SwitchPreference android:key="toggle_speak_password_preference" android:title="@string/accessibility_toggle_speak_password_preference_title" android:persistent="false"/> diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index f9cd90f..27f6768 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -44,8 +44,6 @@ import android.view.KeyEvent; import android.view.accessibility.AccessibilityManager; import com.android.internal.content.PackageMonitor; import com.android.internal.logging.MetricsLogger; -import com.android.internal.view.RotationPolicy; -import com.android.internal.view.RotationPolicy.RotationPolicyListener; import com.android.settings.DialogCreatable; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -82,8 +80,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements "toggle_high_text_contrast_preference"; private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference"; - private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE = - "toggle_lock_screen_rotation_preference"; private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE = "toggle_speak_password_preference"; private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE = @@ -168,20 +164,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } }; - private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() { - @Override - public void onChange() { - updateLockScreenRotationCheckbox(); - } - }; - // Preference controls. private PreferenceCategory mServicesCategory; private PreferenceCategory mSystemsCategory; private SwitchPreference mToggleLargeTextPreference; private SwitchPreference mToggleHighTextContrastPreference; - private SwitchPreference mToggleLockScreenRotationPreference; private SwitchPreference mToggleSpeakPasswordPreference; private ListPreference mSelectLongPressTimeoutPreference; private Preference mNoServicesMessagePreference; @@ -222,20 +210,12 @@ 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); - } super.onPause(); } @@ -271,9 +251,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } else if (mToggleHighTextContrastPreference == preference) { handleToggleTextContrastPreferenceClick(); return true; - } else if (mToggleLockScreenRotationPreference == preference) { - handleLockScreenRotationPreferenceClick(); - return true; } else if (mToggleSpeakPasswordPreference == preference) { handleToggleSpeakPasswordPreferenceClick(); return true; @@ -302,11 +279,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements (mToggleHighTextContrastPreference.isChecked() ? 1 : 0)); } - private void handleLockScreenRotationPreferenceClick() { - RotationPolicy.setRotationLockForAccessibility(getActivity(), - !mToggleLockScreenRotationPreference.isChecked()); - } - private void handleToggleSpeakPasswordPreferenceClick() { Settings.Secure.putInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, @@ -353,13 +325,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE); mToggleInversionPreference.setOnPreferenceChangeListener(this); - // Lock screen rotation. - mToggleLockScreenRotationPreference = - (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); - if (!RotationPolicy.isRotationSupported(getActivity())) { - mSystemsCategory.removePreference(mToggleLockScreenRotationPreference); - } - // Speak passwords. mToggleSpeakPasswordPreference = (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); @@ -527,9 +492,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements mToggleInversionPreference.setChecked(Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0) == 1); - // Auto-rotate screen - updateLockScreenRotationCheckbox(); - // Speak passwords. final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0; @@ -567,14 +529,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements : R.string.accessibility_feature_state_off); } - private void updateLockScreenRotationCheckbox() { - Context context = getActivity(); - if (context != null) { - mToggleLockScreenRotationPreference.setChecked( - !RotationPolicy.isRotationLocked(context)); - } - } - private void loadInstalledServices() { Set<ComponentName> installedServices = sInstalledServices; installedServices.clear(); |