From 7dd2be50b14d9cfb9bb09d06da1df05f1cf2601a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timi=20Rautam=C3=A4ki?= <timi.rautamaki@gmail.com>
Date: Thu, 15 Feb 2024 10:05:11 +0000
Subject: [PATCH] Revert "overlay: Decommonize long press power action"

This reverts commit 5c5c497acd4a6cd2ffabf2e4781846baefbaf443.

Change-Id: Iaaa9d1c2aa0704d2f09f7b979e08057f25b74e5c
---
 config/common_mobile.mk                       |  2 --
 .../base/core/res/res/values/config.xml       | 10 +++++++
 .../base/core/res/res/values/config.xml       | 27 -------------------
 .../base/core/res/res/values/config.xml       | 27 -------------------
 4 files changed, 10 insertions(+), 56 deletions(-)
 delete mode 100644 overlay/mobile/frameworks/base/core/res/res/values/config.xml
 delete mode 100644 overlay/tv/frameworks/base/core/res/res/values/config.xml

diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index b0a65de4..560074e4 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -93,5 +93,3 @@ PRODUCT_PACKAGES += \
     LineageBlackTheme \
     ThemePicker \
     ThemesStub
-
-PRODUCT_PACKAGE_OVERLAYS += vendor/lineage/overlay/mobile
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 340584e2..414c6b27 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -124,6 +124,16 @@
     -->
     <string name="config_wallpaperCropperPackage" translatable="false">com.android.wallpaper</string>
 
+    <!-- Control the behavior when the user long presses the power button.
+            0 - Nothing
+            1 - Global actions menu
+            2 - Power off (with confirmation)
+            3 - Power off (without confirmation)
+            4 - Go to voice assist
+            5 - Go to assistant (Settings.Secure.ASSISTANT)
+    -->
+    <integer name="config_longPressOnPowerBehavior">1</integer>
+
     <!-- Control the behavior when the user presses the power and volume up buttons together.
             0 - Nothing
             1 - Mute toggle
diff --git a/overlay/mobile/frameworks/base/core/res/res/values/config.xml b/overlay/mobile/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index f7c7b447..00000000
--- a/overlay/mobile/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Control the behavior when the user long presses the power button.
-            0 - Nothing
-            1 - Global actions menu
-            2 - Power off (with confirmation)
-            3 - Power off (without confirmation)
-            4 - Go to voice assist
-            5 - Go to assistant (Settings.Secure.ASSISTANT)
-    -->
-    <integer name="config_longPressOnPowerBehavior">1</integer>
-</resources>
diff --git a/overlay/tv/frameworks/base/core/res/res/values/config.xml b/overlay/tv/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 4af7aa9d..00000000
--- a/overlay/tv/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The LineageOS 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.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Control the behavior when the user long presses the power button.
-            0 - Nothing
-            1 - Global actions menu
-            2 - Power off (with confirmation)
-            3 - Power off (without confirmation)
-            4 - Go to voice assist
-            5 - Go to assistant (Settings.Secure.ASSISTANT)
-    -->
-    <integer name="config_longPressOnPowerBehavior">5</integer>
-</resources>