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

Commit ec037c38 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Differentiate battery optimization string."

parents b5e37f1d f08185b8

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -6755,7 +6755,7 @@ 
    <string name="high_power_filter_on">Not optimized</string>









    <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->









    <string name="high_power_on">Ignoring battery optimization</string>









    <string name="high_power_on">Not optimized</string>

















    <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->









    <string name="high_power_off">Optimizing battery use</string>

























src/com/android/settings/fuelgauge/HighPowerDetail.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -143,7 +143,7 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener,







    public static CharSequence getSummary(Context context, String pkg) {









        PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance();









        return context.getString(powerWhitelist.isSysWhitelisted(pkg) ? R.string.high_power_system









                : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_filter_on









                : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_on









                : R.string.high_power_off);









    }