commit 794be40f8b62b309004cc3f68ca9567e4ef24c6b
author Joe Onorato <joeo@google.com> Sun Nov 21 19:22:25 2010 -0800
committer Joe Onorato <joeo@google.com> Sun Nov 21 19:22:25 2010 -0800
tree bb5d94854312147a07e7e06de3324dd8dd4ec9e1
parent dab75b66aae2c30f88eab2fec2d177c5f11f24dc

new battery assets

Change-Id: I61331a6eb237f8883bf604c0767623b08c2fa41b

services/java/com/android/server/BatteryService.java

diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 40883bd..47599c832 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -473,10 +473,15 @@
     private final int getIcon(int level) {
         if (mBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING) {
             return com.android.internal.R.drawable.stat_sys_battery_charge;
-        } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_DISCHARGING ||
-                mBatteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING ||
-                mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) {
+        } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_DISCHARGING) {
             return com.android.internal.R.drawable.stat_sys_battery;
+        } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING
+                || mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) {
+            if (isPowered() && mBatteryLevel >= 100) {
+                return com.android.internal.R.drawable.stat_sys_battery_charge;
+            } else {
+                return com.android.internal.R.drawable.stat_sys_battery;
+            }
         } else {
             return com.android.internal.R.drawable.stat_sys_battery_unknown;
         }