Per-App-Expand bugfixes
pac (2/2)

Conflicts:
	core/java/android/util/ExtendedPropertiesUtils.java
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_0.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_100.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_15.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_28.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_43.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_57.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_71.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_85.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim0.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim100.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim15.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim28.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim43.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim57.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim71.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_battery_charge_anim85.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_0.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_0_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_1.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_1_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_2.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_2_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_3.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_3_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_4.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_4_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_signal_null.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_0.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_1.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_1_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_2.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_2_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_3.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_3_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_4.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_4_fully.png
	packages/SystemUI/res/drawable-sw1000dp-xhdpi/stat_sys_wifi_signal_null.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_0.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_100.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_15.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_28.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_43.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_57.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_71.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_85.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim0.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim100.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim15.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim28.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim43.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim57.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim71.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_battery_charge_anim85.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_0.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully.png
	packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java