commit ae8b7259f59eb3208517f6e3558b9ba991f39b96
author Jason Monk <jmonk@google.com> Mon May 23 20:07:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 20:07:08 2016 +0000
tree 410656d5a25d2e4bc8f8c5b49e3288b93fa402c5
parent 809bb0f1957d92e9fc3a84c56573dddd6ce50162
parent 14abed66d7a70c3fc8e063246e3f79a0a53dfcd3

Merge "Make battery labels translatable." into nyc-dev
am: 14abed66d7

* commit '14abed66d7a70c3fc8e063246e3f79a0a53dfcd3':
  Make battery labels translatable.

Change-Id: Ic945adf122822b17d91ade4cf0a1d7eb4e6b4cb9

packages/SettingsLib/res/values/strings.xml

diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 7a8c6f2..89c46d7 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -809,7 +809,8 @@
     <!-- Option in navigation drawer that leads to Settings main screen [CHAR LIMIT=30] -->
     <string name="home">Settings Home</string>
 
-    <string-array name="battery_labels" translatable="false">
+    <!-- Labels on the side of batter graph in Quick Settings and Settings [CHAR LIMIT=8] -->
+    <string-array name="battery_labels">
         <item>0%</item>
         <item>50%</item>
         <item>100%</item>