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

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

Merge "Update battery saver dynamic mode notification"

parents e0d6b001 0be4383e

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5835,9 +5835,9 @@ 
    <!-- The user visible name of the notification channel for the routine mode battery saver fyi notification [CHAR_LIMIT=80]-->

    <string name="dynamic_mode_notification_channel_name">Routine Mode info notification</string>

    <!-- Title of notification letting users know why battery saver was turned on automatically [CHAR_LIMIT=NONE]-->

    <string name="dynamic_mode_notification_title">Battery may run out before usual charge</string>

    <string name="dynamic_mode_notification_title">Battery Saver turned on</string>

    <!-- Summary of notification letting users know why battery saver was turned on automatically [CHAR_LIMIT=NONE]-->

    <string name="dynamic_mode_notification_summary">Battery Saver activated to extend battery life</string>

    <string name="dynamic_mode_notification_summary">Reducing battery usage to extend battery life</string>



    <!-- Battery saver strings -->

    <!-- The user visible name of the notification channel for battery saver notifications [CHAR_LIMIT=80] -->

services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ public class BatterySaverStateMachine { 
        mBatterySaverController.enableBatterySaver(enable, intReason);



        // Handle triggering the notification to show/hide when appropriate

        if (intReason == BatterySaverController.REASON_DYNAMIC_POWER_SAVINGS_AUTOMATIC_ON) {

        if (intReason == BatterySaverController.REASON_DYNAMIC_POWER_SAVINGS_AUTOMATIC_ON

                || intReason == BatterySaverController.REASON_PERCENTAGE_AUTOMATIC_ON) {

            triggerDynamicModeNotification();

        } else if (!enable) {

            hideDynamicModeNotification();