From b551184b158a97e3af9959338f1795005b7104f4 Mon Sep 17 00:00:00 2001
From: Fan Wu <cechkahn@google.com>
Date: Thu, 14 Nov 2024 03:33:54 +0000
Subject: [PATCH] Update resource name and format previously added file

Bug: 372774754
Test: atest and device test
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Change-Id: Iaa6a07108c4401e844e1a1e19f07fc809e4c43c9
---
 res/xml/power_usage_summary.xml                                 | 2 +-
 .../settings/display/BatteryPercentageSwitchPreferenceTest.kt   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 77c6b7322c2..794061a7e50 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -59,7 +59,7 @@
         settings:keywords="@string/keywords_battery_adaptive_preferences" />
 
     <SwitchPreferenceCompat
-        android:key="battery_percentage"
+        android:key="status_bar_show_battery_percent"
         android:title="@string/battery_percentage"
         android:summary="@string/battery_percentage_description"
         settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt b/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
index d9a12d57564..f96b30f1cba 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentageSwitchPreferenceTest.kt
@@ -22,8 +22,6 @@ import android.provider.Settings
 import androidx.preference.SwitchPreferenceCompat
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.android.settings.accessibility.AccessibilityUtil.State.OFF
-import com.android.settings.accessibility.AccessibilityUtil.State.ON
 import com.android.settings.testutils.shadow.ShadowUtils
 import com.android.settingslib.preference.createAndBindWidget
 import com.google.common.truth.Truth.assertThat