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

Commit d0f1724c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move vibrate for calls setting to "Vibration & haptics" screen"

parents 4d365799 fe2ed12d

res/values/strings.xml

+11 −12
Original line number Diff line number Diff line
@@ -5553,11 +5553,17 @@ 
    <!-- Description for the seekbar that adjust auto click time. [CHAR_LIMIT=NONE] -->

    <string name="accessibility_autoclick_seekbar_desc">Auto click time</string>

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

    <string name="accessibility_vibration_settings_title">Vibration &amp; haptic strength</string>

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

    <string name="accessibility_notification_vibration_title">Notification vibration</string>

    <string name="accessibility_vibration_settings_title">Vibration &amp; haptics</string>

    <!-- Title for the category of preferences to configure device vibrations related to calls. [CHAR LIMIT=NONE] -->

    <string name="accessibility_call_vibration_category_title">Calls</string>

    <!-- Title for the category of preferences to configure device vibrations related to notifications and alarms. [CHAR LIMIT=NONE] -->

    <string name="accessibility_notification_alarm_vibration_category_title">Notifications and alarms</string>

    <!-- Title for the category of preferences to configure device vibrations triggered by user interaction with the device. [CHAR LIMIT=NONE] -->

    <string name="accessibility_interactive_haptics_category_title">Interactive haptics</string>

    <!-- Title for accessibility preference for configuring ring vibrations. [CHAR LIMIT=NONE] -->

    <string name="accessibility_ring_vibration_title">Ring vibration</string>

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

    <string name="accessibility_notification_vibration_title">Notification vibration</string>

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

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

    <!-- Used in the accessibility service settings to control turning on/off the service entirely [CHAR LIMIT=60] -->
@@ -8269,8 +8275,6 @@ 
    <string name="keywords_wifi_notify_open_networks">Wi\u2011Fi notification, wifi notification</string>

    <!-- Search keyword for "Wi-fi data usage" settings. [CHAR_LIMIT=NONE]-->

    <string name="keywords_wifi_data_usage">data usage</string>

    <!-- Search keyword for "Vibrate on touch" settings. [CHAR_LIMIT=NONE]-->

    <string name="keywords_vibrate_on_touch">Stop vibration, tap, keyboard</string>

    <!-- Search keyword for "Time format" settings. [CHAR_LIMIT=NONE]-->

    <string name="keywords_time_format">Use 24-hour format</string>

    <!-- Search keyword for "Files" settings under Settings > Storage. [CHAR_LIMIT=NONE]-->
@@ -8406,11 +8410,12 @@ 














    <!-- List of synonyms for touch vibration setting (where you get a haptic response for touching things on the screen), used to match in settings search [CHAR LIMIT=NONE] -->















    <string name="keywords_touch_vibration">haptics, vibrate, screen, sensitivity</string>



























    <!-- List of synonyms for ring vibration setting (changes whether your phone vibrates when it rings), used to match in settings search [CHAR LIMIT=NONE] -->















    <string name="keywords_ring_vibration">haptics, vibrate, phone, call, sensitivity, ring</string>















    <!-- List of synonyms for notification vibration setting (changes whether your phone vibrates when it shows a notification), used to match in settings search [CHAR LIMIT=NONE] -->















    <string name="keywords_notification_vibration">haptics, vibrate, sensitivity</string>













    <!-- List of synonyms for vibration and haptics setting, used to match in settings search [CHAR LIMIT=NONE] -->













    <string name="keywords_vibration">haptics, vibrate, vibration</string>















    <!-- Battery Saver: Search terms for sticky battery saver preference [CHAR_LIMIT=NONE] -->















    <string name="keywords_battery_saver_sticky">battery saver, sticky, persist, power saver, battery</string>















    <!-- Battery Saver: Search terms for battery saver schedule preference. Feel free to add additional terms when translating if appropriate [CHAR_LIMIT=NONE] -->










