commit 3e88f9e467d76dcd48a64f83bf8602806a85d1af
author Linux Build Service Account <lnxbuild@localhost> Wed Nov 11 13:35:03 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Nov 11 13:35:03 2015 -0800
tree ae8f1a29634f5ea46e075283be1394793c373d86
parent ba1036f06eb7d1e65633a96c5f61d7079e0bd158
parent 5cec0d34be3a9555eca10356576846a620a67dc9

Merge "SystemUI: Show percentage of battery"

packages/SystemUI/res/values/config.xml

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 260d81b..3391b40 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -296,5 +296,7 @@
     <!-- Duration of the expansion animation in the volume dialog -->
     <item name="volume_expand_animation_duration" type="integer">300</item>
 
+    <!-- Whether or not to show battery level text. -->
+    <bool name="config_showBatteryPercentage">false</bool>
 </resources>
 

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
index b93fc76..418fc92 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java
@@ -104,7 +104,9 @@
         } else if (mMultiUserSwitch.getParent() == this && mKeyguardUserSwitcherShowing) {
             removeView(mMultiUserSwitch);
         }
-        mBatteryLevel.setVisibility(mBatteryCharging ? View.VISIBLE : View.GONE);
+        boolean showBatteryLevel = getResources().getBoolean(R.bool.config_showBatteryPercentage);
+        mBatteryLevel.setVisibility(
+                mBatteryCharging || showBatteryLevel ? View.VISIBLE : View.GONE);
     }
 
     private void updateSystemIconsLayoutParams() {