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

Commit 143f6aeb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change drop down strings to "View by ..."" into udc-dev am: d3897afd 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22905739



Change-Id: I193bbf41ec079e0266357de47661e083594d3fe4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e1c1ecc d3897afd

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5472,9 +5472,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_by_apps">By apps</string>

    <string name="battery_usage_spinner_view_by_apps">View by apps</string>

    <!-- [CHAR_LIMIT=NONE] The spinner item text in the battery usage breakdown. -->

    <string name="battery_usage_spinner_by_systems">By systems</string>

    <string name="battery_usage_spinner_view_by_systems">View 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_by_apps),

                        mPrefContext.getString(R.string.battery_usage_spinner_by_systems)

                        mPrefContext.getString(R.string.battery_usage_spinner_view_by_apps),

                        mPrefContext.getString(R.string.battery_usage_spinner_view_by_systems)

                },

                new AdapterView.OnItemSelectedListener() {

                    @Override