Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29d52671 authored by Michael Wright's avatar Michael Wright
Browse files

Add new touch and notification vibration intensity settings. 

Bug: 64185329
Test: ROBOTEST_FILTER=VibrationSettingsTest m -j RunSettingsRoboTests
Change-Id: I449c7e0041aabfe48935a57cde93e8af77dcd783
parent 085dcc37

res/values/strings.xml

+30 −0
Original line number Diff line number Diff line
@@ -4431,6 +4431,12 @@ 
    <string name="accessibility_autoclick_preference_title">Click after pointer stops moving</string>

    <!-- Title for accessibility preference for configuring amount of time that has to pass after pointer stops moving before click action can be performed (if automatic click after pointer stops moving feature is enabled). [CHAR LIMIT=NONE] -->

    <string name="accessibility_autoclick_delay_preference_title">Delay before click</string>

    <!-- Title for accessibility preference screen for configuring vibrations. -->

    <string name="accessibility_vibration_settings_title">Vibration</string>

    <!-- Title for accessibility preference for configuring notification vibrations. -->

    <string name="accessibility_notification_vibration_title">Ring &amp; notification vibration</string>

    <!-- Title for accessibility preference for configuring touch feedback vibrations. -->

    <string name="accessibility_touch_vibration_title">Touch vibration</string>

    <!-- Used in the acessibilty service settings to control turning on/off the service entirely -->

    <string name="accessibility_service_master_switch_title">Use service</string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
@@ -4474,6 +4480,30 @@ 
        <item quantity="other">Very long delay (<xliff:g id="click_delay_label" example="200">%1$d</xliff:g> ms)</item>

    </plurals>









    <!-- Summary for vibration settings preference when ring & notification are set to off-->









    <string name="accessibility_vibration_summary_off">Ring &amp; notification set to off</string>

















    <!-- Summary for vibration settings preference when ring & notification are set to low-->









    <string name="accessibility_vibration_summary_low">Ring &amp; notification set to low</string>

















    <!-- Summary for vibration settings preference when ring & notification are set to medium-->









    <string name="accessibility_vibration_summary_medium">Ring &amp; notification set to medium</string>

















    <!-- Summary for vibration settings preference when ring & notification are set to high-->









    <string name="accessibility_vibration_summary_high">Ring &amp; notification set to high</string>

















    <!-- Label describing an option turning vibrations off. [CHAR LIMIT=15] -->









    <string name="accessibility_vibration_intensity_off">Off</string>

















    <!-- Label describing a low intensity vibration option. [CHAR LIMIT=15] -->









    <string name="accessibility_vibration_intensity_low">Low</string>

















    <!-- Label describing a medium intensity vibration option. [CHAR LIMIT=15] -->









    <string name="accessibility_vibration_intensity_medium">Medium</string>

















    <!-- Label describing a high intensity vibration option. [CHAR LIMIT=15] -->









    <string name="accessibility_vibration_intensity_high">High</string>

















    <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->









    <string name="accessibility_menu_item_settings">Settings</string>








































res/xml/accessibility_notification_vibration_settings.xml
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  Copyright (C) 2018 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_notification_vibration_title" />
























res/xml/accessibility_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -93,6 +93,12 @@







                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.VibrationSettings"









            android:key="vibration_preference_screen"









            android:title="@string/accessibility_vibration_settings_title" />



















    </PreferenceCategory>



















    <PreferenceCategory
































res/xml/accessibility_touch_vibration_settings.xml
0 → 100644



+20
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  Copyright (C) 2018 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_touch_vibration_title" />
























res/xml/accessibility_vibration_settings.xml
0 → 100644



+31
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2018 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:key="accessibility_settings_screen"









        android:title="@string/accessibility_vibration_settings_title"









        android:persistent="true">



















    <Preference









        android:fragment="com.android.settings.accessibility.NotificationVibrationPreferenceFragment"









        android:key="notification_vibration_preference_screen"









        android:title="@string/accessibility_notification_vibration_title" />



















    <Preference









        android:fragment="com.android.settings.accessibility.TouchVibrationPreferenceFragment"









        android:key="touch_vibration_preference_screen"









        android:title="@string/accessibility_touch_vibration_title" />









</PreferenceScreen>