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 bfe0990ee47e9..8a6475548e696 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 904a6880fdc30..e214c002854a5 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 d5f1e29460799..8d45fc5119e0a 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 0000000000000..29a853d766620 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 0000000000000..988aa129f5ddc 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 0000000000000..64c0d827d0f40 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 0000000000000..f7dca8b892150 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 2ba62f93a2a1b..d5650a76bfe95 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 464bb6a0c8e15..841b7d91e5477 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 dbdc524679ef8..bb58171e14541 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 e46d8a32c8941..e20a061d841f9 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 0000000000000..49ee05653f608 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 115bc414f8755..cac7192aa98a7 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 97558ffbc398b..f9ecb0230233a 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 f5f0f7472b819..c7cfa211f3cbe 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 80472e5b19c24..2268801c94618 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 59af783bfc078..16ecb6a36eabc 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 54be048e0a16d..fb0168717f351 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 2495d07c177c2..fbbf2251643e7 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 7616e17b45522..c151a642f592c 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 2bd594953e468..47e9ad5e9b47f 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 ce77c5e9f447e..2f622c24112cd 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 7d8d284e3a65e..f5f76c2c8c4f8 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 bf0e9955385be..a9dc9072cb6c2 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 1782c1c864215..89d2939d35ed0 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 0000000000000..3ed973b948983 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 c97a167d2f8d6..0fb96d99ba241 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 f999c6eb60e06..d8993f8c27bb3 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 1431c3dabc5f9..b78f47420288a 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 bdba14e1f7e31..b7207207f26e0 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 b51b0a62531ba..1a4c6d1ce6be6 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 e1ac946eac51c..96cd8ab826e05 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 fec4d2bb03896..54bab4dd15ab4 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 bf0e9955385be..a9dc9072cb6c2 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 1782c1c864215..89d2939d35ed0 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 ea6d2351dd655..6e4276fc35146 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 f999c6eb60e06..d8993f8c27bb3 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 53ef50925e240..b8dbdb093a78b 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 fa3d127aec0de..d6590e206f9b5 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 10ae0f054f6e7..46beb62af81e6 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 0000000000000..41fc2e9504488 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 0000000000000..414be9de886a2 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 0000000000000..398a08bf07102 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 0000000000000..b01d7d0d2db76 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 6246ebece6f16..19e4e409e1be1 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 2a530f80cde7f..df5987c91052e 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 9940a6535a868..753e9f7a101cd 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 10e325df46492..3263c55d6a18c 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 0000000000000..a4e042077c243 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 c41031020a808..673d2e00870e4 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 3bd6001dc6600..ef5179fad1869 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 95996118ee3e8..53dc47db2641d 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 975ac27027e97..359f445b2766b 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 3c221cf36a2c5..7ebebcdb34d08 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 d75ef8891b534..88cf8b6ca0ccf 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 d367585e1df16..db726614b7e12 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 97b3ddab7039f..6022a6a7eba7d 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 4d4930732ac57..e493d3bf32376 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 2eeff7fc7e832..cb52c983f82a7 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 c708e00a78c0c..14550d57780c1 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 bfa3f121e65d7..4dd640137c4aa 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 8302636cf5a02..07ebd9c33e609 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 0000000000000..cf2cc527d5735 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 90aa923f2e853..dcd2dbd898b7a 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 889be88aea1b4..d8eda8709e94b 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 92f7fcc4f6162..d26beb5ec49a7 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 473851bb9ddaf..1de33ba05bd43 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 da2fe943f8615..34c916d476001 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 44d98be0a7b4a..2f7a885fd3d93 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 1a064118af16d..f11cc088aa436 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 bfa3f121e65d7..4dd640137c4aa 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 8302636cf5a02..07ebd9c33e609 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 d392496cf7bf8..72da3e8a44e8e 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 889be88aea1b4..d8eda8709e94b 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 c05d4d6a47db3..f47a193999d6c 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 475dab8ba5775..07e749a91760b 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 5bceaf5192807..f9ab581ce59c1 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 0000000000000..28ec7a86a093f 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 0000000000000..432b496836e45 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 0000000000000..9ed63f380ea34 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 0000000000000..0c5594dded3be 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 1302a26e50107..65a873dd5b3d8 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 b2b563b9a0e9d..653fa3f84545f 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 b1c8753337410..4ed4a9ec1219a 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 f84e614bc8dc9..7eabd103f13cb 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 0000000000000..98d7b091ec89c 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 011a0e8ef9558..2d3638c098d11 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 ddf421767de27..471e1fa36bb08 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 e2373314169c6..cb1eb0f28eb6e 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 e074dd3892e0e..43113306b6754 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 12abe5ca1fcbb..637e079f7afae 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 8d84c6ea20a01..8fdd7fff0430f 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 0a425989f97f4..8fca5f2611ee1 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 08634e35e4307..125e33dc79b2e 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 10f1d092cd038..acf4752edd944 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 0dc8a5826f157..fd5fb1773f5be 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 752c3f746916a..c63bbfa5719ed 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 7a1401615bd15..a0d588dc9dd14 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 af7f76d641210..341716d8f6c5a 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 0000000000000..7f2be8c69f75f 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 2af3c245655b7..15169b916bfa4 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 a4e0243b694f3..b2ad34d78d8c9 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 16193e76766ae..89680ce875366 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 005c6c62d4613..eefe7ed4954b6 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 a088e83beda18..a2caca28fe3b9 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 6c2deb2106c13..08c1abd444824 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 fdb7a9bde7a4a..8af72e51563de 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 7a1401615bd15..a0d588dc9dd14 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 af7f76d641210..341716d8f6c5a 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 66c3b92cf49e9..4c6f1ff1a3152 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 a4e0243b694f3..b2ad34d78d8c9 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 fc1cd88aa1cbd..b7becac570108 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 e05c9a5abe6f7..9ad2d5b4ac24e 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 4a37f7773020a..f6fe8d0e05714 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 3fc15e0e3661d..37fa524bd9fca 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 cc51aac21671f..b26f326fa8dc7 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);