Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8609ef22 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change battery usage dropdown list item texts from "Breakdown by ..."... 

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

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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