Merge "Pull out PreferenceControllers from AccessibilitySettings"
This commit is contained in:
TreeHugger Robot
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
21da32d9b1
@@ -15,41 +15,43 @@
|
||||
-->
|
||||
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="accessibility_settings_screen"
|
||||
android:title="@string/accessibility_settings"
|
||||
android:persistent="true">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:key="accessibility_settings_screen"
|
||||
android:title="@string/accessibility_settings"
|
||||
android:persistent="true">
|
||||
|
||||
<Preference
|
||||
android:key="accessibility_shortcut_preference"
|
||||
android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
|
||||
android:title="@string/accessibility_global_gesture_preference_title"/>
|
||||
android:key="accessibility_shortcut_preference"
|
||||
android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
|
||||
android:title="@string/accessibility_global_gesture_preference_title"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="user_installed_services_category"
|
||||
android:title="@string/user_installed_services_category_title">
|
||||
android:key="user_installed_services_category"
|
||||
android:title="@string/user_installed_services_category_title">
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="screen_reader_category"
|
||||
android:title="@string/screen_reader_category_title">
|
||||
android:key="screen_reader_category"
|
||||
android:title="@string/screen_reader_category_title">
|
||||
|
||||
<Preference
|
||||
android:key="tts_settings_preference"
|
||||
android:fragment="com.android.settings.tts.TextToSpeechSettings"
|
||||
android:title="@string/tts_settings_title"
|
||||
settings:searchable="false"/>
|
||||
android:key="tts_settings_preference"
|
||||
android:title="@string/tts_settings_title"
|
||||
android:fragment="com.android.settings.tts.TextToSpeechSettings"
|
||||
settings:controller="com.android.settings.language.TtsPreferenceController"
|
||||
settings:searchable="false"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="display_category"
|
||||
android:title="@string/display_category_title">
|
||||
android:key="display_category"
|
||||
android:title="@string/display_category_title">
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
|
||||
android:key="font_size_preference_screen"
|
||||
android:title="@string/title_font_size"
|
||||
android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
|
||||
settings:controller="com.android.settings.display.FontSizePreferenceController"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<com.android.settings.display.ScreenZoomPreference
|
||||
@@ -61,68 +63,70 @@
|
||||
<SwitchPreference
|
||||
android:key="dark_ui_mode_accessibility"
|
||||
android:title="@string/dark_ui_mode"
|
||||
settings:controller="com.android.settings.display.DarkUIPreferenceController"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
|
||||
android:key="magnification_preference_screen"
|
||||
android:title="@string/accessibility_screen_magnification_title"
|
||||
android:icon="@drawable/ic_accessibility_magnification" />
|
||||
android:icon="@drawable/ic_accessibility_magnification"
|
||||
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
|
||||
settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_large_pointer_icon"
|
||||
android:title="@string/accessibility_toggle_large_pointer_icon_title" />
|
||||
android:key="toggle_large_pointer_icon"
|
||||
android:title="@string/accessibility_toggle_large_pointer_icon_title"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_disable_animations"
|
||||
android:title="@string/accessibility_disable_animations" />
|
||||
android:title="@string/accessibility_disable_animations"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="interaction_control_category"
|
||||
android:title="@string/interaction_control_category_title">
|
||||
android:key="interaction_control_category"
|
||||
android:title="@string/interaction_control_category_title">
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
|
||||
android:key="autoclick_preference"
|
||||
android:title="@string/accessibility_autoclick_preference_title"
|
||||
settings:searchable="false"/>
|
||||
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
|
||||
android:key="autoclick_preference"
|
||||
android:title="@string/accessibility_autoclick_preference_title"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_power_button_ends_call_preference"
|
||||
android:title="@string/accessibility_power_button_ends_call_prerefence_title"
|
||||
android:persistent="false"/>
|
||||
android:key="toggle_power_button_ends_call_preference"
|
||||
android:title="@string/accessibility_power_button_ends_call_prerefence_title"
|
||||
android:persistent="false"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_lock_screen_rotation_preference"
|
||||
android:title="@string/accelerometer_title"
|
||||
android:persistent="false"
|
||||
settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
|
||||
android:key="toggle_lock_screen_rotation_preference"
|
||||
android:title="@string/accelerometer_title"
|
||||
android:persistent="false"
|
||||
settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
|
||||
|
||||
<ListPreference
|
||||
android:key="select_long_press_timeout_preference"
|
||||
android:title="@string/accessibility_long_press_timeout_preference_title"
|
||||
android:entries="@array/long_press_timeout_selector_titles"
|
||||
android:entryValues="@array/long_press_timeout_selector_values"
|
||||
android:persistent="false"/>
|
||||
android:key="select_long_press_timeout_preference"
|
||||
android:title="@string/accessibility_long_press_timeout_preference_title"
|
||||
android:entries="@array/long_press_timeout_selector_titles"
|
||||
android:entryValues="@array/long_press_timeout_selector_values"
|
||||
android:persistent="false"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
|
||||
android:key="accessibility_control_timeout_preference_fragment"
|
||||
android:title="@string/accessibility_setting_item_control_timeout_title"
|
||||
android:persistent="false" />
|
||||
android:persistent="false"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.VibrationSettings"
|
||||
android:key="vibration_preference_screen"
|
||||
android:title="@string/accessibility_vibration_settings_title" />
|
||||
android:title="@string/accessibility_vibration_settings_title"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="audio_and_captions_category"
|
||||
android:title="@string/audio_and_captions_category_title">
|
||||
android:key="audio_and_captions_category"
|
||||
android:title="@string/audio_and_captions_category_title">
|
||||
|
||||
<Preference
|
||||
android:key="live_caption"
|
||||
@@ -131,14 +135,14 @@
|
||||
settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_master_mono"
|
||||
android:title="@string/accessibility_toggle_master_mono_title"
|
||||
android:summary="@string/accessibility_toggle_master_mono_summary"
|
||||
android:persistent="false"/>
|
||||
android:key="toggle_master_mono"
|
||||
android:title="@string/accessibility_toggle_master_mono_title"
|
||||
android:summary="@string/accessibility_toggle_master_mono_summary"
|
||||
android:persistent="false"/>
|
||||
|
||||
<com.android.settings.accessibility.BalanceSeekBarPreference
|
||||
android:key="seekbar_master_balance"
|
||||
android:title="@string/accessibility_toggle_master_balance_title" />
|
||||
android:key="seekbar_master_balance"
|
||||
android:title="@string/accessibility_toggle_master_balance_title"/>
|
||||
|
||||
<Preference
|
||||
android:key="hearing_aid_preference"
|
||||
@@ -146,32 +150,32 @@
|
||||
android:title="@string/accessibility_hearingaid_title"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
|
||||
android:key="captioning_preference_screen"
|
||||
android:title="@string/accessibility_captioning_title" />
|
||||
android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
|
||||
android:key="captioning_preference_screen"
|
||||
android:title="@string/accessibility_captioning_title"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="experimental_category"
|
||||
android:title="@string/experimental_category_title">
|
||||
android:key="experimental_category"
|
||||
android:title="@string/experimental_category_title">
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_high_text_contrast_preference"
|
||||
android:title="@string/accessibility_toggle_high_text_contrast_preference_title" />
|
||||
android:key="toggle_high_text_contrast_preference"
|
||||
android:title="@string/accessibility_toggle_high_text_contrast_preference_title"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
|
||||
android:key="daltonizer_preference"
|
||||
android:title="@string/accessibility_display_daltonizer_preference_title"
|
||||
android:icon="@drawable/ic_daltonizer"
|
||||
settings:searchable="false"/>
|
||||
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
|
||||
android:key="daltonizer_preference"
|
||||
android:title="@string/accessibility_display_daltonizer_preference_title"
|
||||
android:icon="@drawable/ic_daltonizer"
|
||||
settings:searchable="false"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="toggle_inversion_preference"
|
||||
android:title="@string/accessibility_display_inversion_preference_title"
|
||||
android:summary="@string/accessibility_display_inversion_preference_subtitle"
|
||||
android:persistent="false"
|
||||
android:icon="@drawable/ic_color_inversion"
|
||||
settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
|
||||
android:key="toggle_inversion_preference"
|
||||
android:title="@string/accessibility_display_inversion_preference_title"
|
||||
android:summary="@string/accessibility_display_inversion_preference_subtitle"
|
||||
android:persistent="false"
|
||||
android:icon="@drawable/ic_color_inversion"
|
||||
settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user