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

Commit c8e07736 authored by Wesley Wang's avatar Wesley Wang
Browse files

Fix battery saver number format issue 

 - The summary of battery saver scheduler use util to convert the number
   but saver sticky preference use another way to convert it, update
   them to use the same convert method

Bug: 250684701
Test: make SettingsRoboTests
Change-Id: I4f188a2e8e9d4810d187b870e331dc84f50b2b6f
parent 848dab0a

res/values/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -5482,11 +5482,11 @@ 
    <string name="battery_saver_sticky_title_new">Turn off when charged</string>

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

















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







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











    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>







    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>











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







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











    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>







    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>











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







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











    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="number" example="88">^1</xliff:g><xliff:g id="unit" example="%">%</xliff:g></string>







    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="battery_percentage" example="80%">%1$s</xliff:g></string>



























    <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->







    <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->











    <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>







    <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>

































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



+2
−2






























Original line number
Original line
Diff line number
Diff line











package com.android.settings.fuelgauge.batterysaver;







package com.android.settings.fuelgauge.batterysaver;































import android.content.Context;







import android.content.Context;











import android.icu.text.NumberFormat;














import android.provider.Settings;







import android.provider.Settings;











import android.provider.Settings.Global;







import android.provider.Settings.Global;











import android.text.TextUtils;







import android.text.TextUtils;









@@ -10,6 +9,7 @@ import androidx.preference.Preference;









import androidx.preference.SwitchPreference;







import androidx.preference.SwitchPreference;































import com.android.settings.R;







import com.android.settings.R;














import com.android.settings.Utils;











import com.android.settings.core.PreferenceControllerMixin;







import com.android.settings.core.PreferenceControllerMixin;











import com.android.settings.core.TogglePreferenceController;







import com.android.settings.core.TogglePreferenceController;






























@@ -44,7 +44,7 @@ public class BatterySaverStickyPreferenceController extends TogglePreferenceCont









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







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











        preference.setSummary(TextUtils.expandTemplate(







        preference.setSummary(TextUtils.expandTemplate(











                mContext.getString(R.string.battery_saver_sticky_description_new),







                mContext.getString(R.string.battery_saver_sticky_description_new),











                NumberFormat.getIntegerInstance().format(stickyShutoffLevel)));







                Utils.formatPercentage(stickyShutoffLevel)));











    }







    }































    @Override







    @Override