From 803c77a0a24624111944832098c6f65158051dc4 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Wed, 5 May 2021 23:12:37 -0400
Subject: [PATCH] Switch long-press power behavior in AOSP.

Key changes to resources that define default settings:

config_longPressOnPowerBehavior => 5

   By default, Android devices should now invoke the current
   assistant when the power button is held down for longer than
   config_globalActionsKeyTimeout milliseconds.

   May still be overridden by user setting
   Settings.Global.POWER_BUTTON_LONG_PRESS.

config_keyChordPowerVolumeUp => 2

   The power + volume-up keychord now invokes the
   GlobalActions ("power menu") like the long-press power
   gesture did previously.

   May still be overridden by user setting
   Settings.Global.KEY_CHORD_POWER_VOLUME_UP.

Fixes: 184351058
Test: adb shell dumpsys window | egrep 'm(LongPressOnPower|PowerVolUp)'
Change-Id: If0c35a50095ae56f10ac1f53028e7009ec948fe7
---
 core/res/res/values/config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 28f18a4124ded..1ddff3272b11f 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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.