Merge "Simplify accessibility display adjustments"
This commit is contained in:
committed by
Android (Google) Code Review
commit
b2d5e81074
@@ -1171,20 +1171,6 @@
|
||||
<item>critical</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Display color inversion modes for accessibility -->
|
||||
<string-array name="inversion_type_entries">
|
||||
<item>Standard</item>
|
||||
<item>Hue only</item>
|
||||
<item>Value only</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Values for display color inversion modes -->
|
||||
<string-array name="inversion_type_values" translatable="false">
|
||||
<item>0</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Display color space adjustment modes for accessibility -->
|
||||
<string-array name="daltonizer_type_entries" translatable="false">
|
||||
<item>@string/daltonizer_mode_deuteranomaly</item>
|
||||
|
||||
@@ -3362,8 +3362,6 @@
|
||||
<string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
|
||||
<!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
|
||||
<string name="accessibility_long_press_timeout_preference_title">Touch & hold delay</string>
|
||||
<!-- Title for the accessibility preference to configure display contrast enhancement. [CHAR LIMIT=NONE] -->
|
||||
<string name="accessibility_display_contrast_preference_title">Contrast enhancement</string>
|
||||
<!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
|
||||
<string name="accessibility_display_inversion_preference_title">Color inversion</string>
|
||||
<!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
|
||||
@@ -3371,12 +3369,6 @@
|
||||
|
||||
<!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
|
||||
<string name="enable_quick_setting">Show in Quick Settings</string>
|
||||
<!-- Title for the preference to configure contrast enhancement's brightness level. [CHAR LIMIT=NONE] -->
|
||||
<string name="contrast_brightness">Brightness</string>
|
||||
<!-- Title for the preference to configure contrast enhancement's contrast level. [CHAR LIMIT=NONE] -->
|
||||
<string name="contrast_contrast">Contrast</string>
|
||||
<!-- Title for the preference to configure the type of color inversion to apply. [CHAR LIMIT=NONE] -->
|
||||
<string name="inversion_type">Inversion mode</string>
|
||||
<!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
|
||||
<string name="daltonizer_type">Correction mode</string>
|
||||
<!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2013 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/accessibility_display_contrast_preference_title" >
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="enable_quick_setting"
|
||||
android:persistent="false"
|
||||
android:title="@string/enable_quick_setting" />
|
||||
|
||||
<SeekBarPreference
|
||||
android:key="contrast"
|
||||
android:persistent="false"
|
||||
android:title="@string/contrast_contrast" />
|
||||
<SeekBarPreference
|
||||
android:key="brightness"
|
||||
android:persistent="false"
|
||||
android:title="@string/contrast_brightness" />
|
||||
|
||||
</PreferenceScreen>
|
||||
@@ -22,12 +22,4 @@
|
||||
android:persistent="false"
|
||||
android:title="@string/enable_quick_setting" />
|
||||
|
||||
<ListPreference
|
||||
android:entries="@array/inversion_type_entries"
|
||||
android:entryValues="@array/inversion_type_values"
|
||||
android:key="type"
|
||||
android:persistent="false"
|
||||
android:summary="%s"
|
||||
android:title="@string/inversion_type" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
@@ -77,10 +77,6 @@
|
||||
<PreferenceCategory
|
||||
android:key="display_category"
|
||||
android:title="@string/accessibility_display_title" >
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.settings.accessibility.ToggleContrastPreferenceFragment"
|
||||
android:key="contrast_preference_screen"
|
||||
android:title="@string/accessibility_display_contrast_preference_title" />
|
||||
<PreferenceScreen
|
||||
android:fragment="com.android.settings.accessibility.ToggleInversionPreferenceFragment"
|
||||
android:key="inversion_preference_screen"
|
||||
|
||||
Reference in New Issue
Block a user