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

Commit 233f3452 authored by Alexey Kuzmin's avatar Alexey Kuzmin Committed by Android (Google) Code Review
Browse files

Merge "Split ring and notification vibration settings"

parents f0a0180b 3c51e824

res/values/strings.xml

+9 −5
Original line number Diff line number Diff line
@@ -4691,7 +4691,9 @@ 
    <!-- 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>

    <string name="accessibility_notification_vibration_title">Notification vibration</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 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 -->
@@ -4761,8 +4763,8 @@ 
        <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 notification vibration and haptic feedback intensity are set. [CHAR LIMIT=32] -->









    <string name="accessibility_vibration_summary">Ring <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, touch <xliff:g id="summary_touch" example="High">%2$s</xliff:g></string>









    <!-- Summary for vibration settings preference when notification vibration and haptic feedback intensity are set. [CHAR LIMIT=50] -->









    <string name="accessibility_vibration_summary">Ring <xliff:g id="summary_ring" example="Medium">%1$s</xliff:g>, notification <xliff:g id="summary_notification" example="Low">%2$s</xliff:g>, touch <xliff:g id="summary_touch" example="High">%3$s</xliff:g></string>

















    <!-- 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>








@@ -7056,8 +7058,10 @@







    <!-- 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 and notification 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</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>

















    <!-- NFC Wi-Fi pairing/setup strings-->

































res/xml/accessibility_ring_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_ring_vibration_title" />
























res/xml/accessibility_vibration_settings.xml



+8
−1






























Original line number
Diff line number
Diff line







@@ -21,11 +21,18 @@







    android:key="accessibility_settings_vibration_screen"









    android:title="@string/accessibility_vibration_settings_title">



















    <Preference









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









        android:key="ring_vibration_preference_screen"









        android:title="@string/accessibility_ring_vibration_title"









        settings:keywords="@string/keywords_ring_vibration"









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



















    <Preference









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









        android:key="notification_vibration_preference_screen"









        android:title="@string/accessibility_notification_vibration_title"









        settings:keywords="@string/keywords_ring_vibration"









        settings:keywords="@string/keywords_notification_vibration"









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



















    <Preference
































src/com/android/settings/accessibility/AccessibilitySettings.java



+23
−6






























Original line number
Diff line number
Diff line







@@ -810,15 +810,30 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements







        final Context context = getContext();









        final Vibrator vibrator = context.getSystemService(Vibrator.class);



















        final int ringIntensity = Settings.System.getInt(context.getContentResolver(),









                Settings.System.NOTIFICATION_VIBRATION_INTENSITY,









                vibrator.getDefaultNotificationVibrationIntensity());









        int ringIntensity = Settings.System.getInt(context.getContentResolver(),









                Settings.System.RING_VIBRATION_INTENSITY,









                vibrator.getDefaultRingVibrationIntensity());









        if (Settings.System.getInt(context.getContentResolver(),









                Settings.System.VIBRATE_WHEN_RINGING, 0) == 0) {









            ringIntensity = Vibrator.VIBRATION_INTENSITY_OFF;









        }









        CharSequence ringIntensityString =









                VibrationIntensityPreferenceController.getIntensityString(context, ringIntensity);



















        final int touchIntensity = Settings.System.getInt(context.getContentResolver(),









        int notificationIntensity = Settings.System.getInt(context.getContentResolver(),









                Settings.System.NOTIFICATION_VIBRATION_INTENSITY,









                vibrator.getDefaultNotificationVibrationIntensity());









        CharSequence notificationIntensityString =









                VibrationIntensityPreferenceController.getIntensityString(context,









                        notificationIntensity);



















        int touchIntensity = Settings.System.getInt(context.getContentResolver(),









                Settings.System.HAPTIC_FEEDBACK_INTENSITY,









                vibrator.getDefaultHapticFeedbackIntensity());









        if (Settings.System.getInt(context.getContentResolver(),









                Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {









            touchIntensity = Vibrator.VIBRATION_INTENSITY_OFF;









        }









        CharSequence touchIntensityString =









                VibrationIntensityPreferenceController.getIntensityString(context, touchIntensity);


















@@ -826,12 +841,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements







            mVibrationPreferenceScreen = findPreference(VIBRATION_PREFERENCE_SCREEN);









        }



















        if (ringIntensity == touchIntensity) {









        if (ringIntensity == touchIntensity && ringIntensity == notificationIntensity) {









            mVibrationPreferenceScreen.setSummary(ringIntensityString);









        } else {









            mVibrationPreferenceScreen.setSummary(









                    getString(R.string.accessibility_vibration_summary,









                            ringIntensityString, touchIntensityString));









                            ringIntensityString,









                            notificationIntensityString,









                            touchIntensityString));









        }









    }










































src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -28,7 +28,8 @@ public class HapticFeedbackIntensityPreferenceController







    static final String PREF_KEY = "touch_vibration_preference_screen";



















    public HapticFeedbackIntensityPreferenceController(Context context) {









        super(context, PREF_KEY, Settings.System.HAPTIC_FEEDBACK_INTENSITY);









        super(context, PREF_KEY, Settings.System.HAPTIC_FEEDBACK_INTENSITY,









                Settings.System.HAPTIC_FEEDBACK_ENABLED);









    }



















    @Override