From 9cb5f5b5233f2331748d108d71f4b685762f32a7 Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Sat, 12 Oct 2013 21:28:50 -0700
Subject: Layoutlib: Update the wifi icon in the status bar.

Issue: https://code.google.com/p/android/issues/detail?id=60993

Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
---
 .../bars/hdpi/stat_sys_battery_charge_anim100.png     | Bin 0 -> 1040 bytes
 .../bars/hdpi/stat_sys_wifi_signal_4_fully.png        | Bin 1195 -> 2436 bytes
 .../bars/mdpi/stat_sys_battery_charge_anim100.png     | Bin 0 -> 762 bytes
 .../bars/mdpi/stat_sys_wifi_signal_4_fully.png        | Bin 885 -> 1430 bytes
 tools/layoutlib/bridge/resources/bars/status_bar.xml  |   8 +++++---
 .../bars/xhdpi/stat_sys_battery_charge_anim100.png    | Bin 0 -> 1332 bytes
 .../bars/xhdpi/stat_sys_wifi_signal_4_fully.png       | Bin 0 -> 3485 bytes
 .../com/android/layoutlib/bridge/bars/StatusBar.java  |   5 +----
 8 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png
 create mode 100644 tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png

diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..829378e
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png
index bd44b52..931daed 100644
Binary files a/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png and b/tools/layoutlib/bridge/resources/bars/hdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..2773a70
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png
index c629387..6e1ac91 100644
Binary files a/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png and b/tools/layoutlib/bridge/resources/bars/mdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/status_bar.xml b/tools/layoutlib/bridge/resources/bars/status_bar.xml
index d3c492e..51b474d 100644
--- a/tools/layoutlib/bridge/resources/bars/status_bar.xml
+++ b/tools/layoutlib/bridge/resources/bars/status_bar.xml
@@ -6,10 +6,12 @@
 			android:layout_weight="1"/>
 	<ImageView
 			android:layout_height="wrap_content"
-			android:layout_width="wrap_content"/>
+			android:layout_width="wrap_content"
+			android:layout_marginTop="1dp"/>
 	<ImageView
 			android:layout_height="wrap_content"
 			android:layout_width="wrap_content"
-			android:layout_marginLeft="3dip"
-			android:layout_marginRight="5dip"/>
+			android:layout_marginLeft="3dp"
+			android:layout_marginRight="5dp"
+			android:layout_marginTop="1dp"/>
 </merge>
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png
new file mode 100644
index 0000000..c7fd719
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_battery_charge_anim100.png differ
diff --git a/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png
new file mode 100644
index 0000000..625c61d
Binary files /dev/null and b/tools/layoutlib/bridge/resources/bars/xhdpi/stat_sys_wifi_signal_4_fully.png differ
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
index baa956d..3692d96 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
@@ -45,10 +45,7 @@ public class StatusBar extends CustomBar {
         // We do know the order though.
         // 0 is the spacer
         loadIcon(1, "stat_sys_wifi_signal_4_fully.png", density);
-        Drawable drawable = loadIcon(2, ResourceType.DRAWABLE, "stat_sys_battery_charge");
-        if (drawable instanceof LevelListDrawable) {
-            ((LevelListDrawable) drawable).setLevel(100);
-        }
+        loadIcon(2, "stat_sys_battery_charge_anim100.png", density);
     }
 
     @Override
-- 
cgit v1.1