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

Commit 15dfbbec authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Add a setting for the volume hush gesture 

Bug: 75252670
Test: make -j20 RunSettingsRoboTests
Change-Id: I699aeec54eb516931b6d7c5b3fc864b169015c2f
parent 757b3d48

res/values/arrays.xml

+13 −0
Original line number Diff line number Diff line
@@ -1095,4 +1095,17 @@ 
        <item>no</item>

    </string-array>



    <string-array name="gesture_prevent_ringing_entries" translatable="false">

        <item>@string/prevent_ringing_option_vibrate</item>

        <item>@string/prevent_ringing_option_mute</item>

        <item>@string/prevent_ringing_option_none</item>

    </string-array>



    <!-- Keep in sync with Settings.Secure.VOLUME_HUSH_* -->

    <string-array name="gesture_prevent_ringing_values" translatable="false">

        <item>1</item>

        <item>2</item>

        <item>0</item>

    </string-array>



</resources>

res/values/strings.xml

+17 −0
Original line number Diff line number Diff line
@@ -9564,6 +9564,23 @@ 
    <!--  Summary for battery Suggestion. [CHAR LIMIT=55] -->

    <string name="battery_suggestion_summary"></string>













    <!-- Title for prevent ringing gesture screen -->













    <string name="gesture_prevent_ringing_screen_title">Prevent ringing</string>













    <!-- Title for prevent ringing setting -->













    <string name="gesture_prevent_ringing_title">Press Power &amp; Volume Up together</string>













    <!-- Option for prevent ringing setting -->













    <string name="prevent_ringing_option_vibrate">Vibrate</string>













    <!-- Option for prevent ringing setting -->













    <string name="prevent_ringing_option_mute">Mute</string>













    <!-- Option for prevent ringing setting -->













    <string name="prevent_ringing_option_none">Do nothing</string>













    <!-- Summary for prevent ringing setting -->













    <string name="prevent_ringing_option_vibrate_summary">Vibrate all calls and notifications</string>













    <!-- Summary for prevent ringing setting -->













    <string name="prevent_ringing_option_mute_summary">Mute all calls and notifications</string>













    <!-- Summary for prevent ringing setting -->













    <string name="prevent_ringing_option_none_summary">Do nothing</string>



























    <!-- Title for detail page of wifi network [CHAR LIMIT=30] -->















    <string name="pref_title_network_details">Network details</string>







































res/xml/gestures.xml



+5
−0






























Original line number
Diff line number
Diff line








@@ -50,4 +50,9 @@













        android:title="@string/ambient_display_pickup_title"















        android:fragment="com.android.settings.gestures.PickupGestureSettings" />





























    <Preference













        android:key="gesture_prevent_ringing_summary"













        android:title="@string/gesture_prevent_ringing_screen_title"













        android:fragment="com.android.settings.gestures.PreventRingingGestureSettings" />





























</PreferenceScreen>
























res/xml/prevent_ringing_gesture_settings.xml
0 → 100644



+35
−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"













    xmlns:app="http://schemas.android.com/apk/res-auto"













    android:key="gesture_prevent_ringing_screen"













    android:title="@string/gesture_prevent_ringing_screen_title">



























    <!-- TODO: Add video preference when it exists -->













    <com.android.settings.widget.VideoPreference













        android:key="gesture_prevent_ringing_video" />



























    <ListPreference













        android:key="gesture_prevent_ringing"













        android:title="@string/gesture_prevent_ringing_title"













        android:entries="@array/gesture_prevent_ringing_entries"













        android:entryValues="@array/gesture_prevent_ringing_values"













        app:keywords="@string/keywords_gesture" />



























</PreferenceScreen>










 No newline at end of file
























src/com/android/settings/gestures/GestureSettings.java



+3
−0






























Original line number
Diff line number
Diff line








@@ -44,6 +44,7 @@ public class GestureSettings extends DashboardFragment {













    private static final String KEY_DOUBLE_TWIST = "gesture_double_twist_input_summary";















    private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";















    private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";













    private static final String KEY_PREVENT_RINGING = "gesture_prevent_ringing_summary";































    private AmbientDisplayConfiguration mAmbientDisplayConfig;


























@@ -86,6 +87,8 @@ public class GestureSettings extends DashboardFragment {













                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_PICK_UP));















        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,















                ambientDisplayConfiguration, UserHandle.myUserId(), KEY_DOUBLE_TAP_SCREEN));













        controllers.add(new PreventRingingPreferenceController(













                context, lifecycle, UserHandle.myUserId(), KEY_PREVENT_RINGING));















        return controllers;















    }