@@ -8522,12 +8527,6 @@













    <!-- Sound: Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->















    <string name="touch_sounds_title">Touch sounds</string>



























    <!-- Sound: Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->













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

























    <!-- Sound: Other sounds: Preference summary to the option enabling haptic feedback on touch. -->













    <string name="vibrate_on_touch_summary">Haptic feedback for tap, keyboard, and more</string>



























    <!-- Sound: Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->















    <string name="dock_audio_media_title">Dock speaker plays</string>







































res/xml/accessibility_settings.xml



+2
−1






























Original line number
Diff line number
Diff line








@@ -100,7 +100,8 @@













            android:icon="@drawable/ic_vibration"















            android:persistent="false"















            android:title="@string/accessibility_vibration_settings_title"













            settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>













            settings:controller="com.android.settings.accessibility.VibrationPreferenceController"













            settings:keywords="@string/keywords_vibration"/>































    </PreferenceCategory>

















































res/xml/accessibility_vibration_settings.xml



+45
−20






























Original line number
Diff line number
Diff line








@@ -20,6 +20,10 @@













    xmlns:settings="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">





























        <Preference















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















            android:key="ring_vibration_preference_screen"









@@ -27,6 +31,18 @@













            settings:keywords="@string/keywords_ring_vibration"















            app:controller="com.android.settings.accessibility.RingVibrationIntensityPreferenceController" />





























        <Preference













            android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"













            android:key="vibrate_for_calls"













            android:title="@string/vibrate_when_ringing_title"













            settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"/>



























    </PreferenceCategory>



























    <PreferenceCategory













        android:key="accessibility_notification_alarm_vibration_category"













        android:title="@string/accessibility_notification_alarm_vibration_category_title">





























        <Preference















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















            android:key="notification_vibration_preference_screen"









@@ -34,10 +50,19 @@













            settings: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">





























        <Preference















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















            android:key="touch_vibration_preference_screen"















            android:title="@string/accessibility_touch_vibration_title"















            settings:keywords="@string/keywords_touch_vibration"















            app:controller="com.android.settings.accessibility.HapticFeedbackIntensityPreferenceController" />



























    </PreferenceCategory>





























</PreferenceScreen>
























res/xml/other_sound_settings.xml



+0
−6






























Original line number
Diff line number
Diff line








@@ -44,12 +44,6 @@













            android:key="touch_sounds"















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





























    <!-- Vibrate on touch -->













    <SwitchPreference













            android:key="vibrate_on_touch"













            android:title="@string/vibrate_on_touch_title"













            android:summary="@string/vibrate_on_touch_summary" />





























    <!-- Dock speaker plays -->















    <DropDownPreference















            android:key="dock_audio_media"

































res/xml/sound_settings.xml



+6
−14






























Original line number
Diff line number
Diff line








@@ -119,14 +119,14 @@













        settings:controller="com.android.settings.sound.MediaControlsParentPreferenceController"















        settings:keywords="@string/keywords_media_controls"/>





























    <!-- Also vibrate for calls -->













    <!-- Also vibration -->















    <Preference













        android:fragment="com.android.settings.sound.VibrateForCallsPreferenceFragment"













        android:key="vibrate_for_calls"













        android:title="@string/vibrate_when_ringing_title"













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













        android:key="vibration_and_haptics"













        android:title="@string/accessibility_vibration_settings_title"















        android:order="-90"













        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"













        settings:keywords="@string/keywords_vibrate_for_calls"/>













        settings:controller="com.android.settings.accessibility.VibrationPreferenceController"













        settings:keywords="@string/keywords_vibration"/>































    <com.android.settingslib.PrimarySwitchPreference















        android:key="gesture_prevent_ringing_sound"










@@ -191,14 +191,6 @@













        android:title="@string/touch_sounds_title"















        android:order="-30"/>





























    <!-- Vibrate on touch -->













    <SwitchPreference













        android:key="vibrate_on_touch"













        android:title="@string/vibrate_on_touch_title"













        android:summary="@string/vibrate_on_touch_summary"













        settings:keywords="@string/keywords_vibrate_on_touch"













        android:order="-25"/>





























    <!-- Dock speaker plays -->















    <DropDownPreference















        android:key="dock_audio_media"