From 0ceaa3e8016f001a0f10ab0766f04bd60fc5312a Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Thu, 18 May 2023 14:34:01 +0200
Subject: [PATCH] sm6150-common: parts: Get rid of nested PreferenceCategory

getPreferenceScreen().findPreference() does not find preferences
within another PreferenceCategory. That breaks hidin the proximity
category on devices which do not support it.

Change-Id: Ic7d840df7a71905b5b697954a279de51d8d0408a
---
 parts/res/xml/doze_settings.xml | 61 +++++++++++++++++----------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/parts/res/xml/doze_settings.xml b/parts/res/xml/doze_settings.xml
index 75710c3..fecb964 100644
--- a/parts/res/xml/doze_settings.xml
+++ b/parts/res/xml/doze_settings.xml
@@ -51,38 +51,39 @@
             android:title="@string/wake_on_gesture_title"
             android:summary="@string/wake_on_gesture_summary" />
 
-        <PreferenceCategory
-            android:key="pickup_sensor"
-            android:title="@string/pickup_sensor_title">
+    </PreferenceCategory>
 
-            <SwitchPreference
-                android:key="gesture_pick_up"
-                android:defaultValue="false"
-                android:icon="@drawable/ic_doze_pickup"
-                android:title="@string/pick_up_gesture_title"
-                android:summary="@string/pick_up_gesture_summary" />
+    <PreferenceCategory
+        android:key="pickup_sensor"
+        android:title="@string/pickup_sensor_title">
 
-        </PreferenceCategory>
-
-        <PreferenceCategory
-            android:key="proximity_sensor"
-            android:title="@string/proximity_sensor_title">
-
-            <SwitchPreference
-                android:key="gesture_hand_wave"
-                android:defaultValue="false"
-                android:icon="@drawable/ic_doze_hand"
-                android:title="@string/hand_wave_gesture_title"
-                android:summary="@string/hand_wave_gesture_summary" />
-
-            <SwitchPreference
-                android:key="gesture_pocket"
-                android:defaultValue="false"
-                android:icon="@drawable/ic_doze_pocket"
-                android:title="@string/pocket_gesture_title"
-                android:summary="@string/pocket_gesture_summary" />
-
-        </PreferenceCategory>
+        <SwitchPreference
+            android:key="gesture_pick_up"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_doze_pickup"
+            android:title="@string/pick_up_gesture_title"
+            android:summary="@string/pick_up_gesture_summary" />
 
     </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="proximity_sensor"
+        android:title="@string/proximity_sensor_title">
+
+        <SwitchPreference
+            android:key="gesture_hand_wave"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_doze_hand"
+            android:title="@string/hand_wave_gesture_title"
+            android:summary="@string/hand_wave_gesture_summary" />
+
+        <SwitchPreference
+            android:key="gesture_pocket"
+            android:defaultValue="false"
+            android:icon="@drawable/ic_doze_pocket"
+            android:title="@string/pocket_gesture_title"
+            android:summary="@string/pocket_gesture_summary" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>