Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility settings interaction controls category restructure, add system controls fragment for related accessibility services.

Browse Source 
Bug: 174829936
Test: atest SystemControlsFragmentTest, atest AccessibilitySettingsTest
Change-Id: I609207c8c7bf0e5cb4beda0d5c578669bcd005a4
This commit is contained in:
Ben Chung
2021-01-12 21:39:40 +08:00
parent f27d3c33c4
commit 29ace16b35
5 changed files with 154 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/xml/accessibility_settings.xml
View File

@@ -65,25 +65,6 @@
android:persistent="false"
android:title="@string/interaction_control_category_title">
<SwitchPreference
android:key="toggle_power_button_ends_call_preference"
android:persistent="false"
android:title="@string/accessibility_power_button_ends_call_prerefence_title"
settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
<SwitchPreference
android:key="toggle_lock_screen_rotation_preference"
android:persistent="false"
android:title="@string/accelerometer_title"
settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
<Preference
android:fragment="com.android.settings.accessibility.VibrationSettings"
android:key="vibration_preference_screen"
android:persistent="false"
android:title="@string/accessibility_vibration_settings_title"
settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>
<Preference
android:fragment="com.android.settings.accessibility.TapAssistanceFragment"
android:key="tap_assistance_preference_screen"
@@ -92,12 +73,17 @@
settings:searchable="true"/>
<Preference
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
android:key="gesture_system_navigation_input_summary_accessibility"
android:fragment="com.android.settings.accessibility.SystemControlsFragment"
android:key="system_controls_preference_screen"
android:title="@string/accessibility_system_controls_title"
settings:searchable="true"/>
<Preference
android:fragment="com.android.settings.accessibility.VibrationSettings"
android:key="vibration_preference_screen"
android:persistent="false"
android:title="@string/system_navigation_title"
settings:searchable="false"
settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
android:title="@string/accessibility_vibration_settings_title"
settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>
</PreferenceCategory>

42
res/xml/accessibility_system_controls.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="accessibility_system_controls"
android:persistent="false"
android:title="@string/accessibility_system_controls_title">
<Preference
android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
android:key="gesture_system_navigation_input_summary_accessibility"
android:persistent="false"
android:title="@string/system_navigation_title"
settings:searchable="false"
settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>
<SwitchPreference
android:key="toggle_power_button_ends_call_preference"
android:persistent="false"
android:title="@string/accessibility_power_button_ends_call_prerefence_title"
settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>
<SwitchPreference
android:key="toggle_lock_screen_rotation_preference"
android:persistent="false"
android:title="@string/accelerometer_title"
settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
</PreferenceScreen>