From be59441258d6b2689a2ed56fd34d00c70b107bae Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Thu, 23 Mar 2017 15:48:15 -0700
Subject: [PATCH] Update string for battery optimization dialog

Change-Id: Iea95bec173ac6cdabc10c32ae51604f190f6f42f
Fix: 36569198
Test: builds
---
 res/values/strings.xml                                   | 9 ++++-----
 .../fuelgauge/RequestIgnoreBatteryOptimizations.java     | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50ac95f86dc..43313fb401f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7177,13 +7177,12 @@
     <string name="high_power_desc">Don\u2019t apply battery optimization. May drain your battery more quickly.</string>
 
     <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
-    <string name="high_power_prompt_title">Ignore battery optimizations?</string>
+    <string name="high_power_prompt_title">Let app always run in background?</string>
 
     <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
-    <string name="high_power_prompt_body">Let app
-        <xliff:g id="app_name" example="Settings">%1$s</xliff:g> stay connected in the
-        background?  This may use more battery.</string>
-
+    <string name="high_power_prompt_body">
+        Allowing <xliff:g id="app_name" example="Settings">%1$s</xliff:g> to always run in the background may reduce battery life.
+        \n\nYou can change this later from Settings > Apps &amp; notifications.</string>
     <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
     <string name="battery_summary"><xliff:g id="percentage" example="2">%1$d</xliff:g>%% use since last full charge</string>
 
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index b16fd18a1f4..27bd889afcb 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -91,8 +91,8 @@ public class RequestIgnoreBatteryOptimizations extends AlertActivity implements
         final AlertController.AlertParams p = mAlertParams;
         p.mTitle = getText(R.string.high_power_prompt_title);
         p.mMessage = getString(R.string.high_power_prompt_body, ai.loadLabel(getPackageManager()));
-        p.mPositiveButtonText = getText(R.string.yes);
-        p.mNegativeButtonText = getText(R.string.no);
+        p.mPositiveButtonText = getText(R.string.allow);
+        p.mNegativeButtonText = getText(R.string.deny);
         p.mPositiveButtonListener = this;
         p.mNegativeButtonListener = this;
         setupAlert();