From 0aee0e6aa034956fa562014e06cbf87ab122d3b0 Mon Sep 17 00:00:00 2001 From: Zaiyue Xue Date: Thu, 20 Apr 2023 17:20:16 +0800 Subject: [PATCH] Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..." mock: https://screenshot.googleplex.com/C8ZbSL6UfJ9jRJx.png screenshot: https://screenshot.googleplex.com/4nqRv3UA2iGoQuK.png Bug: 278986376 Fix: 278986376 Test: manual Change-Id: Iccb67c3695b21b62d5d26a96a791ca46a1ba7e0a --- res/values/strings.xml | 4 ++-- .../batteryusage/BatteryUsageBreakdownController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a366ac78bfa..9083548712d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5474,9 +5474,9 @@ Screen time for %s - Breakdown by apps + By apps - Breakdown by system + By systems < %1$s diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java index cd1bdefc92d..c272a499194 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBreakdownController.java @@ -177,8 +177,8 @@ public class BatteryUsageBreakdownController extends BasePreferenceController 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