141b5bb3bc
Updating the Settings app to allow setting the value off for key
HAPTIC_FEEDBACK_INTENSITY. This setting state is also copied onto
HAPTIC_FEEDBACK_ENABLED setting, so both should be in sync after this
change.
Similar logic is applied between RING_VIBRATION_INTENSITY and
VIBRATE_WHEN_RINGING.
This will not disable the hardware feedback since that one is controlled
by a separate setting key now.
The "vibrate for calls" was also removed and the single toggle for
"vibrate first then ring gradually" was moved into the "Vibration &
haptics" page.
Bug: 185351540
Test: [HapticFeedback|NotificationVibration|RingVibration][Intensity|Toggle]PreferenceControllerTest
and manual testing of the AOSP settings app
Change-Id: I9c94cef331a1500a1272a601ba32667ca995ddab
65 lines
2.9 KiB
XML
65 lines
2.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2022 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:app="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/accessibility_vibration_settings_title">
|
|
|
|
<PreferenceCategory
|
|
android:key="accessibility_call_vibration_category"
|
|
android:title="@string/accessibility_call_vibration_category_title">
|
|
|
|
<com.android.settings.widget.SeekBarPreference
|
|
android:key="ring_vibration_preference_screen"
|
|
android:title="@string/accessibility_ring_vibration_title"
|
|
app:keywords="@string/keywords_ring_vibration"
|
|
app:controller="com.android.settings.accessibility.RingVibrationIntensityPreferenceController" />
|
|
|
|
<SwitchPreference
|
|
android:key="ramping_ringer"
|
|
android:title="@string/vibrate_when_ringing_option_ramping_ringer"
|
|
app:keywords="@string/keywords_ramping_ringer_vibration"
|
|
app:controller="com.android.settings.accessibility.VibrationRampingRingerTogglePreferenceController"/>
|
|
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="accessibility_notification_alarm_vibration_category"
|
|
android:title="@string/accessibility_notification_alarm_vibration_category_title">
|
|
|
|
<com.android.settings.widget.SeekBarPreference
|
|
android:key="notification_vibration_preference_screen"
|
|
android:title="@string/accessibility_notification_vibration_title"
|
|
app:keywords="@string/keywords_notification_vibration"
|
|
app:controller="com.android.settings.accessibility.NotificationVibrationIntensityPreferenceController" />
|
|
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="accessibility_interactive_haptics_category"
|
|
android:title="@string/accessibility_interactive_haptics_category_title">
|
|
|
|
<com.android.settings.widget.SeekBarPreference
|
|
android:key="touch_vibration_preference_screen"
|
|
android:title="@string/accessibility_touch_vibration_title"
|
|
app:keywords="@string/keywords_touch_vibration"
|
|
app:controller="com.android.settings.accessibility.HapticFeedbackIntensityPreferenceController" />
|
|
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen>
|