diff options
| author | 2022-06-14 17:35:06 +0000 | |
|---|---|---|
| committer | 2022-06-14 17:35:06 +0000 | |
| commit | eff8acaabd79cf5f7acbf3bc450dc07f2d9d17d7 (patch) | |
| tree | 32ad1307399f618bdbf31ee9b754f91ed22c79f6 | |
| parent | e0d6b00166e073d579aac755ec948b2f6c44a093 (diff) | |
| parent | 0be4383e8de30969835a985d3ce2735fa1bea580 (diff) | |
Merge "Update battery saver dynamic mode notification"
| -rw-r--r-- | core/res/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index c6b60f586047..2704224ec48e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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] --> diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java index 75c57b300a67..2cafa3f81a44 100644 --- a/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java +++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java @@ -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(); |