am ec555902: Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev

* commit 'ec555902169b9c64163abddf079a6a81f6fcafb4':
  Layoutlib: Update the wifi icon in the status bar.

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_marginLeft="3dp"
-			android:layout_marginRight="5dip"/>
+			android:layout_marginRight="5dp"
+			android:layout_marginTop="1dp"/>
 </merge>

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");
+        loadIcon(2, "stat_sys_battery_charge_anim100.png", density);
-        if (drawable instanceof LevelListDrawable) {
-            ((LevelListDrawable) drawable).setLevel(100);
-        }
     }
 
     @Override