diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-10-14 18:08:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-14 18:08:18 +0000 |
| commit | c2f0f751dd95bb10d2eeac064d43b016c754aa54 (patch) | |
| tree | ad8f2288becafd9f0e1c236fda3498155e48f0d1 /src/com/android/settings/accessibility | |
| parent | ec3e4cd5f3b8282eff347179a5af7de64371b188 (diff) | |
| parent | d8ae35ea50464da2f5c1933e831e0aced933d3b4 (diff) | |
| download | packages_apps_Settings-c2f0f751dd95bb10d2eeac064d43b016c754aa54.zip packages_apps_Settings-c2f0f751dd95bb10d2eeac064d43b016c754aa54.tar.gz packages_apps_Settings-c2f0f751dd95bb10d2eeac064d43b016c754aa54.tar.bz2 | |
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Diffstat (limited to 'src/com/android/settings/accessibility')
| -rw-r--r-- | src/com/android/settings/accessibility/AccessibilitySettings.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 92c478e..7d51712 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -30,7 +30,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceCategory; @@ -184,11 +183,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements private PreferenceCategory mServicesCategory; private PreferenceCategory mSystemsCategory; - private CheckBoxPreference mToggleLargeTextPreference; - private CheckBoxPreference mToggleHighTextContrastPreference; - private CheckBoxPreference mTogglePowerButtonEndsCallPreference; - private CheckBoxPreference mToggleLockScreenRotationPreference; - private CheckBoxPreference mToggleSpeakPasswordPreference; + private SwitchPreference mToggleLargeTextPreference; + private SwitchPreference mToggleHighTextContrastPreference; + private SwitchPreference mTogglePowerButtonEndsCallPreference; + private SwitchPreference mToggleLockScreenRotationPreference; + private SwitchPreference mToggleSpeakPasswordPreference; private ListPreference mSelectLongPressTimeoutPreference; private Preference mNoServicesMessagePreference; private PreferenceScreen mCaptioningPreferenceScreen; @@ -350,11 +349,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Large text. mToggleLargeTextPreference = - (CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE); // Text contrast. mToggleHighTextContrastPreference = - (CheckBoxPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE); // Display inversion. mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE); @@ -362,7 +361,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Power button ends calls. mTogglePowerButtonEndsCallPreference = - (CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE); if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER) || !Utils.isVoiceCapable(getActivity())) { mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference); @@ -370,14 +369,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Lock screen rotation. mToggleLockScreenRotationPreference = - (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); if (!RotationPolicy.isRotationSupported(getActivity())) { mSystemsCategory.removePreference(mToggleLockScreenRotationPreference); } // Speak passwords. mToggleSpeakPasswordPreference = - (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); + (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); // Long press timeout. mSelectLongPressTimeoutPreference = |