PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-10-14 18:08:17 +00:00
committed by Android (Google) Code Review
parent ec3e4cd5f3 d8ae35ea50
commit c2f0f751dd
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/xml/accessibility_settings.xml
View File

@@ -37,28 +37,28 @@
android:key="screen_magnification_preference_screen" android:key="screen_magnification_preference_screen"
android:title="@string/accessibility_screen_magnification_title"/> android:title="@string/accessibility_screen_magnification_title"/>
<CheckBoxPreference <SwitchPreference
android:key="toggle_large_text_preference" android:key="toggle_large_text_preference"
android:title="@string/accessibility_toggle_large_text_preference_title" android:title="@string/accessibility_toggle_large_text_preference_title"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference <SwitchPreference
android:key="toggle_high_text_contrast_preference" android:key="toggle_high_text_contrast_preference"
android:title="@string/accessibility_toggle_high_text_contrast_preference_title" android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
android:summary="@string/experimental_preference" android:summary="@string/experimental_preference"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference <SwitchPreference
android:key="toggle_power_button_ends_call_preference" android:key="toggle_power_button_ends_call_preference"
android:title="@string/accessibility_power_button_ends_call_prerefence_title" android:title="@string/accessibility_power_button_ends_call_prerefence_title"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference <SwitchPreference
android:key="toggle_lock_screen_rotation_preference" android:key="toggle_lock_screen_rotation_preference"
android:title="@string/accelerometer_title" android:title="@string/accelerometer_title"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference <SwitchPreference
android:key="toggle_speak_password_preference" android:key="toggle_speak_password_preference"
android:title="@string/accessibility_toggle_speak_password_preference_title" android:title="@string/accessibility_toggle_speak_password_preference_title"
android:persistent="false"/> android:persistent="false"/>

21
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -30,7 +30,6 @@ import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
@@ -184,11 +183,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private PreferenceCategory mServicesCategory; private PreferenceCategory mServicesCategory;
private PreferenceCategory mSystemsCategory; private PreferenceCategory mSystemsCategory;
private CheckBoxPreference mToggleLargeTextPreference; private SwitchPreference mToggleLargeTextPreference;
private CheckBoxPreference mToggleHighTextContrastPreference; private SwitchPreference mToggleHighTextContrastPreference;
private CheckBoxPreference mTogglePowerButtonEndsCallPreference; private SwitchPreference mTogglePowerButtonEndsCallPreference;
private CheckBoxPreference mToggleLockScreenRotationPreference; private SwitchPreference mToggleLockScreenRotationPreference;
private CheckBoxPreference mToggleSpeakPasswordPreference; private SwitchPreference mToggleSpeakPasswordPreference;
private ListPreference mSelectLongPressTimeoutPreference; private ListPreference mSelectLongPressTimeoutPreference;
private Preference mNoServicesMessagePreference; private Preference mNoServicesMessagePreference;
private PreferenceScreen mCaptioningPreferenceScreen; private PreferenceScreen mCaptioningPreferenceScreen;
@@ -350,11 +349,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Large text. // Large text.
mToggleLargeTextPreference = mToggleLargeTextPreference =
(CheckBoxPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE); (SwitchPreference) findPreference(TOGGLE_LARGE_TEXT_PREFERENCE);
// Text contrast. // Text contrast.
mToggleHighTextContrastPreference = mToggleHighTextContrastPreference =
(CheckBoxPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE); (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);
// Display inversion. // Display inversion.
mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE); mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE);
@@ -362,7 +361,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Power button ends calls. // Power button ends calls.
mTogglePowerButtonEndsCallPreference = mTogglePowerButtonEndsCallPreference =
(CheckBoxPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE); (SwitchPreference) findPreference(TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE);
if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER) if (!KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
|| !Utils.isVoiceCapable(getActivity())) { || !Utils.isVoiceCapable(getActivity())) {
mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference); mSystemsCategory.removePreference(mTogglePowerButtonEndsCallPreference);
@@ -370,14 +369,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Lock screen rotation. // Lock screen rotation.
mToggleLockScreenRotationPreference = mToggleLockScreenRotationPreference =
(CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE); (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);
if (!RotationPolicy.isRotationSupported(getActivity())) { if (!RotationPolicy.isRotationSupported(getActivity())) {
mSystemsCategory.removePreference(mToggleLockScreenRotationPreference); mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
} }
// Speak passwords. // Speak passwords.
mToggleSpeakPasswordPreference = mToggleSpeakPasswordPreference =
(CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE); (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
// Long press timeout. // Long press timeout.
mSelectLongPressTimeoutPreference = mSelectLongPressTimeoutPreference =