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

Commit 45723486 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Add vol up + power ringer toggle gesture" into pi-dev am: 224e2fb2 

am: b5983337

Change-Id: I0bc60476384fed3dd5febaf2b27d5affcd9e9c72
parents 547a5284 b5983337

core/java/android/provider/Settings.java

+17 −0
Original line number Diff line number Diff line
@@ -7769,6 +7769,21 @@ public final class Settings { 
         */

        public static final String BLUETOOTH_ON_WHILE_DRIVING = "bluetooth_on_while_driving";



        /**

         * What behavior should be invoked when the volume hush gesture is triggered

         * One of VOLUME_HUSH_OFF, VOLUME_HUSH_VIBRATE, VOLUME_HUSH_MUTE.

         *

         * @hide

         */

        public static final String VOLUME_HUSH_GESTURE = "volume_hush_gesture";



        /** @hide */ public static final int VOLUME_HUSH_OFF = 0;

        /** @hide */ public static final int VOLUME_HUSH_VIBRATE = 1;

        /** @hide */ public static final int VOLUME_HUSH_MUTE = 2;



        private static final Validator VOLUME_HUSH_GESTURE_VALIDATOR =

                NON_NEGATIVE_INTEGER_VALIDATOR;



        /**

         * The number of times (integer) the user has manually enabled battery saver.

         * @hide
@@ -7883,6 +7898,7 @@ public final class Settings { 
            SCREENSAVER_ACTIVATE_ON_SLEEP,

            LOCKDOWN_IN_POWER_MENU,

            SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,

            VOLUME_HUSH_GESTURE

        };



        /**
@@ -8019,6 +8035,7 @@ public final class Settings { 
            VALIDATORS.put(LOCKDOWN_IN_POWER_MENU, LOCKDOWN_IN_POWER_MENU_VALIDATOR);

            VALIDATORS.put(SHOW_FIRST_CRASH_DIALOG_DEV_OPTION,

                    SHOW_FIRST_CRASH_DIALOG_DEV_OPTION_VALIDATOR);

            VALIDATORS.put(VOLUME_HUSH_GESTURE, VOLUME_HUSH_GESTURE_VALIDATOR);

            VALIDATORS.put(ENABLED_NOTIFICATION_LISTENERS,

                    ENABLED_NOTIFICATION_LISTENERS_VALIDATOR); //legacy restore setting

            VALIDATORS.put(ENABLED_NOTIFICATION_ASSISTANT,

core/proto/android/providers/settings.proto

+2 −1
Original line number Diff line number Diff line
@@ -744,9 +744,10 @@ message SecureSettingsProto { 
    optional SettingProto backup_manager_constants = 193;

    optional SettingProto backup_local_transport_parameters = 194;

    optional SettingProto bluetooth_on_while_driving = 195 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingsProto volume_hush_gesture = 196 [ (android.privacy).dest = DEST_AUTOMATIC ];

    // Please insert fields in the same order as in

    // frameworks/base/core/java/android/provider/Settings.java.

    // Next tag = 196

    // Next tag = 197

}



message SystemSettingsProto {

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -2898,6 +2898,10 @@ 
         is non-interactive. -->

    <bool name="config_cameraDoubleTapPowerGestureEnabled">true</bool>



    <!-- Allow the gesture power + volume up to change the ringer mode while the device

         is interactive. -->

    <bool name="config_volumeHushGestureEnabled">true</bool>



    <!-- Name of the component to handle network policy notifications. If present,

         disables NetworkPolicyManagerService's presentation of data-usage notifications. -->

    <string translatable="false" name="config_networkPolicyNotificationComponent"></string>

core/res/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -4888,6 +4888,9 @@ 
    <!-- Notification action for editing a screenshot (drawing on it, cropping it, etc) -->

    <string name="screenshot_edit">Edit</string>



    <string name="volume_dialog_ringer_guidance_vibrate">Calls and notifications will vibrate</string>

    <string name="volume_dialog_ringer_guidance_silent">Calls and notifications will be muted</string>



    <!-- Title for the notification channel notifying user of settings system changes. [CHAR LIMIT=NONE] -->

    <string name="notification_channel_system_changes">System changes</string>

    <!-- Title for the notification channel notifying user of do not disturb system changes (i.e. Do Not Disturb has changed). [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,8 @@ 
  <java-symbol type="string" name="volume_icon_description_media" />

  <java-symbol type="string" name="volume_icon_description_notification" />

  <java-symbol type="string" name="volume_icon_description_ringer" />

  <java-symbol type="string" name="volume_dialog_ringer_guidance_vibrate" />

  <java-symbol type="string" name="volume_dialog_ringer_guidance_silent" />

  <java-symbol type="string" name="wait" />

  <java-symbol type="string" name="webpage_unresponsive" />

  <java-symbol type="string" name="whichApplication" />
@@ -2620,6 +2622,7 @@ 
  <java-symbol type="bool" name="config_cameraDoubleTapPowerGestureEnabled" />

  <java-symbol type="integer" name="config_cameraLiftTriggerSensorType" />

  <java-symbol type="string" name="config_cameraLiftTriggerSensorStringType" />

  <java-symbol type="bool" name="config_volumeHushGestureEnabled" />



  <java-symbol type="drawable" name="platlogo_m" />