From 34563e2dc58812d65309eb2056674e10bf9b8f07 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 21 Sep 2012 17:19:49 -0700 Subject: Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738) - Using startActivityFromUser() for multiuser settings intents - Show Wifi/Bluetooth Off labels when they are off - Removing quotes from SSID name - Only showing the IME tile under the same conditions that the notification is showing - Making tile labels uppercase Change-Id: Ic4a085cda600da019eab259b22c9041d1a0b5d29 --- .../res/drawable-hdpi/ic_qs_airplane_off.png | Bin 1689 -> 1678 bytes .../SystemUI/res/drawable-hdpi/ic_qs_alarm_on.png | Bin 949 -> 2064 bytes .../res/drawable-hdpi/ic_qs_auto_rotate.png | Bin 1717 -> 1701 bytes .../drawable-hdpi/ic_qs_battery_bang_orange.png | Bin 0 -> 808 bytes .../res/drawable-hdpi/ic_qs_battery_bang_red.png | Bin 0 -> 647 bytes .../res/drawable-hdpi/ic_qs_battery_bang_white.png | Bin 0 -> 584 bytes .../res/drawable-hdpi/ic_qs_battery_bolt.png | Bin 0 -> 689 bytes .../res/drawable-hdpi/ic_qs_bluetooth_off.png | Bin 1997 -> 1976 bytes .../drawable-hdpi/ic_qs_brightness_auto_off.png | Bin 2363 -> 2372 bytes .../res/drawable-hdpi/ic_qs_brightness_auto_on.png | Bin 2196 -> 2194 bytes packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png | Bin 1268 -> 1274 bytes .../drawable-hdpi/ic_qs_mirroring_notconnected.png | Bin 0 -> 1489 bytes .../SystemUI/res/drawable-hdpi/ic_qs_settings.png | Bin 1477 -> 1522 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_1.png | Bin 1066 -> 1082 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png | Bin 962 -> 969 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_2.png | Bin 1073 -> 1094 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_3.png | Bin 1067 -> 1080 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png | Bin 1137 -> 1145 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_4.png | Bin 997 -> 1010 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png | Bin 1094 -> 1092 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_e.png | Bin 647 -> 657 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_g.png | Bin 842 -> 845 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_h.png | Bin 660 -> 663 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_in.png | Bin 616 -> 624 bytes .../res/drawable-hdpi/ic_qs_signal_inout.png | Bin 797 -> 808 bytes .../res/drawable-hdpi/ic_qs_signal_no_network.png | Bin 0 -> 924 bytes .../res/drawable-hdpi/ic_qs_signal_no_signal.png | Bin 1104 -> 1109 bytes .../res/drawable-hdpi/ic_qs_signal_out.png | Bin 577 -> 585 bytes .../SystemUI/res/drawable-hdpi/ic_qs_signal_r.png | Bin 775 -> 771 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png | Bin 2048 -> 2064 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png | Bin 2149 -> 2164 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png | Bin 2169 -> 2229 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png | Bin 1919 -> 1884 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_in.png | Bin 616 -> 624 bytes .../res/drawable-hdpi/ic_qs_wifi_inout.png | Bin 797 -> 808 bytes .../res/drawable-hdpi/ic_qs_wifi_no_network.png | Bin 1628 -> 1596 bytes .../SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png | Bin 577 -> 585 bytes .../res/drawable-mdpi/ic_qs_airplane_off.png | Bin 1190 -> 1184 bytes .../SystemUI/res/drawable-mdpi/ic_qs_alarm_on.png | Bin 649 -> 1328 bytes .../res/drawable-mdpi/ic_qs_auto_rotate.png | Bin 1225 -> 1186 bytes .../drawable-mdpi/ic_qs_battery_bang_orange.png | Bin 0 -> 656 bytes .../res/drawable-mdpi/ic_qs_battery_bang_red.png | Bin 0 -> 536 bytes .../res/drawable-mdpi/ic_qs_battery_bang_white.png | Bin 0 -> 502 bytes .../res/drawable-mdpi/ic_qs_battery_bolt.png | Bin 0 -> 619 bytes .../res/drawable-mdpi/ic_qs_bluetooth_off.png | Bin 1333 -> 1333 bytes .../drawable-mdpi/ic_qs_brightness_auto_off.png | Bin 1464 -> 1453 bytes .../res/drawable-mdpi/ic_qs_brightness_auto_on.png | Bin 1418 -> 1416 bytes packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png | Bin 983 -> 986 bytes .../drawable-mdpi/ic_qs_mirroring_notconnected.png | Bin 0 -> 1016 bytes .../SystemUI/res/drawable-mdpi/ic_qs_settings.png | Bin 1103 -> 1154 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_1.png | Bin 912 -> 912 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png | Bin 731 -> 719 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_2.png | Bin 899 -> 915 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_3.png | Bin 907 -> 901 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png | Bin 834 -> 842 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_4.png | Bin 824 -> 832 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png | Bin 783 -> 776 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_e.png | Bin 580 -> 581 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_g.png | Bin 676 -> 667 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_h.png | Bin 550 -> 555 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_in.png | Bin 548 -> 545 bytes .../res/drawable-mdpi/ic_qs_signal_inout.png | Bin 682 -> 674 bytes .../res/drawable-mdpi/ic_qs_signal_no_network.png | Bin 0 -> 751 bytes .../res/drawable-mdpi/ic_qs_signal_no_signal.png | Bin 841 -> 853 bytes .../res/drawable-mdpi/ic_qs_signal_out.png | Bin 532 -> 525 bytes .../SystemUI/res/drawable-mdpi/ic_qs_signal_r.png | Bin 627 -> 631 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png | Bin 1352 -> 1362 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png | Bin 1425 -> 1445 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png | Bin 1457 -> 1492 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png | Bin 1219 -> 1205 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_in.png | Bin 548 -> 545 bytes .../res/drawable-mdpi/ic_qs_wifi_inout.png | Bin 682 -> 674 bytes .../res/drawable-mdpi/ic_qs_wifi_no_network.png | Bin 1174 -> 1142 bytes .../SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png | Bin 532 -> 525 bytes .../res/drawable-xhdpi/ic_qs_airplane_off.png | Bin 2306 -> 2285 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_alarm_on.png | Bin 1287 -> 2969 bytes .../res/drawable-xhdpi/ic_qs_auto_rotate.png | Bin 2522 -> 2436 bytes .../drawable-xhdpi/ic_qs_battery_bang_orange.png | Bin 0 -> 925 bytes .../res/drawable-xhdpi/ic_qs_battery_bang_red.png | Bin 0 -> 735 bytes .../drawable-xhdpi/ic_qs_battery_bang_white.png | Bin 0 -> 650 bytes .../res/drawable-xhdpi/ic_qs_battery_bolt.png | Bin 0 -> 747 bytes .../res/drawable-xhdpi/ic_qs_bluetooth_off.png | Bin 2763 -> 2758 bytes .../drawable-xhdpi/ic_qs_brightness_auto_off.png | Bin 3402 -> 3382 bytes .../drawable-xhdpi/ic_qs_brightness_auto_on.png | Bin 3061 -> 3054 bytes packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png | Bin 1591 -> 1598 bytes .../ic_qs_mirroring_notconnected.png | Bin 0 -> 2057 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_settings.png | Bin 1820 -> 1825 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png | Bin 1291 -> 1296 bytes .../res/drawable-xhdpi/ic_qs_signal_1x.png | Bin 1250 -> 1269 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png | Bin 1304 -> 1306 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png | Bin 1288 -> 1296 bytes .../res/drawable-xhdpi/ic_qs_signal_3g.png | Bin 1542 -> 1550 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png | Bin 1254 -> 1265 bytes .../res/drawable-xhdpi/ic_qs_signal_4g.png | Bin 1449 -> 1446 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png | Bin 760 -> 770 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png | Bin 1118 -> 1086 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png | Bin 742 -> 754 bytes .../res/drawable-xhdpi/ic_qs_signal_in.png | Bin 720 -> 704 bytes .../res/drawable-xhdpi/ic_qs_signal_inout.png | Bin 1005 -> 983 bytes .../res/drawable-xhdpi/ic_qs_signal_no_network.png | Bin 0 -> 1187 bytes .../res/drawable-xhdpi/ic_qs_signal_no_signal.png | Bin 1431 -> 1432 bytes .../res/drawable-xhdpi/ic_qs_signal_out.png | Bin 695 -> 681 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png | Bin 978 -> 993 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png | Bin 2793 -> 2812 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png | Bin 2904 -> 2928 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png | Bin 3002 -> 3043 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png | Bin 2641 -> 2597 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_in.png | Bin 720 -> 704 bytes .../res/drawable-xhdpi/ic_qs_wifi_inout.png | Bin 1005 -> 983 bytes .../res/drawable-xhdpi/ic_qs_wifi_no_network.png | Bin 2296 -> 2267 bytes .../SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png | Bin 695 -> 681 bytes packages/SystemUI/res/values-sw600dp/styles.xml | 2 +- packages/SystemUI/res/values/strings.xml | 4 ++ packages/SystemUI/res/values/styles.xml | 1 + .../systemui/statusbar/phone/QuickSettings.java | 8 +-- .../statusbar/phone/QuickSettingsModel.java | 68 +++++++++++++++++++-- 116 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_orange.png create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_red.png create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_white.png create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bolt.png create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png create mode 100644 packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_orange.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_red.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_white.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bolt.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png create mode 100644 packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_orange.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_red.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_white.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bolt.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png create mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png (limited to 'packages') diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png index bfe0990..8a64755 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_alarm_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_alarm_on.png index 904a688..e214c00 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_alarm_on.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_alarm_on.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_auto_rotate.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_auto_rotate.png index d5f1e29..8d45fc5 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_auto_rotate.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_auto_rotate.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_orange.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_orange.png new file mode 100644 index 0000000..29a853d Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_orange.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_red.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_red.png new file mode 100644 index 0000000..988aa12 Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_red.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_white.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_white.png new file mode 100644 index 0000000..64c0d82 Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bang_white.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bolt.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bolt.png new file mode 100644 index 0000000..f7dca8b Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_bolt.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png index 2ba62f9..d5650a7 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png index 464bb6a..841b7d9 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_off.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png index dbdc524..bb58171 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_brightness_auto_on.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png index e46d8a3..e20a061 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png new file mode 100644 index 0000000..49ee056 Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring_notconnected.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png index 115bc41..cac7192 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png index 97558ff..f9ecb02 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png index f5f0f74..c7cfa21 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_1x.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png index 80472e5..2268801 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_2.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png index 59af783..16ecb6a 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png index 54be048..fb01687 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_3g.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png index 2495d07..fbbf225 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png index 7616e17..c151a64 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_4g.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png index 2bd5949..47e9ad5 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png index ce77c5e..2f622c2 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_g.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png index 7d8d284..f5f76c2 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_h.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_in.png index bf0e995..a9dc907 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_in.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_in.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_inout.png index 1782c1c..89d2939 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_inout.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_inout.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png new file mode 100644 index 0000000..3ed973b Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_network.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png index c97a167..0fb96d9 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_out.png index f999c6e..d8993f8 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_out.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_out.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png index 1431c3d..b78f474 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png index bdba14e..b720720 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_1.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png index b51b0a6..1a4c6d1 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_2.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png index e1ac946..96cd8ab 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_3.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png index fec4d2b..54bab4d 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_in.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_in.png index bf0e995..a9dc907 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_in.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_in.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_inout.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_inout.png index 1782c1c..89d2939 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_inout.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_inout.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png index ea6d235..6e4276f 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_no_network.png differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png index f999c6e..d8993f8 100644 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png index 53ef509..b8dbdb0 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_alarm_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_alarm_on.png index fa3d127..d6590e2 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_alarm_on.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_alarm_on.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_auto_rotate.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_auto_rotate.png index 10ae0f0..46beb62 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_auto_rotate.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_auto_rotate.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_orange.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_orange.png new file mode 100644 index 0000000..41fc2e9 Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_orange.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_red.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_red.png new file mode 100644 index 0000000..414be9d Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_red.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_white.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_white.png new file mode 100644 index 0000000..398a08b Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bang_white.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bolt.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bolt.png new file mode 100644 index 0000000..b01d7d0 Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_bolt.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png index 6246ebe..19e4e40 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png index 2a530f8..df5987c 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_off.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png index 9940a65..753e9f7 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_brightness_auto_on.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png index 10e325d..3263c55 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png new file mode 100644 index 0000000..a4e0420 Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring_notconnected.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png index c410310..673d2e0 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png index 3bd6001..ef5179f 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png index 9599611..53dc47d 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_1x.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png index 975ac27..359f445 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_2.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png index 3c221cf..7ebebcd 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png index d75ef889..88cf8b6 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_3g.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png index d367585..db72661 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png index 97b3dda..6022a6a 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_4g.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png index 4d49307..e493d3b 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png index 2eeff7f..cb52c98 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_g.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png index c708e00..14550d5 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_h.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_in.png index bfa3f12..4dd6401 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_in.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_in.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_inout.png index 8302636..07ebd9c 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_inout.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_inout.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png new file mode 100644 index 0000000..cf2cc52 Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_network.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png index 90aa923..dcd2dbd 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_out.png index 889be88..d8eda87 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_out.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_out.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png index 92f7fcc..d26beb5 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png index 473851b..1de33ba 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_1.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png index da2fe94..34c916d 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_2.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png index 44d98be..2f7a885 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_3.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png index 1a06411..f11cc08 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_in.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_in.png index bfa3f12..4dd6401 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_in.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_in.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_inout.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_inout.png index 8302636..07ebd9c 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_inout.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_inout.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png index d392496..72da3e8 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_no_network.png differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png index 889be88..d8eda87 100644 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png index c05d4d6..f47a193 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_alarm_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_alarm_on.png index 475dab8..07e749a 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_alarm_on.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_alarm_on.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_auto_rotate.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_auto_rotate.png index 5bceaf5..f9ab581 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_auto_rotate.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_auto_rotate.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_orange.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_orange.png new file mode 100644 index 0000000..28ec7a8 Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_orange.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_red.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_red.png new file mode 100644 index 0000000..432b496 Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_red.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_white.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_white.png new file mode 100644 index 0000000..9ed63f3 Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bang_white.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bolt.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bolt.png new file mode 100644 index 0000000..0c5594d Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_bolt.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png index 1302a26..65a873d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png index b2b563b..653fa3f 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_off.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png index b1c8753..4ed4a9e 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_brightness_auto_on.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png index f84e614..7eabd10 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png new file mode 100644 index 0000000..98d7b09 Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring_notconnected.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png index 011a0e8..2d3638c 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png index ddf4217..471e1fa 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png index e237331..cb1eb0f 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_1x.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png index e074dd3..4311330 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_2.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png index 12abe5c..637e079 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png index 8d84c6e..8fdd7ff 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_3g.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png index 0a42598..8fca5f2 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png index 08634e3..125e33d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_4g.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png index 10f1d09..acf4752 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png index 0dc8a58..fd5fb17 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_g.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png index 752c3f7..c63bbfa 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_h.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_in.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_in.png index 7a14016..a0d588d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_in.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_in.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_inout.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_inout.png index af7f76d..341716d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_inout.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_inout.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png new file mode 100644 index 0000000..7f2be8c Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_network.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png index 2af3c24..15169b9 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_out.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_out.png index a4e0243..b2ad34d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_out.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_out.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png index 16193e7..89680ce 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png index 005c6c6..eefe7ed 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_1.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png index a088e83..a2caca2 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_2.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png index 6c2deb2..08c1abd 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_3.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png index fdb7a9b..8af72e5 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_in.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_in.png index 7a14016..a0d588d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_in.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_in.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_inout.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_inout.png index af7f76d..341716d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_inout.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_inout.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png index 66c3b92..4c6f1ff 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_no_network.png differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png index a4e0243..b2ad34d 100644 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png differ diff --git a/packages/SystemUI/res/values-sw600dp/styles.xml b/packages/SystemUI/res/values-sw600dp/styles.xml index fc1cd88..b7becac 100644 --- a/packages/SystemUI/res/values-sw600dp/styles.xml +++ b/packages/SystemUI/res/values-sw600dp/styles.xml @@ -16,6 +16,6 @@ diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index e05c9a5..9ad2d5b 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -414,6 +414,8 @@ Bluetooth Bluetooth (%d Devices) + + Bluetooth Off Brightness @@ -440,6 +442,8 @@ Wifi No Network + + Wifi Off Wifi Display diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 4a37f77..f6fe8d0 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -81,6 +81,7 @@ 12dp normal #ff8d908c + true true marquee horizontal diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index 3fc15e0..37fa524 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -37,6 +37,7 @@ import android.hardware.display.WifiDisplayStatus; import android.net.Uri; import android.os.Handler; import android.os.SystemProperties; +import android.os.UserHandle; import android.provider.ContactsContract; import android.provider.Settings; import android.view.LayoutInflater; @@ -205,7 +206,7 @@ class QuickSettings { private void startSettingsActivity(Intent intent) { intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); mBar.collapseAllPanels(true); - mContext.startActivity(intent); + mContext.startActivityAsUser(intent, UserHandle.CURRENT); } private void addUserTiles(ViewGroup parent, LayoutInflater inflater) { @@ -421,7 +422,7 @@ class QuickSettings { tv.setCompoundDrawablesWithIntrinsicBounds(0, state.iconId, 0, 0); Resources r = mContext.getResources(); - String label = null; + String label = state.label; /* //TODO: Show connected bluetooth device label Set btDevices = @@ -435,9 +436,6 @@ class QuickSettings { btDevices.size()); } */ - if (label == null) { - label = r.getString(R.string.quick_settings_bluetooth_label); - } tv.setText(label); } }); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java index cc51aac..b26f326 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -53,6 +53,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, LocationGpsStateChangeCallback, BrightnessStateChangeCallback { + // Sett InputMethoManagerService + private static final String TAG_TRY_SUPPRESSING_IME_SWITCHER = "TrySuppressingImeSwitcher"; + /** Represents the state of a given attribute. */ static class State { int iconId; @@ -268,17 +271,27 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mWifiCallback = cb; mWifiCallback.refreshView(mWifiTile, mWifiState); } + // Remove the double quotes that the SSID may contain + public static String removeDoubleQuotes(String string) { + if (string == null) return null; + final int length = string.length(); + if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) { + return string.substring(1, length - 1); + } + return string; + } // NetworkSignalChanged callback @Override public void onWifiSignalChanged(boolean enabled, int wifiSignalIconId, String enabledDesc) { // TODO: If view is in awaiting state, disable Resources r = mContext.getResources(); + mWifiState.enabled = enabled; mWifiState.iconId = enabled && (wifiSignalIconId > 0) ? wifiSignalIconId : R.drawable.ic_qs_wifi_no_network; - mWifiState.label = enabled - ? enabledDesc - : r.getString(R.string.quick_settings_wifi_no_network); + mWifiState.label = enabled && (enabledDesc != null) + ? removeDoubleQuotes(enabledDesc) + : r.getString(R.string.quick_settings_wifi_off_label); mWifiCallback.refreshView(mWifiTile, mWifiState); } @@ -331,8 +344,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mBluetoothState.enabled = on; if (on) { mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_on; + mBluetoothState.label = r.getString(R.string.quick_settings_bluetooth_label); } else { mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_off; + mBluetoothState.label = r.getString(R.string.quick_settings_bluetooth_off_label); } mBluetoothCallback.refreshView(mBluetoothTile, mBluetoothState); } @@ -408,12 +423,57 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mImeCallback = cb; mImeCallback.refreshView(mImeTile, mImeState); } + /* This implementation is taken from + InputMethodManagerService.needsToShowImeSwitchOngoingNotification(). */ + private boolean needsToShowImeSwitchOngoingNotification(InputMethodManager imm) { + List imis = imm.getEnabledInputMethodList(); + final int N = imis.size(); + if (N > 2) return true; + if (N < 1) return false; + int nonAuxCount = 0; + int auxCount = 0; + InputMethodSubtype nonAuxSubtype = null; + InputMethodSubtype auxSubtype = null; + for(int i = 0; i < N; ++i) { + final InputMethodInfo imi = imis.get(i); + final List subtypes = imm.getEnabledInputMethodSubtypeList(imi, + true); + final int subtypeCount = subtypes.size(); + if (subtypeCount == 0) { + ++nonAuxCount; + } else { + for (int j = 0; j < subtypeCount; ++j) { + final InputMethodSubtype subtype = subtypes.get(j); + if (!subtype.isAuxiliary()) { + ++nonAuxCount; + nonAuxSubtype = subtype; + } else { + ++auxCount; + auxSubtype = subtype; + } + } + } + } + if (nonAuxCount > 1 || auxCount > 1) { + return true; + } else if (nonAuxCount == 1 && auxCount == 1) { + if (nonAuxSubtype != null && auxSubtype != null + && (nonAuxSubtype.getLocale().equals(auxSubtype.getLocale()) + || auxSubtype.overridesImplicitlyEnabledSubtype() + || nonAuxSubtype.overridesImplicitlyEnabledSubtype()) + && nonAuxSubtype.containsExtraValueKey(TAG_TRY_SUPPRESSING_IME_SWITCHER)) { + return false; + } + return true; + } + return false; + } void onImeWindowStatusChanged(boolean visible) { InputMethodManager imm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE); List imis = imm.getInputMethodList(); - mImeState.enabled = visible; + mImeState.enabled = (visible && needsToShowImeSwitchOngoingNotification(imm)); mImeState.label = getCurrentInputMethodName(mContext, mContext.getContentResolver(), imm, imis, mContext.getPackageManager()); mImeCallback.refreshView(mImeTile, mImeState); -- cgit v1.1