diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png index 48f61220686a2..2aeb84a032d57 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png deleted file mode 100644 index 1439ecec6ae66..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png deleted file mode 100644 index 06c33695adae7..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png deleted file mode 100644 index a1a712f44bddd..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png deleted file mode 100644 index 313f0f5bea158..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png deleted file mode 100644 index 75def49909125..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png deleted file mode 100644 index efbd535a4f11f..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png deleted file mode 100644 index e0dca0bcc98c4..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png deleted file mode 100644 index 54ee2e6ed6c3a..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png index 686158bf62f9b..2aeb84a032d57 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png deleted file mode 100644 index 76170a80f5ed8..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png deleted file mode 100644 index 97d35f325f46d..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png deleted file mode 100644 index 17423d2591ede..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png deleted file mode 100644 index ae58b57a832dc..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png deleted file mode 100644 index 00e5bb8b2ca58..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png deleted file mode 100644 index b036a8922804e..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png deleted file mode 100644 index bdae6fb2e0ddc..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png deleted file mode 100644 index 2b7d95f243706..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png index 0cfdca07539c0..d52cb1af4f128 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png deleted file mode 100644 index 7bbfbd1d0437d..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png deleted file mode 100644 index 60b75ef3e36c9..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png deleted file mode 100644 index 0fba69d245433..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png deleted file mode 100644 index da8a95705c853..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png deleted file mode 100644 index e19bf64ad869a..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png deleted file mode 100644 index 8387514289612..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png deleted file mode 100644 index 35f774136a976..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png deleted file mode 100644 index a8820e917fcf2..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png index b65df27031ce5..d52cb1af4f128 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-mdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png deleted file mode 100644 index 0478d7077bb52..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png deleted file mode 100644 index e78a0b148a10b..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png deleted file mode 100644 index 24c75ec178b1e..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png deleted file mode 100644 index 7027dc49a9a1a..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png deleted file mode 100644 index b0e83dcdab96c..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png deleted file mode 100644 index 01945fff6a04b..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png deleted file mode 100644 index 725a507b40f4e..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png deleted file mode 100644 index 193af25fba521..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png index ec4f934d72aa2..726f7adf338d0 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_flowing.png deleted file mode 100644 index fb98eef783d44..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully_flowing.png deleted file mode 100644 index b86d47a24b449..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_flowing.png deleted file mode 100644 index 7269f9639766e..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully_flowing.png deleted file mode 100644 index f57e62d00b23f..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_flowing.png deleted file mode 100644 index 3d513fbcc014e..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully_flowing.png deleted file mode 100644 index 32556f95665fa..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_flowing.png deleted file mode 100644 index afac648ceea95..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully_flowing.png deleted file mode 100644 index 60c0e7f550abc..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png index 0df470a3d6c16..726f7adf338d0 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_flowing.png deleted file mode 100644 index d8d5e8fe61e9c..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully_flowing.png deleted file mode 100644 index 2b0b54fdca004..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_1_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_flowing.png deleted file mode 100644 index 85c65b44e8b7b..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully_flowing.png deleted file mode 100644 index a7e9aafb011d9..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_2_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_flowing.png deleted file mode 100644 index 21aba7e047f48..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully_flowing.png deleted file mode 100644 index 41db8dcc645ea..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_3_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_flowing.png deleted file mode 100644 index ae95d2666b96f..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully_flowing.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully_flowing.png deleted file mode 100644 index 4ad2c5ce7f1c3..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_4_fully_flowing.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png new file mode 100644 index 0000000000000..8a9deeadf90fb Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png new file mode 100644 index 0000000000000..8a9deeadf90fb Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-hdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png new file mode 100644 index 0000000000000..2de4515843a61 Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png new file mode 100644 index 0000000000000..2de4515843a61 Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-mdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png new file mode 100644 index 0000000000000..b9410f601b0c1 Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_0_fully.png differ diff --git a/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png new file mode 100644 index 0000000000000..b9410f601b0c1 Binary files /dev/null and b/packages/SystemUI/res/drawable-xlarge-xhdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable/stat_sys_battery.xml b/packages/SystemUI/res/drawable/stat_sys_battery.xml new file mode 100644 index 0000000000000..744ab93da9af6 --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_sys_battery.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_battery_charge.xml b/packages/SystemUI/res/drawable/stat_sys_battery_charge.xml new file mode 100644 index 0000000000000..6918eb21ed9d8 --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_sys_battery_charge.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml index 1e3099dc35717..17fa6537cb4a0 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml @@ -126,27 +126,10 @@ android:layout_width="wrap_content" android:visibility="gone" /> - - - - - + + + + + + + + + diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index c8f577219b5a3..0f5aa93534bd0 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -46,10 +46,29 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:paddingRight="6dip" android:gravity="center_vertical" android:orientation="horizontal"/> + + + + + Clear all - - - - - No Internet connection - - - - Wi-Fi connected - " – " - - Searching for GPS - - - Location set by GPS - Notifications off diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index fc8ab96e3487b..1b60b160e1474 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -299,4 +299,23 @@ Ringer silent. + + + + No Internet connection + + + + Wi-Fi connected + + + Searching for GPS + + + Location set by GPS + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index b93ad684311be..47d47101686bb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -82,7 +82,9 @@ import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.StatusBar; import com.android.systemui.statusbar.StatusBarIconView; import com.android.systemui.statusbar.policy.DateView; - +import com.android.systemui.statusbar.policy.BatteryController; +import com.android.systemui.statusbar.policy.LocationController; +import com.android.systemui.statusbar.policy.NetworkController; public class PhoneStatusBar extends StatusBar { static final String TAG = "PhoneStatusBar"; @@ -107,6 +109,11 @@ public class PhoneStatusBar extends StatusBar { PhoneStatusBarPolicy mIconPolicy; + // These are no longer handled by the policy, because we need custom strategies for them + BatteryController mBatteryController; + LocationController mLocationController; + NetworkController mNetworkController; + int mIconSize; Display mDisplay; @@ -306,6 +313,32 @@ public class PhoneStatusBar extends StatusBar { setAreThereNotifications(); mDateView.setVisibility(View.INVISIBLE); + // Other icons + mLocationController = new LocationController(mContext); // will post a notification + mBatteryController = new BatteryController(mContext); + mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery)); + mNetworkController = new NetworkController(mContext); + final ImageView comboRSSI = + (ImageView)sb.findViewById(R.id.network_signal); + if (comboRSSI != null) { + mNetworkController.addCombinedSignalIconView(comboRSSI); + } + final ImageView mobileRSSI = + (ImageView)sb.findViewById(R.id.mobile_signal); + if (mobileRSSI != null) { + mNetworkController.addPhoneSignalIconView(mobileRSSI); + } + final ImageView wifiRSSI = + (ImageView)sb.findViewById(R.id.wifi_signal); + if (wifiRSSI != null) { + mNetworkController.addWifiIconView(wifiRSSI); + } + mNetworkController.addDataTypeIconView( + (ImageView)sb.findViewById(R.id.network_type)); + mNetworkController.addDataDirectionOverlayIconView( + (ImageView)sb.findViewById(R.id.network_direction)); + mNetworkController.setStackedMode(true); + // Recents Panel updateRecentsPanel(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 7b50985349151..322a8c83e0bd9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -38,7 +38,6 @@ import android.telephony.SignalStrength; import android.telephony.TelephonyManager; import android.util.Slog; -import com.android.internal.app.IBatteryStats; import com.android.internal.telephony.IccCard; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.cdma.EriInfo; @@ -68,403 +67,14 @@ public class PhoneStatusBarPolicy { private final Context mContext; private final StatusBarManager mService; private final Handler mHandler = new Handler(); - private final IBatteryStats mBatteryStats; // storage private StorageManager mStorageManager; - // phone - private TelephonyManager mPhone; - private int mPhoneSignalIconId; - - //***** Signal strength icons - //GSM/UMTS - private static final int[][] sSignalImages = { - { R.drawable.stat_sys_signal_0, - R.drawable.stat_sys_signal_1, - R.drawable.stat_sys_signal_2, - R.drawable.stat_sys_signal_3, - R.drawable.stat_sys_signal_4 }, - { R.drawable.stat_sys_signal_0_fully, - R.drawable.stat_sys_signal_1_fully, - R.drawable.stat_sys_signal_2_fully, - R.drawable.stat_sys_signal_3_fully, - R.drawable.stat_sys_signal_4_fully } - }; - private static final int[][] sSignalImages_r = { - { R.drawable.stat_sys_r_signal_0, - R.drawable.stat_sys_r_signal_1, - R.drawable.stat_sys_r_signal_2, - R.drawable.stat_sys_r_signal_3, - R.drawable.stat_sys_r_signal_4 }, - { R.drawable.stat_sys_r_signal_0_fully, - R.drawable.stat_sys_r_signal_1_fully, - R.drawable.stat_sys_r_signal_2_fully, - R.drawable.stat_sys_r_signal_3_fully, - R.drawable.stat_sys_r_signal_4_fully } - }; - private static final int[] sRoamingIndicatorImages_cdma = new int[] { - R.drawable.stat_sys_roaming_cdma_0, //Standard Roaming Indicator - // 1 is Standard Roaming Indicator OFF - // TODO T: image never used, remove and put 0 instead? - R.drawable.stat_sys_roaming_cdma_0, - - // 2 is Standard Roaming Indicator FLASHING - // TODO T: image never used, remove and put 0 instead? - R.drawable.stat_sys_roaming_cdma_0, - - // 3-12 Standard ERI - R.drawable.stat_sys_roaming_cdma_0, //3 - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - - // 13-63 Reserved for Standard ERI - R.drawable.stat_sys_roaming_cdma_0, //13 - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - - // 64-127 Reserved for Non Standard (Operator Specific) ERI - R.drawable.stat_sys_roaming_cdma_0, //64 - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, //83 - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0, - R.drawable.stat_sys_roaming_cdma_0 //239 - - // 240-255 Reserved - }; - - //***** Data connection icons - private int[] mDataIconList = sDataNetType_g[0]; - //GSM/UMTS - private static final int[][] sDataNetType_g = { - { R.drawable.stat_sys_data_connected_g, - R.drawable.stat_sys_data_in_g, - R.drawable.stat_sys_data_out_g, - R.drawable.stat_sys_data_inandout_g }, - { R.drawable.stat_sys_data_fully_connected_g, - R.drawable.stat_sys_data_fully_in_g, - R.drawable.stat_sys_data_fully_out_g, - R.drawable.stat_sys_data_fully_inandout_g } - }; - private static final int[][] sDataNetType_3g = { - { R.drawable.stat_sys_data_connected_3g, - R.drawable.stat_sys_data_in_3g, - R.drawable.stat_sys_data_out_3g, - R.drawable.stat_sys_data_inandout_3g }, - { R.drawable.stat_sys_data_fully_connected_3g, - R.drawable.stat_sys_data_fully_in_3g, - R.drawable.stat_sys_data_fully_out_3g, - R.drawable.stat_sys_data_fully_inandout_3g } - }; - private static final int[][] sDataNetType_4g = { - { R.drawable.stat_sys_data_connected_4g, - R.drawable.stat_sys_data_in_4g, - R.drawable.stat_sys_data_out_4g, - R.drawable.stat_sys_data_inandout_4g }, - { R.drawable.stat_sys_data_fully_connected_4g, - R.drawable.stat_sys_data_fully_in_4g, - R.drawable.stat_sys_data_fully_out_4g, - R.drawable.stat_sys_data_fully_inandout_4g } - }; - private static final int[][] sDataNetType_e = { - { R.drawable.stat_sys_data_connected_e, - R.drawable.stat_sys_data_in_e, - R.drawable.stat_sys_data_out_e, - R.drawable.stat_sys_data_inandout_e }, - { R.drawable.stat_sys_data_fully_connected_e, - R.drawable.stat_sys_data_fully_in_e, - R.drawable.stat_sys_data_fully_out_e, - R.drawable.stat_sys_data_fully_inandout_e } - }; - //3.5G - private static final int[][] sDataNetType_h = { - { R.drawable.stat_sys_data_connected_h, - R.drawable.stat_sys_data_in_h, - R.drawable.stat_sys_data_out_h, - R.drawable.stat_sys_data_inandout_h }, - { R.drawable.stat_sys_data_fully_connected_h, - R.drawable.stat_sys_data_fully_in_h, - R.drawable.stat_sys_data_fully_out_h, - R.drawable.stat_sys_data_fully_inandout_h } - }; - - //CDMA - // Use 3G icons for EVDO data and 1x icons for 1XRTT data - private static final int[][] sDataNetType_1x = { - { R.drawable.stat_sys_data_connected_1x, - R.drawable.stat_sys_data_in_1x, - R.drawable.stat_sys_data_out_1x, - R.drawable.stat_sys_data_inandout_1x }, - { R.drawable.stat_sys_data_fully_connected_1x, - R.drawable.stat_sys_data_fully_in_1x, - R.drawable.stat_sys_data_fully_out_1x, - R.drawable.stat_sys_data_fully_inandout_1x } - }; - - // Accessibility; - - private static final int[] sPhoneSignalStrength = { - R.string.accessibility_no_phone, - R.string.accessibility_phone_one_bar, - R.string.accessibility_phone_two_bars, - R.string.accessibility_phone_three_bars, - R.string.accessibility_phone_signal_full - }; - - private static final int[] sDataConnectionStrength = { - R.string.accessibility_no_data, - R.string.accessibility_data_one_bar, - R.string.accessibility_data_two_bars, - R.string.accessibility_data_three_bars, - R.string.accessibility_data_signal_full - }; - - private static final int[] sWifiConnectionStrength = { - R.string.accessibility_no_wifi, - R.string.accessibility_wifi_one_bar, - R.string.accessibility_wifi_two_bars, - R.string.accessibility_wifi_three_bars, - R.string.accessibility_wifi_signal_full - }; // Assume it's all good unless we hear otherwise. We don't always seem // to get broadcasts that it *is* there. IccCard.State mSimState = IccCard.State.READY; - int mPhoneState = TelephonyManager.CALL_STATE_IDLE; - int mDataState = TelephonyManager.DATA_DISCONNECTED; - int mDataActivity = TelephonyManager.DATA_ACTIVITY_NONE; - ServiceState mServiceState; - SignalStrength mSignalStrength; - - // data connection - private boolean mDataIconVisible; - private boolean mHspaDataDistinguishable; // ringer volume private boolean mVolumeVisible; @@ -500,10 +110,7 @@ public class PhoneStatusBarPolicy { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { - updateBattery(intent); - } - else if (action.equals(Intent.ACTION_ALARM_CHANGED)) { + if (action.equals(Intent.ACTION_ALARM_CHANGED)) { updateAlarm(intent); } else if (action.equals(Intent.ACTION_SYNC_STATE_CHANGED)) { @@ -513,15 +120,6 @@ public class PhoneStatusBarPolicy { action.equals(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)) { updateBluetooth(intent); } - else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION) || - action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION) || - action.equals(WifiManager.RSSI_CHANGED_ACTION)) { - updateWifi(intent); - } - else if (action.equals(LocationManager.GPS_ENABLED_CHANGE_ACTION) || - action.equals(LocationManager.GPS_FIX_CHANGE_ACTION)) { - updateGps(intent); - } else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION) || action.equals(AudioManager.VIBRATE_SETTING_CHANGED_ACTION)) { updateVolume(); @@ -532,52 +130,18 @@ public class PhoneStatusBarPolicy { else if (action.equals(TtyIntent.TTY_ENABLED_CHANGE_ACTION)) { updateTTY(intent); } - else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) || - action.equals(ConnectivityManager.INET_CONDITION_ACTION)) { - // TODO - stop using other means to get wifi/mobile info - updateConnectivity(intent); - } } }; public PhoneStatusBarPolicy(Context context) { mContext = context; mService = (StatusBarManager)context.getSystemService(Context.STATUS_BAR_SERVICE); - mSignalStrength = new SignalStrength(); - mBatteryStats = BatteryStatsService.getService(); // storage mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE); mStorageManager.registerListener( new com.android.systemui.usb.StorageNotification(context)); - // battery - mService.setIcon("battery", com.android.internal.R.drawable.stat_sys_battery_unknown, 0, - null); - - // phone_signal - mPhone = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE); - mPhoneSignalIconId = R.drawable.stat_sys_signal_null; - mService.setIcon("phone_signal", mPhoneSignalIconId, 0, null); - - // register for phone state notifications. - ((TelephonyManager)mContext.getSystemService(Context.TELEPHONY_SERVICE)) - .listen(mPhoneStateListener, - PhoneStateListener.LISTEN_SERVICE_STATE - | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS - | PhoneStateListener.LISTEN_CALL_STATE - | PhoneStateListener.LISTEN_DATA_CONNECTION_STATE - | PhoneStateListener.LISTEN_DATA_ACTIVITY); - - // data_connection - mService.setIcon("data_connection", R.drawable.stat_sys_data_connected_g, 0, null); - mService.setIconVisibility("data_connection", false); - - // wifi - mService.setIcon("wifi", sWifiSignalImages[0][0], 0, null); - mService.setIconVisibility("wifi", false); - // wifi will get updated by the sticky intents - // TTY status mService.setIcon("tty", R.drawable.stat_sys_tty_mode, 0, null); mService.setIconVisibility("tty", false); @@ -596,10 +160,6 @@ public class PhoneStatusBarPolicy { } mService.setIconVisibility("bluetooth", mBluetoothEnabled); - // Gps status - mService.setIcon("gps", R.drawable.stat_sys_gps_acquiring_anim, 0, null); - mService.setIconVisibility("gps", false); - // Alarm clock mService.setIcon("alarm_clock", R.drawable.stat_notify_alarm, 0, null); mService.setIconVisibility("alarm_clock", false); @@ -620,32 +180,15 @@ public class PhoneStatusBarPolicy { IntentFilter filter = new IntentFilter(); // Register for Intent broadcasts for... - filter.addAction(Intent.ACTION_BATTERY_CHANGED); filter.addAction(Intent.ACTION_ALARM_CHANGED); filter.addAction(Intent.ACTION_SYNC_STATE_CHANGED); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); filter.addAction(AudioManager.VIBRATE_SETTING_CHANGED_ACTION); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); - filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); - filter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION); - filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); - filter.addAction(WifiManager.RSSI_CHANGED_ACTION); - filter.addAction(LocationManager.GPS_ENABLED_CHANGE_ACTION); - filter.addAction(LocationManager.GPS_FIX_CHANGE_ACTION); filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED); filter.addAction(TtyIntent.TTY_ENABLED_CHANGE_ACTION); - filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); - filter.addAction(ConnectivityManager.INET_CONDITION_ACTION); mContext.registerReceiver(mIntentReceiver, filter, null, mHandler); - - // load config to determine if to distinguish Hspa data icon - try { - mHspaDataDistinguishable = mContext.getResources().getBoolean( - R.bool.config_hspa_data_distinguishable); - } catch (Exception e) { - mHspaDataDistinguishable = false; - } } private final void updateAlarm(Intent intent) { @@ -661,96 +204,6 @@ public class PhoneStatusBarPolicy { //mService.setIconVisibility("sync_failing", isFailing && !isActive); } - private final void updateBattery(Intent intent) { - final int id = intent.getIntExtra("icon-small", 0); - int level = intent.getIntExtra("level", 0); - String contentDescription = mContext.getString(R.string.accessibility_battery_level, level); - mService.setIcon("battery", id, level, contentDescription); - } - - private void updateConnectivity(Intent intent) { - NetworkInfo info = (NetworkInfo)(intent.getParcelableExtra( - ConnectivityManager.EXTRA_NETWORK_INFO)); - int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0); - - int inetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); - - switch (info.getType()) { - case ConnectivityManager.TYPE_MOBILE: - mInetCondition = inetCondition; - updateDataNetType(info.getSubtype()); - updateDataIcon(); - updateSignalStrength(); // apply any change in connectionStatus - break; - case ConnectivityManager.TYPE_WIFI: - mInetCondition = inetCondition; - if (info.isConnected()) { - mIsWifiConnected = true; - int iconId; - String contentDescription = null; - if (mLastWifiSignalLevel == -1) { - iconId = sWifiSignalImages[mInetCondition][0]; - contentDescription = mContext.getString(sWifiConnectionStrength[0]); - } else { - iconId = sWifiSignalImages[mInetCondition][mLastWifiSignalLevel]; - contentDescription = mContext.getString( - sWifiConnectionStrength[mLastWifiSignalLevel]); - } - mService.setIcon("wifi", iconId, 0, contentDescription); - // Show the icon since wi-fi is connected - mService.setIconVisibility("wifi", true); - } else { - mLastWifiSignalLevel = -1; - mIsWifiConnected = false; - int iconId = sWifiSignalImages[0][0]; - - String contentDescription = mContext.getString(R.string.accessibility_no_wifi); - mService.setIcon("wifi", iconId, 0, contentDescription); - // Hide the icon since we're not connected - mService.setIconVisibility("wifi", false); - } - updateSignalStrength(); // apply any change in mInetCondition - break; - } - } - - private PhoneStateListener mPhoneStateListener = new PhoneStateListener() { - @Override - public void onSignalStrengthsChanged(SignalStrength signalStrength) { - mSignalStrength = signalStrength; - updateSignalStrength(); - } - - @Override - public void onServiceStateChanged(ServiceState state) { - mServiceState = state; - updateSignalStrength(); - updateCdmaRoamingIcon(state); - updateDataIcon(); - } - - @Override - public void onCallStateChanged(int state, String incomingNumber) { - // In cdma, if a voice call is made, RSSI should switch to 1x. - if (isCdma()) { - updateSignalStrength(); - } - } - - @Override - public void onDataConnectionStateChanged(int state, int networkType) { - mDataState = state; - updateDataNetType(networkType); - updateDataIcon(); - } - - @Override - public void onDataActivity(int direction) { - mDataActivity = direction; - updateDataIcon(); - } - }; - private final void updateSimState(Intent intent) { String stateExtra = intent.getStringExtra(IccCard.INTENT_KEY_ICC_STATE); if (IccCard.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) { @@ -773,171 +226,6 @@ public class PhoneStatusBarPolicy { } else { mSimState = IccCard.State.UNKNOWN; } - updateDataIcon(); - } - - private boolean isCdma() { - return (mSignalStrength != null) && !mSignalStrength.isGsm(); - } - - private boolean hasService() { - if (mServiceState != null) { - switch (mServiceState.getState()) { - case ServiceState.STATE_OUT_OF_SERVICE: - case ServiceState.STATE_POWER_OFF: - return false; - default: - return true; - } - } else { - return false; - } - } - - private final void updateSignalStrength() { - int[] iconList; - String contentDescription = null; - - // Display signal strength while in "emergency calls only" mode - if (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly())) { - //Slog.d(TAG, "updateSignalStrength: no service"); - if (Settings.System.getInt(mContext.getContentResolver(), - Settings.System.AIRPLANE_MODE_ON, 0) == 1) { - mPhoneSignalIconId = R.drawable.stat_sys_signal_flightmode; - contentDescription = mContext.getString(R.string.accessibility_airplane_mode); - } else { - mPhoneSignalIconId = R.drawable.stat_sys_signal_null; - contentDescription = mContext.getString(R.string.accessibility_no_phone); - } - mService.setIcon("phone_signal", mPhoneSignalIconId, 0, contentDescription); - return; - } - - if (!isCdma()) { - // Though mPhone is a Manager, this call is not an IPC - if (mPhone.isNetworkRoaming()) { - iconList = sSignalImages_r[mInetCondition]; - } else { - iconList = sSignalImages[mInetCondition]; - } - } else { - iconList = sSignalImages[mInetCondition]; - } - - final int signalLevel = mSignalStrength.getLevel(); - mPhoneSignalIconId = iconList[signalLevel]; - contentDescription = mContext.getString(sPhoneSignalStrength[signalLevel]); - mService.setIcon("phone_signal", mPhoneSignalIconId, 0, contentDescription); - } - - private final void updateDataNetType(int net) { - switch (net) { - case TelephonyManager.NETWORK_TYPE_EDGE: - mDataIconList = sDataNetType_e[mInetCondition]; - break; - case TelephonyManager.NETWORK_TYPE_UMTS: - mDataIconList = sDataNetType_3g[mInetCondition]; - break; - case TelephonyManager.NETWORK_TYPE_HSDPA: - case TelephonyManager.NETWORK_TYPE_HSUPA: - case TelephonyManager.NETWORK_TYPE_HSPA: - if (mHspaDataDistinguishable) { - mDataIconList = sDataNetType_h[mInetCondition]; - } else { - mDataIconList = sDataNetType_3g[mInetCondition]; - } - break; - case TelephonyManager.NETWORK_TYPE_CDMA: - // display 1xRTT for IS95A/B - mDataIconList = sDataNetType_1x[mInetCondition]; - break; - case TelephonyManager.NETWORK_TYPE_1xRTT: - mDataIconList = sDataNetType_1x[mInetCondition]; - break; - case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through - case TelephonyManager.NETWORK_TYPE_EVDO_A: - case TelephonyManager.NETWORK_TYPE_EVDO_B: - case TelephonyManager.NETWORK_TYPE_EHRPD: - mDataIconList = sDataNetType_3g[mInetCondition]; - break; - case TelephonyManager.NETWORK_TYPE_LTE: - mDataIconList = sDataNetType_4g[mInetCondition]; - break; - default: - mDataIconList = sDataNetType_g[mInetCondition]; - break; - } - } - - private final void updateDataIcon() { - int iconId; - String contentDescription = null; - boolean visible = true; - - if (!isCdma()) { - // GSM case, we have to check also the sim state - if (mSimState == IccCard.State.READY || mSimState == IccCard.State.UNKNOWN) { - if (hasService() && mDataState == TelephonyManager.DATA_CONNECTED) { - switch (mDataActivity) { - case TelephonyManager.DATA_ACTIVITY_IN: - iconId = mDataIconList[1]; - break; - case TelephonyManager.DATA_ACTIVITY_OUT: - iconId = mDataIconList[2]; - break; - case TelephonyManager.DATA_ACTIVITY_INOUT: - iconId = mDataIconList[3]; - break; - default: - iconId = mDataIconList[0]; - break; - } - contentDescription = mContext.getString(sDataConnectionStrength[mDataActivity]); - mService.setIcon("data_connection", iconId, 0, contentDescription); - } else { - visible = false; - } - } else { - iconId = R.drawable.stat_sys_no_sim; - contentDescription = mContext.getString(R.string.accessibility_no_sim); - mService.setIcon("data_connection", iconId, 0, contentDescription); - } - } else { - // CDMA case, mDataActivity can be also DATA_ACTIVITY_DORMANT - if (hasService() && mDataState == TelephonyManager.DATA_CONNECTED) { - switch (mDataActivity) { - case TelephonyManager.DATA_ACTIVITY_IN: - iconId = mDataIconList[1]; - break; - case TelephonyManager.DATA_ACTIVITY_OUT: - iconId = mDataIconList[2]; - break; - case TelephonyManager.DATA_ACTIVITY_INOUT: - iconId = mDataIconList[3]; - break; - case TelephonyManager.DATA_ACTIVITY_DORMANT: - default: - iconId = mDataIconList[0]; - break; - } - mService.setIcon("data_connection", iconId, 0, null); - } else { - visible = false; - } - } - - long ident = Binder.clearCallingIdentity(); - try { - mBatteryStats.notePhoneDataConnectionState(mPhone.getNetworkType(), visible); - } catch (RemoteException e) { - } finally { - Binder.restoreCallingIdentity(ident); - } - - if (mDataIconVisible != visible) { - mService.setIconVisibility("data_connection", visible); - mDataIconVisible = visible; - } } private final void updateVolume() { @@ -990,65 +278,6 @@ public class PhoneStatusBarPolicy { mService.setIconVisibility("bluetooth", mBluetoothEnabled); } - private final void updateWifi(Intent intent) { - final String action = intent.getAction(); - if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { - - final boolean enabled = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, - WifiManager.WIFI_STATE_UNKNOWN) == WifiManager.WIFI_STATE_ENABLED; - - if (!enabled) { - // If disabled, hide the icon. (We show icon when connected.) - mService.setIconVisibility("wifi", false); - } - - } else if (action.equals(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION)) { - final boolean enabled = intent.getBooleanExtra(WifiManager.EXTRA_SUPPLICANT_CONNECTED, - false); - if (!enabled) { - mService.setIconVisibility("wifi", false); - } - } else if (action.equals(WifiManager.RSSI_CHANGED_ACTION)) { - int iconId; - String contentDescription = null; - final int newRssi = intent.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -200); - int newSignalLevel = WifiManager.calculateSignalLevel(newRssi, - sWifiSignalImages[0].length); - if (newSignalLevel != mLastWifiSignalLevel) { - mLastWifiSignalLevel = newSignalLevel; - if (mIsWifiConnected) { - iconId = sWifiSignalImages[mInetCondition][newSignalLevel]; - contentDescription = mContext.getString( - sWifiConnectionStrength[newSignalLevel]); - } else { - iconId = sWifiTemporarilyNotConnectedImage; - contentDescription = mContext.getString(R.string.accessibility_no_wifi); - } - mService.setIcon("wifi", iconId, 0, contentDescription); - } - } - } - - private final void updateGps(Intent intent) { - final String action = intent.getAction(); - final boolean enabled = intent.getBooleanExtra(LocationManager.EXTRA_GPS_ENABLED, false); - - if (action.equals(LocationManager.GPS_FIX_CHANGE_ACTION) && enabled) { - // GPS is getting fixes - mService.setIcon("gps", com.android.internal.R.drawable.stat_sys_gps_on, 0, - mContext.getString(R.string.accessibility_gps_enabled)); - mService.setIconVisibility("gps", true); - } else if (action.equals(LocationManager.GPS_ENABLED_CHANGE_ACTION) && !enabled) { - // GPS is off - mService.setIconVisibility("gps", false); - } else { - // GPS is on, but not receiving fixes - mService.setIcon("gps", R.drawable.stat_sys_gps_acquiring_anim, 0, - mContext.getString(R.string.accessibility_gps_acquiring)); - mService.setIconVisibility("gps", true); - } - } - private final void updateTTY(Intent intent) { final String action = intent.getAction(); final boolean enabled = intent.getBooleanExtra(TtyIntent.TTY_ENABLED, false); @@ -1067,49 +296,4 @@ public class PhoneStatusBarPolicy { mService.setIconVisibility("tty", false); } } - - private final void updateCdmaRoamingIcon(ServiceState state) { - if (!hasService()) { - mService.setIconVisibility("cdma_eri", false); - return; - } - - if (!isCdma()) { - mService.setIconVisibility("cdma_eri", false); - return; - } - - int[] iconList = sRoamingIndicatorImages_cdma; - int iconIndex = state.getCdmaEriIconIndex(); - int iconMode = state.getCdmaEriIconMode(); - - if (iconIndex == -1) { - Slog.e(TAG, "getCdmaEriIconIndex returned null, skipping ERI icon update"); - return; - } - - if (iconMode == -1) { - Slog.e(TAG, "getCdmeEriIconMode returned null, skipping ERI icon update"); - return; - } - - if (iconIndex == EriInfo.ROAMING_INDICATOR_OFF) { - if (false) Slog.v(TAG, "Cdma ROAMING_INDICATOR_OFF, removing ERI icon"); - mService.setIconVisibility("cdma_eri", false); - return; - } - - switch (iconMode) { - case EriInfo.ROAMING_ICON_MODE_NORMAL: - mService.setIcon("cdma_eri", iconList[iconIndex], 0, null); - mService.setIconVisibility("cdma_eri", true); - break; - case EriInfo.ROAMING_ICON_MODE_FLASH: - mService.setIcon("cdma_eri", R.drawable.stat_sys_roaming_cdma_flash, 0, null); - mService.setIconVisibility("cdma_eri", true); - break; - - } - mService.setIcon("phone_signal", mPhoneSignalIconId, 0, null); - } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java index 3957c1b80ab39..ff418c4500e9a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java @@ -56,9 +56,11 @@ public class BatteryController extends BroadcastReceiver { final String action = intent.getAction(); if (action.equals(Intent.ACTION_BATTERY_CHANGED)) { final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0); + final boolean plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0; + final int icon = plugged ? R.drawable.stat_sys_battery_charge + : R.drawable.stat_sys_battery; int N = mIconViews.size(); for (int i=0; i