From 3ad21788bec14d7bd701024d4835da4b4835b27f Mon Sep 17 00:00:00 2001
From: mxyyiyi <mxyyiyi@google.com>
Date: Tue, 21 Jan 2025 14:42:47 +0800
Subject: [PATCH] [Expressive Battery] In Battery screen, split items into
 different category

- For experssive style, items split into 2 groups. Item "battery percentage" for a single group.
- For original style, reorder the items, sort item "battery percentage" at the last.

Bug: 349652542
Test: visual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I4a163d075ecd94a8079839dc0ad34dd993a7c725
---
 res/xml/power_usage_summary.xml | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 21a836d6d9a..065baae44c9 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -44,25 +44,29 @@
         android:title="@string/summary_placeholder"
         settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
 
-    <Preference
-        android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced"
-        android:key="battery_usage_summary"
-        android:title="@string/advanced_battery_preference_title"
-        settings:keywords="@string/keywords_battery_usage" />
+    <PreferenceCategory
+        android:key="power_usage_summary_category"
+        android:layout="@layout/settingslib_preference_category_no_title">
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.batteryusage.PowerUsageAdvanced"
+            android:key="battery_usage_summary"
+            android:title="@string/advanced_battery_preference_title"
+            settings:keywords="@string/keywords_battery_usage" />
 
-    <Preference
-        android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
-        android:key="battery_saver_summary"
-        android:title="@string/battery_saver"
-        settings:keywords="@string/keywords_battery_saver"
-        settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
+            android:key="battery_saver_summary"
+            android:title="@string/battery_saver"
+            settings:keywords="@string/keywords_battery_saver"
+            settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
 
-    <Preference
-        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
-        android:key="smart_battery_manager"
-        android:title="@string/smart_battery_manager_title"
-        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
-        settings:keywords="@string/keywords_battery_adaptive_preferences" />
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
+            android:key="smart_battery_manager"
+            android:title="@string/smart_battery_manager_title"
+            settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
+            settings:keywords="@string/keywords_battery_adaptive_preferences" />
+    </PreferenceCategory>
 
     <SwitchPreferenceCompat
         android:key="status_bar_show_battery_percent"