From f81cbc0b98f4445635d672dabe9dadb00f0df1f3 Mon Sep 17 00:00:00 2001
From: Davide Garberi <dade.garberi@gmail.com>
Date: Fri, 2 Sep 2022 15:25:20 +0200
Subject: msm8996-common: overlay: button_settings: Restore removed options
 from LineageParts

* Since the last commits in Button Settings, removing these options makes the menu crash
* Sync also with stuff that was updated in button_settings.xml in Android 12

Change-Id: I537291cadde7845d4d9835b9374ecc7caa0f4c5c
---
 .../apps/LineageParts/res/xml/button_settings.xml  | 34 ++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'overlay-lineage')

diff --git a/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml b/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
index 0876d79..b73054b 100644
--- a/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
+++ b/overlay-lineage/packages/apps/LineageParts/res/xml/button_settings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!--
+     Copyright (C) 2016 The CyanogenMod Project
+                   2017-2021 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.
@@ -41,6 +43,10 @@
         android:key="navigation_bar_category"
         android:title="@string/navigation_bar_category" >
 
+        <SwitchPreference
+                android:key="enable_taskbar"
+                android:title="@string/navigation_bar_enable_taskbar_title" />
+
         <lineageos.preference.LineageSystemSettingSwitchPreference
                 android:key="navigation_bar_menu_arrow_keys"
                 android:title="@string/navigation_bar_arrow_keys_title"
@@ -99,7 +105,7 @@
         android:key="power_key"
         android:title="@string/hardware_keys_power_key_title" >
 
-        <PreferenceScreen
+        <Preference
             android:key="power_menu"
             android:title="@string/power_menu_title"
             android:fragment="org.lineageos.lineageparts.input.PowerMenuActions" />
@@ -197,6 +203,14 @@
             android:entryValues="@array/hardware_keys_action_values"
             android:persistent="false" />
 
+        <ListPreference
+            android:key="hardware_keys_menu_long_press"
+            android:dialogTitle="@string/hardware_keys_long_press_title"
+            android:title="@string/hardware_keys_long_press_title"
+            android:entries="@array/hardware_keys_action_entries"
+            android:entryValues="@array/hardware_keys_action_values"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -216,6 +230,14 @@
             android:entryValues="@array/hardware_keys_action_values"
             android:persistent="false" />
 
+        <ListPreference
+            android:key="hardware_keys_assist_long_press"
+            android:dialogTitle="@string/hardware_keys_long_press_title"
+            android:title="@string/hardware_keys_long_press_title"
+            android:entries="@array/hardware_keys_action_entries"
+            android:entryValues="@array/hardware_keys_action_values"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -235,6 +257,14 @@
             android:entryValues="@array/hardware_keys_action_values"
             android:persistent="false" />
 
+        <ListPreference
+            android:key="hardware_keys_app_switch_long_press"
+            android:dialogTitle="@string/hardware_keys_long_press_title"
+            android:title="@string/hardware_keys_long_press_title"
+            android:entries="@array/hardware_keys_action_entries"
+            android:entryValues="@array/hardware_keys_action_values"
+            android:persistent="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
-- 
cgit v1.2.3