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

Commit 60ccbd90 authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Update the battery saver scheduler string" into udc-dev am: 8efe3190 

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



Change-Id: I1520ec312f75534c46927e126eb025a9fe9cda51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f95af758 8efe3190

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -5275,6 +5275,9 @@ 
    <!-- Battery Saver: Title for sticky battery saver preference [CHAR_LIMIT=60] -->

    <string name="battery_saver_sticky_title_new">Turn off when charged</string>









    <!-- Battery Saver: Title for sticky battery saver preference with percentage [CHAR_LIMIT=60] -->









    <string name="battery_saver_sticky_title_percentage">Turn off at <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>

















    <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->









    <string name="battery_saver_sticky_description_new">Battery Saver turns off when battery reaches <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>








































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



+7
−3






























Original line number
Diff line number
Diff line







@@ -14,6 +14,7 @@ import com.android.settings.core.TogglePreferenceController;

















public class BatterySaverStickyPreferenceController extends TogglePreferenceController implements









        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {









    private static final int DEFAULT_STICKY_SHUTOFF_LEVEL = 90;



















    private Context mContext;


















@@ -39,10 +40,13 @@ public class BatterySaverStickyPreferenceController extends TogglePreferenceCont







    @Override









    protected void refreshSummary(Preference preference) {









        super.refreshSummary(preference);









        final int stickyShutoffLevel = Settings.Global.getInt(









            mContext.getContentResolver(), Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_LEVEL, 90);









        final int stickyShutoffLevel = Settings.Global.getInt(mContext.getContentResolver(),









                Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_LEVEL, DEFAULT_STICKY_SHUTOFF_LEVEL);









        final String formatPercentage = Utils.formatPercentage(stickyShutoffLevel);









        preference.setTitle(mContext.getString(R.string.battery_saver_sticky_title_percentage,









                formatPercentage));









        preference.setSummary(mContext.getString(R.string.battery_saver_sticky_description_new,









                Utils.formatPercentage(stickyShutoffLevel)));









                formatPercentage));









    }



















    @Override