From 0be4383e8de30969835a985d3ce2735fa1bea580 Mon Sep 17 00:00:00 2001
From: Wesley <wesleycwwang@google.com>
Date: Wed, 8 Jun 2022 12:18:41 +0000
Subject: [PATCH] Update battery saver dynamic mode notification

 - Update notification title and summary
 - Present dynamic notification when battery saver triggered by "Based
   on percentage"
 screenshot: https://screenshot.googleplex.com/4AH9ayRB2yDMYFf.png

Bug: 234578979
Test: atest FrameworksMockingServicesTests
Change-Id: I16dbb0a40cc29e2d68e4e0ac2f185661619f3a4d
---
 core/res/res/values/strings.xml                               | 4 ++--
 .../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 c6b60f5860475..2704224ec48e0 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 04d81d99ff23b..d813f631194e4 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();