diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_enabled.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_enabled.png
deleted file mode 100644
index c47f70ac50952..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_normal.png
deleted file mode 100644
index c87e1621f110c..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png
new file mode 100644
index 0000000000000..ba286d5327fe9
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.png
new file mode 100644
index 0000000000000..3b334dea659e9
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.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
new file mode 100644
index 0000000000000..904a6880fdc30
Binary files /dev/null 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
new file mode 100644
index 0000000000000..ec1ac1580e3a6
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_auto_rotate.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png
new file mode 100644
index 0000000000000..6f6de2d537344
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_100.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_100.png
new file mode 100644
index 0000000000000..b07cff983336d
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png
new file mode 100644
index 0000000000000..62908408c3b5e
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_28.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_28.png
new file mode 100644
index 0000000000000..d046c86e67baa
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_43.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_43.png
new file mode 100644
index 0000000000000..bee102502ee8a
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_57.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_57.png
new file mode 100644
index 0000000000000..a95cec5772631
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_71.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_71.png
new file mode 100644
index 0000000000000..58fa9c73590b0
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_85.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_85.png
new file mode 100644
index 0000000000000..5ea746668cea1
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_0.png
new file mode 100644
index 0000000000000..311b659be8ee2
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_100.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_100.png
new file mode 100644
index 0000000000000..6884c16f92dce
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_100.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png
new file mode 100644
index 0000000000000..c92c5d8e8fc80
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_28.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_28.png
new file mode 100644
index 0000000000000..02ff6e62ac825
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_28.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_43.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_43.png
new file mode 100644
index 0000000000000..76245efdd22f4
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_43.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_57.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_57.png
new file mode 100644
index 0000000000000..9f358fc714feb
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_57.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_71.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_71.png
new file mode 100644
index 0000000000000..55445672df17c
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_71.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_85.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_85.png
new file mode 100644
index 0000000000000..cde5bfa6585a8
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_charge_85.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_unknown.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_unknown.png
new file mode 100644
index 0000000000000..48cd8774a76c1
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_enabled.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_enabled.png
deleted file mode 100644
index 8baece6a22fe5..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_normal.png
deleted file mode 100644
index 03f8b9cba248d..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_normal.png and /dev/null 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
new file mode 100644
index 0000000000000..2a02413033d85
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png
new file mode 100644
index 0000000000000..322a747d5c221
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.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
new file mode 100644
index 0000000000000..a5c8693d8a8df
Binary files /dev/null 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
new file mode 100644
index 0000000000000..ba0f893887b0f
Binary files /dev/null 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
new file mode 100644
index 0000000000000..97324c6a80a94
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_ime.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_location.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_location.png
new file mode 100644
index 0000000000000..9699e81f27e46
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_location.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png
new file mode 100644
index 0000000000000..7a4fb1109dba9
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_mirroring.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_rotation_locked.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_rotation_locked.png
new file mode 100644
index 0000000000000..e7797b942bc06
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_rotation_locked.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_enabled.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_enabled.png
deleted file mode 100644
index 834845514dba5..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_normal.png
deleted file mode 100644
index 0dfcfd2cd09cd..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_rssi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png
new file mode 100644
index 0000000000000..6e56c8cf8fa16
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_settings.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.png
new file mode 100644
index 0000000000000..ce55266cd50b5
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_0.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
new file mode 100644
index 0000000000000..6209b9d55b4be
Binary files /dev/null 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
new file mode 100644
index 0000000000000..8a50dc0eb3f8e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..d9e0a46e48497
Binary files /dev/null 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
new file mode 100644
index 0000000000000..40346815308fc
Binary files /dev/null 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
new file mode 100644
index 0000000000000..2356cfa333bce
Binary files /dev/null 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
new file mode 100644
index 0000000000000..2f17ccf86404b
Binary files /dev/null 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
new file mode 100644
index 0000000000000..4e60d05c0a899
Binary files /dev/null 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
new file mode 100644
index 0000000000000..6a71c366a8c7b
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png
new file mode 100644
index 0000000000000..97d84a9974347
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_0.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png
new file mode 100644
index 0000000000000..8875fb28b7e9e
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png
new file mode 100644
index 0000000000000..4b987a00ebd36
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_1x.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png
new file mode 100644
index 0000000000000..9d0bb26fa14d6
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_2.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png
new file mode 100644
index 0000000000000..65a99493f34cb
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png
new file mode 100644
index 0000000000000..34fe280380fe1
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_3g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png
new file mode 100644
index 0000000000000..928fd16196031
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png
new file mode 100644
index 0000000000000..777f8fc913b40
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_4g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png
new file mode 100644
index 0000000000000..0717cc6100a18
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_e.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png
new file mode 100644
index 0000000000000..dd44443d5091d
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_g.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.png
new file mode 100644
index 0000000000000..2d46d935e036b
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_h.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
new file mode 100644
index 0000000000000..03137e29addfa
Binary files /dev/null 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
new file mode 100644
index 0000000000000..5c8793ebda031
Binary files /dev/null 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
new file mode 100644
index 0000000000000..a601b2a2e4941
Binary files /dev/null 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
new file mode 100644
index 0000000000000..ce511b3075ba0
Binary files /dev/null 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_signal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_no_signal.png
new file mode 100644
index 0000000000000..3d1bd3c8a7a20
Binary files /dev/null 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
new file mode 100644
index 0000000000000..70f364a586a0e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..e459f64f13edd
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_usb_device.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_usb_device.png
new file mode 100644
index 0000000000000..971b9e0423813
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_usb_device.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
new file mode 100644
index 0000000000000..377a009b84a79
Binary files /dev/null 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
new file mode 100644
index 0000000000000..d62b0bdfbf76d
Binary files /dev/null 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
new file mode 100644
index 0000000000000..b40f6d9dad514
Binary files /dev/null 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
new file mode 100644
index 0000000000000..6d1e410801d0a
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_4.png differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_enabled.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_enabled.png
deleted file mode 100644
index 0276e42c86ecf..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_enabled.png and /dev/null 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
new file mode 100644
index 0000000000000..049086ab6b323
Binary files /dev/null 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
new file mode 100644
index 0000000000000..aec214d433b01
Binary files /dev/null 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
new file mode 100644
index 0000000000000..73ac90c67be50
Binary files /dev/null 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_normal.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_normal.png
deleted file mode 100644
index 112279a63298a..0000000000000
Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.png
new file mode 100644
index 0000000000000..60959425fd49b
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_not_connected.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
new file mode 100644
index 0000000000000..b3956ee7ecb09
Binary files /dev/null and b/packages/SystemUI/res/drawable-hdpi/ic_qs_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_enabled.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_enabled.png
deleted file mode 100644
index 06ed0a8a8b9aa..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_normal.png
deleted file mode 100644
index 1c83e5bfd4fca..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_normal.png and /dev/null 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
new file mode 100644
index 0000000000000..1a111dff3ee16
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.png
new file mode 100644
index 0000000000000..956699c2b2efd
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.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
new file mode 100644
index 0000000000000..fa3d127aec0de
Binary files /dev/null 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
new file mode 100644
index 0000000000000..3a202d0a410c9
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_auto_rotate.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png
new file mode 100644
index 0000000000000..a33d4239255bc
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_100.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_100.png
new file mode 100644
index 0000000000000..8203b3fa97f73
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png
new file mode 100644
index 0000000000000..0e237c08673f7
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_28.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_28.png
new file mode 100644
index 0000000000000..4bbd29ea4ef95
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_43.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_43.png
new file mode 100644
index 0000000000000..ac0e62c44af23
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_57.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_57.png
new file mode 100644
index 0000000000000..2863a5886d6d2
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_71.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_71.png
new file mode 100644
index 0000000000000..4029d834d7bf5
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_85.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_85.png
new file mode 100644
index 0000000000000..d0ea00a65d8f3
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_0.png
new file mode 100644
index 0000000000000..0ffa2324fbaf8
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_100.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_100.png
new file mode 100644
index 0000000000000..aa6458d7d3c00
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_100.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png
new file mode 100644
index 0000000000000..884186869f0c0
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_28.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_28.png
new file mode 100644
index 0000000000000..777bc7a326f16
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_28.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_43.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_43.png
new file mode 100644
index 0000000000000..72710890e37b4
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_43.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_57.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_57.png
new file mode 100644
index 0000000000000..d2be21bd07349
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_57.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_71.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_71.png
new file mode 100644
index 0000000000000..1708d32657bd9
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_71.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_85.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_85.png
new file mode 100644
index 0000000000000..103d3b8972e1d
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_charge_85.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_unknown.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_unknown.png
new file mode 100644
index 0000000000000..8246a606d58f5
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_enabled.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_enabled.png
deleted file mode 100644
index 9cff1830c5bc4..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_normal.png
deleted file mode 100644
index 1e6c5648b8b1e..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_normal.png and /dev/null 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
new file mode 100644
index 0000000000000..b2880945b3354
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png
new file mode 100644
index 0000000000000..48fed00bf75c9
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.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
new file mode 100644
index 0000000000000..76b65cfc48b9e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..ab274eed9cabc
Binary files /dev/null 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
new file mode 100644
index 0000000000000..6667050f0bd48
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_ime.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_location.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_location.png
new file mode 100644
index 0000000000000..fce92babbb9d1
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_location.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png
new file mode 100644
index 0000000000000..28253ea88190b
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_mirroring.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_rotation_locked.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_rotation_locked.png
new file mode 100644
index 0000000000000..1ef88fc92f3eb
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_rotation_locked.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_enabled.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_enabled.png
deleted file mode 100644
index afe6e98027822..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_normal.png
deleted file mode 100644
index 3bec2667880f6..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_rssi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png
new file mode 100644
index 0000000000000..2b2abdd4800f4
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_settings.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.png
new file mode 100644
index 0000000000000..20c13d0fa90d6
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_0.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
new file mode 100644
index 0000000000000..278681d32a0d2
Binary files /dev/null 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
new file mode 100644
index 0000000000000..6ef198dbacbe4
Binary files /dev/null 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
new file mode 100644
index 0000000000000..79691fcb5ded9
Binary files /dev/null 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
new file mode 100644
index 0000000000000..d3c09b7572592
Binary files /dev/null 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
new file mode 100644
index 0000000000000..dd8d13a99e62b
Binary files /dev/null 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
new file mode 100644
index 0000000000000..004299ffd0822
Binary files /dev/null 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
new file mode 100644
index 0000000000000..80f72b4a525cc
Binary files /dev/null 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
new file mode 100644
index 0000000000000..b5bc3d98cdd3a
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png
new file mode 100644
index 0000000000000..6668846f4d004
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_0.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png
new file mode 100644
index 0000000000000..192d234ca77f5
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png
new file mode 100644
index 0000000000000..cc8ac7409ca13
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_1x.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png
new file mode 100644
index 0000000000000..8d916b4df701f
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_2.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png
new file mode 100644
index 0000000000000..293db7278f802
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png
new file mode 100644
index 0000000000000..9bd6e55b08bb4
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_3g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png
new file mode 100644
index 0000000000000..c9dc1d8f6cb85
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png
new file mode 100644
index 0000000000000..82bcb79fc6f8d
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_4g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png
new file mode 100644
index 0000000000000..641b002bc057f
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_e.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png
new file mode 100644
index 0000000000000..3230eb9671075
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_g.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.png
new file mode 100644
index 0000000000000..67b0c379fdaf4
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_full_h.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
new file mode 100644
index 0000000000000..80096e775f333
Binary files /dev/null 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
new file mode 100644
index 0000000000000..ba99cece2c907
Binary files /dev/null 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
new file mode 100644
index 0000000000000..9f8c1073deb77
Binary files /dev/null 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
new file mode 100644
index 0000000000000..cb44955d24b7b
Binary files /dev/null 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_signal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_no_signal.png
new file mode 100644
index 0000000000000..e03e230853331
Binary files /dev/null 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
new file mode 100644
index 0000000000000..78fbd30c77307
Binary files /dev/null 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
new file mode 100644
index 0000000000000..3b1e09376c318
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_usb_device.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_usb_device.png
new file mode 100644
index 0000000000000..94069bdfdb359
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_usb_device.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
new file mode 100644
index 0000000000000..6b4e5c278d460
Binary files /dev/null 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
new file mode 100644
index 0000000000000..3847828431790
Binary files /dev/null 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
new file mode 100644
index 0000000000000..bf439692a4b6d
Binary files /dev/null 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
new file mode 100644
index 0000000000000..53838ee6fe034
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_4.png differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_enabled.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_enabled.png
deleted file mode 100644
index 6c94754488e10..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_enabled.png and /dev/null 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
new file mode 100644
index 0000000000000..490a17203ae31
Binary files /dev/null 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
new file mode 100644
index 0000000000000..6f276268738fb
Binary files /dev/null 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
new file mode 100644
index 0000000000000..f5f5f40a511b8
Binary files /dev/null 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_normal.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_normal.png
deleted file mode 100644
index d6b47fc7e6b20..0000000000000
Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.png
new file mode 100644
index 0000000000000..f606a60b2cebe
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_not_connected.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
new file mode 100644
index 0000000000000..a9d0e2e026773
Binary files /dev/null and b/packages/SystemUI/res/drawable-mdpi/ic_qs_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_enabled.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_enabled.png
deleted file mode 100644
index 7ee9290f7536d..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_normal.png
deleted file mode 100644
index 41d74986f53cf..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_normal.png and /dev/null 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
new file mode 100644
index 0000000000000..8f3809be8a82c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.png
new file mode 100644
index 0000000000000..dc2530d6ce8ca
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.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
new file mode 100644
index 0000000000000..475dab8ba5775
Binary files /dev/null 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
new file mode 100644
index 0000000000000..e0cc192dddc55
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_auto_rotate.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png
new file mode 100644
index 0000000000000..b62fb34063ef4
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_100.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_100.png
new file mode 100644
index 0000000000000..f5d8e7db79d26
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_100.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png
new file mode 100644
index 0000000000000..c57e62d47ebff
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_28.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_28.png
new file mode 100644
index 0000000000000..f4bfe1a19e271
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_28.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_43.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_43.png
new file mode 100644
index 0000000000000..07d2c83006503
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_43.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_57.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_57.png
new file mode 100644
index 0000000000000..06aaf11930424
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_57.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_71.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_71.png
new file mode 100644
index 0000000000000..2f56daae4833e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_71.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_85.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_85.png
new file mode 100644
index 0000000000000..ac0d7bc567b0e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_85.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_0.png
new file mode 100644
index 0000000000000..1f5b55a7d02c7
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_100.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_100.png
new file mode 100644
index 0000000000000..18cd25c44678a
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_100.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png
new file mode 100644
index 0000000000000..ecd47342c8cf5
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_15.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_28.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_28.png
new file mode 100644
index 0000000000000..dc54996cc7a58
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_28.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_43.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_43.png
new file mode 100644
index 0000000000000..758a874a8747a
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_43.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_57.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_57.png
new file mode 100644
index 0000000000000..c4ab7d52a8125
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_57.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_71.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_71.png
new file mode 100644
index 0000000000000..a63e7e342ff9c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_71.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_85.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_85.png
new file mode 100644
index 0000000000000..b0f7aa6befdbc
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_charge_85.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_unknown.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_unknown.png
new file mode 100644
index 0000000000000..71fe29ffb74e3
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_battery_unknown.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_enabled.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_enabled.png
deleted file mode 100644
index 8811e62845bec..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_normal.png
deleted file mode 100644
index 0026596499636..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_normal.png and /dev/null 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
new file mode 100644
index 0000000000000..9bd89fd48203e
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png
new file mode 100644
index 0000000000000..a1c0911f7d54b
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.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
new file mode 100644
index 0000000000000..1d9a0272da46e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..fabb79c0bae0e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..98683f943489c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_ime.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_location.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_location.png
new file mode 100644
index 0000000000000..a5351b2f11c00
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_location.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png
new file mode 100644
index 0000000000000..7d2d65038446c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_mirroring.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_rotation_locked.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_rotation_locked.png
new file mode 100644
index 0000000000000..b641f40f34d80
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_rotation_locked.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_enabled.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_enabled.png
deleted file mode 100644
index 4a2789d3208f0..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_enabled.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_normal.png
deleted file mode 100644
index ee4b21fd6316f..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_rssi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png
new file mode 100644
index 0000000000000..349370d17a321
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_settings.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.png
new file mode 100644
index 0000000000000..22aea9dfaad49
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_0.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
new file mode 100644
index 0000000000000..88df979316e1a
Binary files /dev/null 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
new file mode 100644
index 0000000000000..cbac90f5cc277
Binary files /dev/null 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
new file mode 100644
index 0000000000000..a085bf4c3ebc6
Binary files /dev/null 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
new file mode 100644
index 0000000000000..f104e1afe5e85
Binary files /dev/null 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
new file mode 100644
index 0000000000000..3f0a8dfa8713a
Binary files /dev/null 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
new file mode 100644
index 0000000000000..da0a2815ac91c
Binary files /dev/null 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
new file mode 100644
index 0000000000000..a6e8c214a47ed
Binary files /dev/null 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
new file mode 100644
index 0000000000000..f6eeb1debde0b
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png
new file mode 100644
index 0000000000000..25a5c53395dc2
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_0.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png
new file mode 100644
index 0000000000000..32ff8ffa97647
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png
new file mode 100644
index 0000000000000..1fca5361beba8
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_1x.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png
new file mode 100644
index 0000000000000..e5fe0b26e1517
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_2.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png
new file mode 100644
index 0000000000000..bf53c7ce9997c
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png
new file mode 100644
index 0000000000000..2e97c3a28fbb0
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_3g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png
new file mode 100644
index 0000000000000..4684eaa646d83
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png
new file mode 100644
index 0000000000000..0083754ac5c04
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_4g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png
new file mode 100644
index 0000000000000..0bff121681e60
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_e.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png
new file mode 100644
index 0000000000000..9836082f6c050
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_g.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.png
new file mode 100644
index 0000000000000..1877a280d9d6d
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_full_h.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
new file mode 100644
index 0000000000000..d888704634d56
Binary files /dev/null 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
new file mode 100644
index 0000000000000..029f109d6f16d
Binary files /dev/null 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
new file mode 100644
index 0000000000000..baa6d86be7880
Binary files /dev/null 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
new file mode 100644
index 0000000000000..633bfc835e431
Binary files /dev/null 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_signal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_no_signal.png
new file mode 100644
index 0000000000000..6c46e323b6109
Binary files /dev/null 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
new file mode 100644
index 0000000000000..dea04152abbd1
Binary files /dev/null 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
new file mode 100644
index 0000000000000..53d091599f26a
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_signal_r.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_usb_device.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_usb_device.png
new file mode 100644
index 0000000000000..d1ee39b15917d
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_usb_device.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
new file mode 100644
index 0000000000000..ad0ba681fc13c
Binary files /dev/null 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
new file mode 100644
index 0000000000000..54236b439f94d
Binary files /dev/null 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
new file mode 100644
index 0000000000000..7d2218b7658b1
Binary files /dev/null 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
new file mode 100644
index 0000000000000..152c42844080f
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_4.png differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_enabled.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_enabled.png
deleted file mode 100644
index 114ee2943beed..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_enabled.png and /dev/null 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
new file mode 100644
index 0000000000000..2836e4cd86e7e
Binary files /dev/null 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
new file mode 100644
index 0000000000000..01bbe33d35da8
Binary files /dev/null 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
new file mode 100644
index 0000000000000..b36c4c36f6a23
Binary files /dev/null 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_normal.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_normal.png
deleted file mode 100644
index 0719b21da6f85..0000000000000
Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_normal.png and /dev/null differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.png
new file mode 100644
index 0000000000000..a6dd06a3b9594
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_not_connected.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
new file mode 100644
index 0000000000000..07f2012bf0daa
Binary files /dev/null and b/packages/SystemUI/res/drawable-xhdpi/ic_qs_wifi_out.png differ
diff --git a/packages/SystemUI/res/drawable/qs_sys_battery.xml b/packages/SystemUI/res/drawable/qs_sys_battery.xml
new file mode 100644
index 0000000000000..dd36aa53ee06d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_sys_battery.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/SystemUI/res/drawable/qs_sys_battery_charging.xml b/packages/SystemUI/res/drawable/qs_sys_battery_charging.xml
new file mode 100644
index 0000000000000..cee50811ac70b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/qs_sys_battery_charging.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_airplane.xml b/packages/SystemUI/res/layout/quick_settings_tile_airplane.xml
index 3e3a9c2ae1a1a..6ae10d5db8926 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_airplane.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_airplane.xml
@@ -15,11 +15,11 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_battery.xml b/packages/SystemUI/res/layout/quick_settings_tile_battery.xml
index 680a1bb761f0d..446b24cb77266 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_battery.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_battery.xml
@@ -13,14 +13,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
\ No newline at end of file
+ android:orientation="vertical">
+
+
+
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_bluetooth.xml b/packages/SystemUI/res/layout/quick_settings_tile_bluetooth.xml
index 4472484178d97..565055c594e1f 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_bluetooth.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_bluetooth.xml
@@ -15,11 +15,11 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_brightness.xml b/packages/SystemUI/res/layout/quick_settings_tile_brightness.xml
index 216930d15f3d3..7cae1993606ea 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_brightness.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_brightness.xml
@@ -15,11 +15,11 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_ime.xml b/packages/SystemUI/res/layout/quick_settings_tile_ime.xml
index 528b54f5d43bd..e92acd5676f2d 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_ime.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_ime.xml
@@ -15,12 +15,12 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_location.xml b/packages/SystemUI/res/layout/quick_settings_tile_location.xml
index 1a40642f93665..0accb381c451b 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_location.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_location.xml
@@ -15,12 +15,12 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_media.xml b/packages/SystemUI/res/layout/quick_settings_tile_media.xml
index 0810d02cf6f45..7217de3ca308d 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_media.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_media.xml
@@ -15,8 +15,9 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_settings.xml b/packages/SystemUI/res/layout/quick_settings_tile_settings.xml
index 1c2f827499044..7026ebc6e90a5 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_settings.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_settings.xml
@@ -15,11 +15,11 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_time.xml b/packages/SystemUI/res/layout/quick_settings_tile_time.xml
index 3d7b09556a873..f09e0cb7680bd 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_time.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_time.xml
@@ -15,7 +15,7 @@
-->
@@ -24,6 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
+ android:paddingTop="3dp"
+ android:paddingBottom="3dp"
android:singleLine="true"
/>
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_user.xml b/packages/SystemUI/res/layout/quick_settings_tile_user.xml
index 8edc978a39886..33d9a0981c086 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_user.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_user.xml
@@ -13,14 +13,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
\ No newline at end of file
+ android:layout_height="match_parent">
+
+
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_wifi.xml b/packages/SystemUI/res/layout/quick_settings_tile_wifi.xml
index 42eb45a051339..67d6c23bc9f83 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_wifi.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_wifi.xml
@@ -15,11 +15,11 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml b/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml
index 929dd94ea8ece..454d54a2ad0cc 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_wifi_display.xml
@@ -15,12 +15,12 @@
-->
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 25bc656db4ba4..fd1c472f34d44 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -403,8 +403,10 @@
Airplane mode
-
- Battery
+
+ Charging, %d%%
+
+ Charged
Bluetooth
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index fa62cb626b6e1..78b60d9dfb13b 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -74,8 +74,11 @@
@@ -93,7 +96,7 @@
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 c34e012e9847f..38fd7909a8f82 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
@@ -28,7 +28,8 @@ import android.content.IntentFilter;
import android.content.Loader;
import android.content.res.Resources;
import android.database.Cursor;
-import android.graphics.drawable.ClipDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LevelListDrawable;
import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay;
import android.hardware.display.WifiDisplayStatus;
@@ -43,11 +44,13 @@ import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
+import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import com.android.systemui.R;
import com.android.systemui.statusbar.phone.QuickSettingsModel.State;
+import com.android.systemui.statusbar.phone.QuickSettingsModel.UserState;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.statusbar.policy.BluetoothController;
import com.android.systemui.statusbar.policy.BrightnessController;
@@ -78,6 +81,9 @@ class QuickSettings {
private CursorLoader mUserInfoLoader;
+ private LevelListDrawable mBatteryLevels;
+ private LevelListDrawable mChargingBatteryLevels;
+
// The set of QuickSettingsTiles that have dynamic spans (and need to be updated on
// configuration change)
private final ArrayList mDynamicSpannedTiles =
@@ -91,6 +97,11 @@ class QuickSettings {
mWifiDisplayStatus = new WifiDisplayStatus();
mWifiDisplayListAdapter = new WifiDisplayListAdapter(context);
+ Resources r = mContext.getResources();
+ mBatteryLevels = (LevelListDrawable) r.getDrawable(R.drawable.qs_sys_battery);
+ mChargingBatteryLevels =
+ (LevelListDrawable) r.getDrawable(R.drawable.qs_sys_battery_charging);
+
IntentFilter filter = new IntentFilter();
filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED);
mContext.registerReceiver(mReceiver, filter);
@@ -143,7 +154,7 @@ class QuickSettings {
Cursor cursor) {
if (cursor != null && cursor.moveToFirst()) {
String name = cursor.getString(0); // DISPLAY_NAME
- mModel.setUserTileInfo(name);
+ mModel.setUserTileInfo(name, null);
/*
byte[] photoData = cursor.getBlob(0);
Bitmap b =
@@ -184,8 +195,12 @@ class QuickSettings {
mModel.addUserTile(userTile, new QuickSettingsModel.RefreshCallback() {
@Override
public void refreshView(QuickSettingsTileView view, State state) {
+ UserState us = (UserState) state;
TextView tv = (TextView) view.findViewById(R.id.user_textview);
tv.setText(state.label);
+ if (us.avatar != null) {
+ tv.setCompoundDrawables(null, us.avatar, null, null);
+ }
}
});
parent.addView(userTile);
@@ -294,10 +309,23 @@ class QuickSettings {
QuickSettingsModel.BatteryState batteryState =
(QuickSettingsModel.BatteryState) state;
TextView tv = (TextView) view.findViewById(R.id.battery_textview);
- ClipDrawable drawable = (ClipDrawable) tv.getCompoundDrawables()[1];
- drawable.setLevel((int) (10000 * (batteryState.batteryLevel / 100.0f)));
- // TODO: use format string
- tv.setText(batteryState.batteryLevel + "%");
+ ImageView iv = (ImageView) view.findViewById(R.id.battery_image);
+ Drawable d = batteryState.pluggedIn
+ ? mChargingBatteryLevels
+ : mBatteryLevels;
+ String t;
+ if (batteryState.batteryLevel == 100) {
+ t = mContext.getString(R.string.quick_settings_battery_charged_label);
+ } else {
+ t = batteryState.pluggedIn
+ ? mContext.getString(R.string.quick_settings_battery_charging_label,
+ batteryState.batteryLevel)
+ : mContext.getString(R.string.status_bar_settings_battery_meter_format,
+ batteryState.batteryLevel);
+ }
+ iv.setImageDrawable(d);
+ iv.setImageLevel(batteryState.batteryLevel);
+ tv.setText(t);
}
});
parent.addView(batteryTile);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
index 105ceb15e5c48..27cfab1eacf57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java
@@ -78,10 +78,8 @@ class QuickSettingsContainerView extends FrameLayout {
lp.width = (int) ((colSpan * cellWidth) + (colSpan - 1) * mCellGap);
// Measure the child
- v.setMinimumWidth(lp.width);
- v.setMinimumHeight(lp.height);
- int newWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.AT_MOST);
- int newHeightSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.AT_MOST);
+ int newWidthSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
+ int newHeightSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
v.measure(newWidthSpec, newHeightSpec);
// Save the cell height
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 a0a5282334208..503e84f8517a6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -26,6 +26,7 @@ import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.database.ContentObserver;
+import android.graphics.drawable.Drawable;
import android.hardware.display.WifiDisplayStatus;
import android.os.Handler;
import android.provider.Settings;
@@ -58,6 +59,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
int batteryLevel;
boolean pluggedIn;
}
+ static class UserState extends State {
+ Drawable avatar;
+ }
/** The callback to update a given tile. */
interface RefreshCallback {
@@ -99,7 +103,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
private QuickSettingsTileView mUserTile;
private RefreshCallback mUserCallback;
- private State mUserState = new State();
+ private UserState mUserState = new UserState();
private QuickSettingsTileView mTimeTile;
private RefreshCallback mTimeAlarmCallback;
@@ -154,8 +158,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
mUserCallback = cb;
mUserCallback.refreshView(mUserTile, mUserState);
}
- void setUserTileInfo(String name) {
+ void setUserTileInfo(String name, Drawable avatar) {
mUserState.label = name;
+ mUserState.avatar = avatar;
mUserCallback.refreshView(mUserTile, mUserState);
}
@@ -167,13 +172,11 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
}
void onAlarmChanged(Intent intent) {
mTimeAlarmState.enabled = intent.getBooleanExtra("alarmSet", false);
- System.out.println("ALARM ENABLED: " + mTimeAlarmState.enabled);
mTimeAlarmCallback.refreshView(mTimeTile, mTimeAlarmState);
}
void onNextAlarmChanged() {
mTimeAlarmState.label = Settings.System.getString(mContext.getContentResolver(),
Settings.System.NEXT_ALARM_FORMATTED);
- System.out.println("ALARM LABEL: " + mTimeAlarmState.label);
mTimeAlarmCallback.refreshView(mTimeTile, mTimeAlarmState);
}
@@ -212,8 +215,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
Resources r = mContext.getResources();
mAirplaneModeState.enabled = enabled;
mAirplaneModeState.iconId = (enabled ?
- R.drawable.ic_qs_airplane_enabled :
- R.drawable.ic_qs_airplane_normal);
+ R.drawable.ic_qs_airplane_on :
+ R.drawable.ic_qs_airplane_off);
mAirplaneModeCallback.refreshView(mAirplaneModeTile, mAirplaneModeState);
}
@@ -231,8 +234,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
// TODO: Check if wifi is enabled
mWifiState.enabled = enabled;
mWifiState.iconId = (enabled ?
- R.drawable.ic_qs_wifi_enabled :
- R.drawable.ic_qs_wifi_normal);
+ R.drawable.ic_qs_wifi_4 :
+ R.drawable.ic_qs_wifi_not_connected);
mWifiState.label = (enabled ?
description :
r.getString(R.string.quick_settings_wifi_no_network));
@@ -258,8 +261,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
// TODO: Check if RSSI is enabled
mRSSIState.enabled = enabled;
mRSSIState.iconId = (enabled ?
- R.drawable.ic_qs_rssi_enabled :
- R.drawable.ic_qs_rssi_normal);
+ R.drawable.ic_qs_signal_4 :
+ R.drawable.ic_qs_signal_0);
mRSSIState.label = (enabled ?
description :
r.getString(R.string.quick_settings_rssi_emergency_only));
@@ -285,9 +288,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
Resources r = mContext.getResources();
mBluetoothState.enabled = on;
if (on) {
- mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_enabled;
+ mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_on;
} else {
- mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_normal;
+ mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_off;
}
mBluetoothCallback.refreshView(mBluetoothTile, mBluetoothState);
}