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

Commit a15cb587 authored by Daniel Sandler's avatar Daniel Sandler Committed by Automerger Merge Worker
Browse files

Merge "Switch long-press power behavior in AOSP." into sc-dev am: 3c804441... 

Merge "Switch long-press power behavior in AOSP." into sc-dev am: 3c804441 am: 59555510 am: dc60e458

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722117

Change-Id: Ie98ae0d1528c2a3181d12f45eae9db1f169275b8
parents 7363dc4c dc60e458

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ 
            4 - Go to voice assist

            5 - Go to assistant (Settings.Secure.ASSISTANT)

    -->

    <integer name="config_longPressOnPowerBehavior">1</integer>

    <integer name="config_longPressOnPowerBehavior">5</integer>



    <!-- Whether the setting to change long press on power behaviour from default to assistant (5)

         is available in Settings.
@@ -973,7 +973,7 @@ 
            1 - Mute toggle

            2 - Global actions menu

    -->

    <integer name="config_keyChordPowerVolumeUp">1</integer>

    <integer name="config_keyChordPowerVolumeUp">2</integer>



    <!-- Control the behavior when the user long presses the back button.  Non-zero values are only

         valid for watches as part of CDD/CTS.