commit 8609ef229192a30b3ba5611d7ed89a3995ab9df6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 20 11:29:47 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 20 11:29:47 2023 +0000
tree c5946b0758181c441698cebb4122fc6f09b38105
parent bc67d885ec2e892db970aa4ff0028c7dfdc6cae3
parent 0aee0e6aa034956fa562014e06cbf87ab122d3b0

Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a366ac7..9083548 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5474,9 +5474,9 @@
     <!-- [CHAR_LIMIT=NONE] Device screen on time category for a selected slot -->
     <string name="screen_time_category_for_slot">Screen time for <xliff:g id="slot">%s</xliff:g></string>
     <!-- [CHAR_LIMIT=NONE] The spinner item text in the battery usage breakdown. -->
-    <string name="battery_usage_spinner_breakdown_by_apps">Breakdown by apps</string>
+    <string name="battery_usage_spinner_by_apps">By apps</string>
     <!-- [CHAR_LIMIT=NONE] The spinner item text in the battery usage breakdown. -->
-    <string name="battery_usage_spinner_breakdown_by_system">Breakdown by system</string>
+    <string name="battery_usage_spinner_by_systems">By systems</string>
     <!-- [CHAR_LIMIT=NONE] Less than some percentage, e.g. < 1% -->
     <string name="battery_usage_less_than_percent">&lt; <xliff:g id="percentage">%1$s</xliff:g></string>
     <!-- Process Stats strings -->

src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java

diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
index cd1bdef..c272a49 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java
@@ -177,8 +177,8 @@
         mAppListPreferenceGroup.setOrderingAsAdded(false);
         mSpinnerPreference.initializeSpinner(
                 new String[]{
-                        mPrefContext.getString(R.string.battery_usage_spinner_breakdown_by_apps),
-                        mPrefContext.getString(R.string.battery_usage_spinner_breakdown_by_system)
+                        mPrefContext.getString(R.string.battery_usage_spinner_by_apps),
+                        mPrefContext.getString(R.string.battery_usage_spinner_by_systems)
                 },
                 new AdapterView.OnItemSelectedListener() {
                     @Override