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

Commit df0a84f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update string reference" into sc-dev

parents e07e36f6 6f650b11

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5984,6 +5984,8 @@ 
    <string name="manager_battery_usage_unrestricted_title">Unrestricted</string>

    <!-- Title for the battery optimized settings [CHAR_LIMIT=40] -->

    <string name="manager_battery_usage_optimized_title">Optimized</string>

    <!-- Title for the battery restricted settings [CHAR_LIMIT=40] -->

    <string name="manager_battery_usage_restricted_title">Restricted</string>

    <!-- Summary for the battery unrestricted settings [CHAR_LIMIT=NONE] -->

    <string name="manager_battery_usage_unrestricted_summary">Allow battery usage in background without restrictions. May use more battery.</string>

    <!-- Summary for the battery optimized settings [CHAR_LIMIT=NONE] -->

res/xml/power_usage_detail.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
        <com.android.settingslib.widget.RadioButtonPreference

            android:key="restricted_pref"

            android:summary="@string/manager_battery_usage_restricted_summary"

            android:title="@string/restricted_true_label"

            android:title="@string/manager_battery_usage_restricted_title"

            settings:controller="com.android.settings.fuelgauge.RestrictedPreferenceController"/>



    </PreferenceCategory>

src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java

+0 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settings.fuelgauge.batterysaver;



import android.app.settings.SettingsEnums;

import android.text.SpannableStringBuilder;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;
@@ -36,7 +35,6 @@ import com.android.settingslib.widget.FooterPreference; 
public class BatterySaverSettings extends DashboardFragment {

    private static final String TAG = "BatterySaverSettings";

    private static final String KEY_FOOTER_PREFERENCE = "battery_saver_footer_preference";

    private SpannableStringBuilder mFooterText;

    private String mHelpUri;



    @Override
@@ -76,8 +74,6 @@ public class BatterySaverSettings extends DashboardFragment { 
    void setupFooter() {

        mHelpUri = getString(R.string.help_url_battery_saver_settings);

        if (!TextUtils.isEmpty(mHelpUri)) {

            mFooterText = new SpannableStringBuilder(getText(

                    com.android.internal.R.string.battery_saver_description_with_learn_more));

            addHelpLink();

        }

    }
@@ -87,7 +83,6 @@ public class BatterySaverSettings extends DashboardFragment { 
    void addHelpLink() {

        FooterPreference pref = getPreferenceScreen().findPreference(KEY_FOOTER_PREFERENCE);

        if (pref != null) {

            pref.setTitle(mFooterText);

            pref.setSelectable(false);

            pref.setLearnMoreAction(v -> {

                mMetricsFeatureProvider.action(getContext(),