summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/accessibility/AccessibilitySettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/settings/accessibility/AccessibilitySettings.java')
-rw-r--r--src/com/android/settings/accessibility/AccessibilitySettings.java79
1 files changed, 0 insertions, 79 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 96577a0..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,10 +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_POWER_BUTTON_ENDS_CALL_PREFERENCE =
- "toggle_power_button_ends_call_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 =
@@ -170,21 +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 mTogglePowerButtonEndsCallPreference;
- private SwitchPreference mToggleLockScreenRotationPreference;
private SwitchPreference mToggleSpeakPasswordPreference;
private ListPreference mSelectLongPressTimeoutPreference;
private Preference mNoServicesMessagePreference;
@@ -225,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();
}
@@ -274,12 +251,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} else if (mToggleHighTextContrastPreference == preference) {
handleToggleTextContrastPreferenceClick();
return true;
- } else if (mTogglePowerButtonEndsCallPreference == preference) {
- handleTogglePowerButtonEndsCallPreferenceClick();
- return true;
- } else if (mToggleLockScreenRotationPreference == preference) {
- handleLockScreenRotationPreferenceClick();
- return true;
} else if (mToggleSpeakPasswordPreference == preference) {
handleToggleSpeakPasswordPreferenceClick();
return true;
@@ -308,19 +279,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
(mToggleHighTextContrastPreference.isChecked() ? 1 : 0));
}
- private void handleTogglePowerButtonEndsCallPreferenceClick() {
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
- (mTogglePowerButtonEndsCallPreference.isChecked()
- ? Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP
- : Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
- }
-
- private void handleLockScreenRotationPreferenceClick() {
- RotationPolicy.setRotationLockForAccessibility(getActivity(),
- !mToggleLockScreenRotationPreference.isChecked());
- }
-
private void handleToggleSpeakPasswordPreferenceClick() {
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
@@ -367,21 +325,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE);
mToggleInversionPreference.setOnPreferenceChangeListener(this);
- // Power button ends calls.
- mTogglePowerButtonEndsCallPreference =
- (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
- if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
- || !Utils.isVoiceCapable(getActivity())) {
- mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
- }
-
- // 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);
@@ -549,20 +492,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
mToggleInversionPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0) == 1);
- // Power button ends calls.
- if (KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
- && Utils.isVoiceCapable(getActivity())) {
- final int incallPowerBehavior = Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
- Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT);
- final boolean powerButtonEndsCall =
- (incallPowerBehavior == Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP);
- mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
- }
-
- // Auto-rotate screen
- updateLockScreenRotationCheckbox();
-
// Speak passwords.
final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
@@ -600,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();