From d4b7e92744bfca1432b9ade74b718936757fcade Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Thu, 17 May 2012 12:52:51 -0400 Subject: New null (disconnected) RSSI for wifi and mobile. On wifi-only devices we now show the null wifi RSSI if wifi is enabled but not connected. Bug: 6449811 Change-Id: Ib0cb11bcbef86d44ec633690806cff38796ffc3e --- .../res/drawable-hdpi/stat_sys_signal_null.png | Bin 693 -> 827 bytes .../res/drawable-hdpi/stat_sys_wifi_signal_null.png | Bin 0 -> 1074 bytes .../res/drawable-mdpi/stat_sys_signal_null.png | Bin 537 -> 658 bytes .../res/drawable-mdpi/stat_sys_wifi_signal_null.png | Bin 0 -> 750 bytes .../res/drawable-sw600dp-hdpi/stat_sys_signal_null.png | Bin 0 -> 953 bytes .../stat_sys_wifi_signal_null.png | Bin 0 -> 1411 bytes .../res/drawable-sw600dp-mdpi/stat_sys_signal_null.png | Bin 0 -> 735 bytes .../stat_sys_wifi_signal_null.png | Bin 0 -> 1001 bytes .../drawable-sw600dp-xhdpi/stat_sys_signal_null.png | Bin 0 -> 1203 bytes .../stat_sys_wifi_signal_null.png | Bin 0 -> 1908 bytes .../res/drawable-xhdpi/stat_sys_signal_null.png | Bin 864 -> 1054 bytes .../res/drawable-xhdpi/stat_sys_wifi_signal_null.png | Bin 0 -> 1407 bytes .../systemui/statusbar/policy/NetworkController.java | 5 +++-- 13 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png create mode 100644 packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png create mode 100644 packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png 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 daf18c77fd22..d9ec745ee5d3 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_null.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..117cf1902373 Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/stat_sys_wifi_signal_null.png 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 5292998ea307..2cebe856e1a9 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_null.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..7c60bea8cbdc Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/stat_sys_wifi_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png new file mode 100644 index 000000000000..9e6323c350f5 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..09b35b373576 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-hdpi/stat_sys_wifi_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png new file mode 100644 index 000000000000..2220c7307d4d Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..ea987f1e79ee Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-mdpi/stat_sys_wifi_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png new file mode 100644 index 000000000000..21db6a2f1de5 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_signal_null.png differ diff --git a/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..5e8baa489096 Binary files /dev/null and b/packages/SystemUI/res/drawable-sw600dp-xhdpi/stat_sys_wifi_signal_null.png 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 3e7fefda293c..90b8c84e8779 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_null.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png new file mode 100644 index 000000000000..588140270d8e Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/stat_sys_wifi_signal_null.png differ diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index a05fcc15609f..c65f581f200c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -282,7 +282,8 @@ public class NetworkController extends BroadcastReceiver { public void refreshSignalCluster(SignalCluster cluster) { cluster.setWifiIndicators( - mWifiConnected, // only show wifi in the cluster if connected + // only show wifi in the cluster if connected or if wifi-only + mWifiEnabled && (mWifiConnected || !mHasMobileDataFeature), mWifiIconId, mWifiActivityIconId, mContentDescriptionWifi); @@ -786,7 +787,7 @@ public class NetworkController extends BroadcastReceiver { if (mDataAndWifiStacked) { mWifiIconId = 0; } else { - mWifiIconId = mWifiEnabled ? WifiIcons.WIFI_SIGNAL_STRENGTH[0][0] : 0; + mWifiIconId = mWifiEnabled ? R.drawable.stat_sys_wifi_signal_null : 0; } mContentDescriptionWifi = mContext.getString(R.string.accessibility_no_wifi); } -- cgit v1.2.3-59-g8ed1b