From d782498783f4c664ec2c21455295d3e540c9e7aa Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 5 Jun 2025 18:07:21 +0000
Subject: [PATCH] [Expressive design] update BatteryHeaderTextPreference

Bug: 422287669
Test: manual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
Change-Id: I469fe48f952a5e8158ab1b1660fdda28cb3fe97d
---
 res/layout/preference_battery_header_text.xml | 30 +++++++++----------
 .../BatteryHeaderTextPreference.java          |  4 ++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/res/layout/preference_battery_header_text.xml b/res/layout/preference_battery_header_text.xml
index 616984e9c80..4f6fb67df9a 100644
--- a/res/layout/preference_battery_header_text.xml
+++ b/res/layout/preference_battery_header_text.xml
@@ -1,17 +1,17 @@
 <!--
-  ~ Copyright (C) 2024 The Android Open Source 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.
+  Copyright (C) 2024 The Android Open Source 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.
   -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,6 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
-        android:textSize="14sp"/>
+        android:textAppearance="@style/TextAppearance.SettingsLib.BodyMedium"
+        android:textColor="@color/settingslib_materialColorOnSurface"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
index a809a5682c8..2b23058353c 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderTextPreference.java
@@ -28,9 +28,11 @@ import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
 import com.android.settingslib.widget.GroupSectionDividerMixin;
+import com.android.settingslib.widget.OnScreenWidgetMixin;
 
 /** A preference for battery header text. */
-public class BatteryHeaderTextPreference extends Preference implements GroupSectionDividerMixin {
+public class BatteryHeaderTextPreference extends Preference implements GroupSectionDividerMixin,
+        OnScreenWidgetMixin {
     private static final String TAG = "BatteryHeaderTextPreference";
 
     @Nullable private CharSequence mText;