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

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

Change-Id: Ife5af12d4b9e327f7886d3ec70e6ea50d7c613ee
This commit is contained in:
Daniel Sandler
2021-05-26 00:44:17 +00:00
committed by Automerger Merge Worker

View File

@@ -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.