From 164c8177a98ac192f303c30dbaf57b9b071c8fcd Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Thu, 23 Mar 2017 10:32:49 -0700
Subject: [PATCH 1/2] Update the string in battery screen

Only update the string in battery main screen and advanced screen

Bug: 36367764
Test: Manual
Change-Id: Ieed87d1766cf24d198eabfdc05f14b7653187f0f
---
 res/values/strings.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a85b8feec1..94814187035 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4348,6 +4348,8 @@
 
     <!-- Label for list of apps using battery in power use UI [CHAR_LIMIT=60] -->
     <string name="power_usage_list_summary">App usage since last full charge</string>
+    <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
+    <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
     <string name="device_usage_list_summary">Device usage since last full charge</string>
     <!-- Battery usage since unplugged -->
@@ -4546,19 +4548,21 @@
 
     <!-- Description for battery usage time for an app, i.e. Used for 30min. [CHAR LIMIT=60] -->
     <string name="battery_used_for">Used for %1$s</string>
+    <!-- Description for battery usage info for an app, i.e. 60% used by facebook. [CHAR LIMIT=60] -->
+    <string name="battery_used_by"><xliff:g id="percent">%1$s</xliff:g> used by <xliff:g id="app">%2$s</xliff:g></string>
     <!-- Description for percentage of battery usage for an app, i.e. Screen: 30% of overall battery. [CHAR LIMIT=60] -->
     <string name="battery_overall_usage">%1$s of overall battery</string>
     <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
-    <string name="battery_detail_since_full_charge">Usage breakdown since last full charge</string>
+    <string name="battery_detail_since_full_charge">Breakdown since full charge</string>
 
     <!-- Description for battery time left, i.e. 50min Estimated time left. [CHAR LIMIT=80]-->
     <string name="estimated_time_left">Estimated time left</string>
 
-    <!-- Description for charging time left, i.e. 50min Time to full charge. [CHAR LIMIT=80]-->
-    <string name="estimated_charging_time_left">Time to full charge</string>
+    <!-- Description for charging time left, i.e. 50min until fully charged [CHAR LIMIT=80]-->
+    <string name="estimated_charging_time_left">Until fully charged</string>
 
     <!-- Description for estimated time. [CHAR LIMIT=80]-->
-    <string name="estimated_time_description">Estimation may change based on usage</string>
+    <string name="estimated_time_description">Estimate may change based on usage</string>
 
     <!-- Menu label for viewing battery usage since unplugged -->
     <string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>

From 5776507642c17b2a7522f85912e9c1ffb7b03417 Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Fri, 24 Mar 2017 13:44:36 -0700
Subject: [PATCH 2/2] Update the battery string based on new mock.

The mock has been updated, upload the string first before the
string freeze.

Now the screen still uses old string, following cl will update
the screen and remove the old string.

Bug: 36576021
Test: Build
Change-Id: Ie7c3cd59dddd9223bc89c2aedd957a836e52456a
---
 res/values/strings.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 94814187035..45825a0c01b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4340,18 +4340,18 @@
     <string name="background_activity_summary">Allow the app to run in the background</string>
 
     <!-- Title for the screen usage in power use UI [CHAR_LIMIT=40] -->
-    <string name="device_screen_usage">Screen usage</string>
+    <string name="device_screen_usage">Screen usage since full charge</string>
     <!-- Title for the screen consumption in power use UI(i.e. Screen consumption: 30% of battery usage) [CHAR_LIMIT=40] -->
     <string name="device_screen_consumption">Screen consumption</string>
     <!-- Title for the cellular network in power use UI(i.e. Mobile network scanning: 30% of battery usage) [CHAR_LIMIT=40] -->
     <string name="device_cellular_network">Mobile network scanning</string>
 
     <!-- Label for list of apps using battery in power use UI [CHAR_LIMIT=60] -->
-    <string name="power_usage_list_summary">App usage since last full charge</string>
+    <string name="power_usage_list_summary">App usage since full charge</string>
     <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
     <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
-    <string name="device_usage_list_summary">Device usage since last full charge</string>
+    <string name="device_usage_list_summary">Device usage since full charge</string>
     <!-- Battery usage since unplugged -->
     <string name="battery_since_unplugged">Battery use since unplugged</string>
     <!-- Battery usage since user reset the stats -->
@@ -4553,7 +4553,11 @@
     <!-- Description for percentage of battery usage for an app, i.e. Screen: 30% of overall battery. [CHAR LIMIT=60] -->
     <string name="battery_overall_usage">%1$s of overall battery</string>
     <!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
-    <string name="battery_detail_since_full_charge">Breakdown since full charge</string>
+    <string name="battery_detail_since_full_charge">Breakdown since last full charge</string>
+    <!-- Title for usage time since last full charge. [CHAR LIMIT=60] -->
+    <string name="battery_last_full_charge">Last full charge</string>
+    <!-- Description for text in battery footer. [CHAR LIMIT=120] -->
+    <string name="battery_footer_summary">Remaining battery time is approximate and can change based on usage</string>
 
     <!-- Description for battery time left, i.e. 50min Estimated time left. [CHAR LIMIT=80]-->
     <string name="estimated_time_left">Estimated time left</string>