diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png deleted file mode 100644 index 6f48fe89889d6..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png and /dev/null 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 deleted file mode 100644 index 5f2e95a33accd..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png deleted file mode 100644 index e417a19539f2d..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.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 deleted file mode 100644 index f32522016b6cb..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png and /dev/null 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 deleted file mode 100644 index ee88a1ba5ea45..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png deleted file mode 100644 index 48606a8d0513d..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_0.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png deleted file mode 100644 index d006f13e4b463..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_1.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png deleted file mode 100644 index 867947b22d6d6..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_cast_connecting_2.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_color_space_alpha.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_color_space_alpha.png deleted file mode 100644 index fe6dc5296dbdd..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_color_space_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_inversion_alpha.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_inversion_alpha.png deleted file mode 100644 index aea75c105bd16..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/ic_qs_inversion_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_full.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_full.png deleted file mode 100644 index fa23e857d970a..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_full.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_limited.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_limited.png deleted file mode 100644 index aa8635c294128..0000000000000 Binary files a/packages/SystemUI/res/drawable-hdpi/stat_sys_zen_limited.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png deleted file mode 100644 index c36809b59cd8b..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png deleted file mode 100644 index 6158c017d6822..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png deleted file mode 100644 index 084799ada9f86..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png deleted file mode 100644 index c37ba79e8bcba..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png deleted file mode 100644 index 714f07ef74bdb..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png deleted file mode 100644 index d59f0e92a5a75..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png deleted file mode 100644 index 6fc556dd4b9eb..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_on.png deleted file mode 100644 index a2342fc805182..0000000000000 Binary files a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_on.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 deleted file mode 100644 index 95df4d455986d..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png and /dev/null 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 deleted file mode 100644 index 251fc30bae4af..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.png deleted file mode 100644 index b01b27fd17aeb..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.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 deleted file mode 100644 index 541e80176c7cb..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png and /dev/null 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 deleted file mode 100644 index 0acf3a45191c1..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png deleted file mode 100644 index 25fc7593beb17..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_0.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png deleted file mode 100644 index 9dfc3c6537fad..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_1.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png deleted file mode 100644 index 82f4113b39b17..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_cast_connecting_2.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_color_space_alpha.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_color_space_alpha.png deleted file mode 100644 index 18b6029649c8f..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_color_space_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_inversion_alpha.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_inversion_alpha.png deleted file mode 100644 index b6ea14e6dbdb8..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/ic_qs_inversion_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_full.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_full.png deleted file mode 100644 index b0185a54d1da0..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_full.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_limited.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_limited.png deleted file mode 100644 index 949ab10ca2e04..0000000000000 Binary files a/packages/SystemUI/res/drawable-mdpi/stat_sys_zen_limited.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 deleted file mode 100644 index 4411097d378a5..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png and /dev/null 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 deleted file mode 100644 index 79e4ff6eabda5..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.png deleted file mode 100644 index ce965c2ad08b8..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.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 deleted file mode 100644 index c798fd654955f..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png and /dev/null 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 deleted file mode 100644 index ac5b09d50d9be..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png deleted file mode 100644 index 945c6060055a8..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_0.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png deleted file mode 100644 index 0a3f73e1b7bb8..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_1.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png deleted file mode 100644 index 398cbef8baa09..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_cast_connecting_2.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_color_space_alpha.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_color_space_alpha.png deleted file mode 100644 index 95cf67f008d6d..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_color_space_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_inversion_alpha.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_inversion_alpha.png deleted file mode 100644 index efd8b9ee22014..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/ic_qs_inversion_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_full.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_full.png deleted file mode 100644 index 7f7cb6380377f..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_full.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_limited.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_limited.png deleted file mode 100644 index abdeb3bfed3c5..0000000000000 Binary files a/packages/SystemUI/res/drawable-xhdpi/stat_sys_zen_limited.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png deleted file mode 100644 index 65b02043e7b93..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_on.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_on.png deleted file mode 100644 index dd16165e94238..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_not_connected.png deleted file mode 100644 index c5b733304ab2e..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_not_connected.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_off.png deleted file mode 100644 index 1045e0745150c..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_off.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_on.png deleted file mode 100644 index 7c20110933ac3..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_bluetooth_on.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png deleted file mode 100644 index 4621d185380a5..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_0.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png deleted file mode 100644 index a1ab61be9c7dd..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_1.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png deleted file mode 100644 index ea42a7f670b56..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_cast_connecting_2.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_color_space_alpha.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_color_space_alpha.png deleted file mode 100644 index 7f441c812b76a..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_color_space_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_inversion_alpha.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_inversion_alpha.png deleted file mode 100644 index ce9bae257d8be..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_inversion_alpha.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_full.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_full.png deleted file mode 100644 index afe85b4ce0bf6..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_full.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_limited.png b/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_limited.png deleted file mode 100644 index 5e5053fb00e05..0000000000000 Binary files a/packages/SystemUI/res/drawable-xxhdpi/stat_sys_zen_limited.png and /dev/null differ diff --git a/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml b/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml new file mode 100644 index 0000000000000..9f0ec670d6e1e --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_airplane_off.xml @@ -0,0 +1,35 @@ + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_airplane.xml b/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml similarity index 94% rename from packages/SystemUI/res/drawable/ic_qs_airplane.xml rename to packages/SystemUI/res/drawable/ic_qs_airplane_on.xml index ffe571fd50673..95c20bb2886aa 100644 --- a/packages/SystemUI/res/drawable/ic_qs_airplane.xml +++ b/packages/SystemUI/res/drawable/ic_qs_airplane_on.xml @@ -23,9 +23,9 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml similarity index 97% rename from packages/SystemUI/res/drawable/ic_qs_bluetooth.xml rename to packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml index 22d0dcf42a282..61a777791e354 100644 --- a/packages/SystemUI/res/drawable/ic_qs_bluetooth.xml +++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_connected.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml new file mode 100644 index 0000000000000..7ac1cb9445230 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_location.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml similarity index 76% rename from packages/SystemUI/res/drawable/ic_qs_location.xml rename to packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml index e6e98a0f50ac7..61a777791e354 100644 --- a/packages/SystemUI/res/drawable/ic_qs_location.xml +++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_on.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> + android:fill="#FFFFFFFF" + android:pathData="M17.7,7.7L12.0,2.0l-1.0,0.0l0.0,7.6L6.4,5.0L5.0,6.4l5.6,5.6L5.0,17.6L6.4,19.0l4.6,-4.6L11.0,22.0l1.0,0.0l5.7,-5.7L13.4,12.0L17.7,7.7zM13.0,5.8l1.9,1.9L13.0,9.6L13.0,5.8zM14.9,16.3L13.0,18.2l0.0,-3.8L14.9,16.3z"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml index 2dfe1832916c1..29588480a7492 100644 --- a/packages/SystemUI/res/drawable/ic_qs_bugreport.xml +++ b/packages/SystemUI/res/drawable/ic_qs_bugreport.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml b/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml deleted file mode 100644 index 70db2a9b4e343..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_cast_connecting.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_off.xml b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml new file mode 100644 index 0000000000000..130c6397969e3 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_cast.xml b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml similarity index 97% rename from packages/SystemUI/res/drawable/ic_qs_cast.xml rename to packages/SystemUI/res/drawable/ic_qs_cast_on.xml index 6f2840b23946a..6c82b1c8fbd3c 100644 --- a/packages/SystemUI/res/drawable/ic_qs_cast.xml +++ b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_close.xml b/packages/SystemUI/res/drawable/ic_qs_close.xml index c2c72c89d9530..dd43e6c865d9c 100644 --- a/packages/SystemUI/res/drawable/ic_qs_close.xml +++ b/packages/SystemUI/res/drawable/ic_qs_close.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_invert_colors.xml b/packages/SystemUI/res/drawable/ic_qs_color_inversion.xml similarity index 97% rename from packages/SystemUI/res/drawable/ic_qs_invert_colors.xml rename to packages/SystemUI/res/drawable/ic_qs_color_inversion.xml index 7c92052683ff7..dc30a53de1159 100644 --- a/packages/SystemUI/res/drawable/ic_qs_invert_colors.xml +++ b/packages/SystemUI/res/drawable/ic_qs_color_inversion.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_color_space_off.xml b/packages/SystemUI/res/drawable/ic_qs_color_space_off.xml deleted file mode 100644 index cf34ba6421dc2..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_color_space_off.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_color_space_on.xml b/packages/SystemUI/res/drawable/ic_qs_color_space_on.xml deleted file mode 100644 index 180668887ea17..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_color_space_on.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml b/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml new file mode 100644 index 0000000000000..7a62212b1a4b5 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_hotspot_off.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_hotspot.xml b/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml similarity index 97% rename from packages/SystemUI/res/drawable/ic_qs_hotspot.xml rename to packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml index 965e3c1447577..3ccdd8125a603 100644 --- a/packages/SystemUI/res/drawable/ic_qs_hotspot.xml +++ b/packages/SystemUI/res/drawable/ic_qs_hotspot_on.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml deleted file mode 100644 index 9018a90e34a70..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_inversion_off.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml b/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml deleted file mode 100644 index 91102019fa0a2..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_inversion_on.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - diff --git a/packages/SystemUI/res/drawable/ic_location_24_01.xml b/packages/SystemUI/res/drawable/ic_qs_location_01.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_01.xml rename to packages/SystemUI/res/drawable/ic_qs_location_01.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_02.xml b/packages/SystemUI/res/drawable/ic_qs_location_02.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_02.xml rename to packages/SystemUI/res/drawable/ic_qs_location_02.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_03.xml b/packages/SystemUI/res/drawable/ic_qs_location_03.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_03.xml rename to packages/SystemUI/res/drawable/ic_qs_location_03.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_04.xml b/packages/SystemUI/res/drawable/ic_qs_location_04.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_04.xml rename to packages/SystemUI/res/drawable/ic_qs_location_04.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_05.xml b/packages/SystemUI/res/drawable/ic_qs_location_05.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_05.xml rename to packages/SystemUI/res/drawable/ic_qs_location_05.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_06.xml b/packages/SystemUI/res/drawable/ic_qs_location_06.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_06.xml rename to packages/SystemUI/res/drawable/ic_qs_location_06.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_07.xml b/packages/SystemUI/res/drawable/ic_qs_location_07.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_07.xml rename to packages/SystemUI/res/drawable/ic_qs_location_07.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_08.xml b/packages/SystemUI/res/drawable/ic_qs_location_08.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_08.xml rename to packages/SystemUI/res/drawable/ic_qs_location_08.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_09.xml b/packages/SystemUI/res/drawable/ic_qs_location_09.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_09.xml rename to packages/SystemUI/res/drawable/ic_qs_location_09.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_10.xml b/packages/SystemUI/res/drawable/ic_qs_location_10.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_10.xml rename to packages/SystemUI/res/drawable/ic_qs_location_10.xml diff --git a/packages/SystemUI/res/drawable/ic_location_24_11.xml b/packages/SystemUI/res/drawable/ic_qs_location_11.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_location_24_11.xml rename to packages/SystemUI/res/drawable/ic_qs_location_11.xml diff --git a/packages/SystemUI/res/drawable/ic_location_on_anim.xml b/packages/SystemUI/res/drawable/ic_qs_location_off.xml similarity index 58% rename from packages/SystemUI/res/drawable/ic_location_on_anim.xml rename to packages/SystemUI/res/drawable/ic_qs_location_off.xml index 65a8afe11515a..d28d3475218ae 100644 --- a/packages/SystemUI/res/drawable/ic_location_on_anim.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_off.xml @@ -17,15 +17,15 @@ Copyright (C) 2014 The Android Open Source Project - - - - - - - - - - - + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_location_off_anim.xml b/packages/SystemUI/res/drawable/ic_qs_location_on.xml similarity index 58% rename from packages/SystemUI/res/drawable/ic_location_off_anim.xml rename to packages/SystemUI/res/drawable/ic_qs_location_on.xml index 864eda133ba8c..72512ac48fcef 100644 --- a/packages/SystemUI/res/drawable/ic_location_off_anim.xml +++ b/packages/SystemUI/res/drawable/ic_qs_location_on.xml @@ -17,15 +17,15 @@ Copyright (C) 2014 The Android Open Source Project - - - - - - - - - - - + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_minus.xml b/packages/SystemUI/res/drawable/ic_qs_minus.xml index 8323e8994dc47..376cc28b41485 100644 --- a/packages/SystemUI/res/drawable/ic_qs_minus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_minus.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_plus.xml b/packages/SystemUI/res/drawable/ic_qs_plus.xml index 84cd72accfca1..a315f7f5ff2fa 100644 --- a/packages/SystemUI/res/drawable/ic_qs_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_plus.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml index fa6f20ce58bc9..45b5548743177 100644 --- a/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml +++ b/packages/SystemUI/res/drawable/ic_qs_ringer_audible.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml index 0665196b848f3..6d44406e49b9d 100644 --- a/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml +++ b/packages/SystemUI/res/drawable/ic_qs_ringer_silent.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml index 299a2ef58c925..96d20e8ecb9bb 100644 --- a/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml +++ b/packages/SystemUI/res/drawable/ic_qs_ringer_vibrate.xml @@ -23,6 +23,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportHeight="24.0"/> diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_01.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_01.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_01.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_01.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_02.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_02.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_02.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_02.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_03.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_03.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_03.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_03.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_04.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_04.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_04.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_04.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_05.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_05.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_05.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_05.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_06.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_06.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_06.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_06.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_07.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_07.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_07.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_07.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_08.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_08.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_08.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_08.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_09.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_09.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_09.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_09.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_10.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_10.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_10.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_10.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_11.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_11.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_11.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_11.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_12.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_12.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_12.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_12.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_13.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_13.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_13.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_13.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_14.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_14.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_14.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_14.xml diff --git a/packages/SystemUI/res/drawable/ic_rotate_24_15.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_15.xml similarity index 100% rename from packages/SystemUI/res/drawable/ic_rotate_24_15.xml rename to packages/SystemUI/res/drawable/ic_qs_rotation_15.xml diff --git a/packages/SystemUI/res/drawable/ic_qs_rotation_locked.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_locked.xml new file mode 100644 index 0000000000000..75e20f0d9ded8 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_rotation_locked.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml b/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml new file mode 100644 index 0000000000000..a1cedb9231202 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_rotation_unlocked.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_zen.xml b/packages/SystemUI/res/drawable/ic_qs_zen.xml deleted file mode 100644 index 059c068b792c0..0000000000000 --- a/packages/SystemUI/res/drawable/ic_qs_zen.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_qs_zen_off.xml b/packages/SystemUI/res/drawable/ic_qs_zen_off.xml new file mode 100644 index 0000000000000..73886ec726db9 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_zen_off.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_zen_on.xml b/packages/SystemUI/res/drawable/ic_qs_zen_on.xml new file mode 100644 index 0000000000000..8dff318554ad9 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_zen_on.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/packages/SystemUI/res/drawable/ic_rotate_locked_anim.xml b/packages/SystemUI/res/drawable/ic_rotate_locked_anim.xml deleted file mode 100644 index e14a1cea8e9e1..0000000000000 --- a/packages/SystemUI/res/drawable/ic_rotate_locked_anim.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/ic_rotate_unlocked_anim.xml b/packages/SystemUI/res/drawable/ic_rotate_unlocked_anim.xml deleted file mode 100644 index 63b8c5fa2aa7f..0000000000000 --- a/packages/SystemUI/res/drawable/ic_rotate_unlocked_anim.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/layout/qs_zen_mode_detail.xml b/packages/SystemUI/res/layout/qs_zen_mode_detail.xml index 2df6d438ae916..b73874a46628a 100644 --- a/packages/SystemUI/res/layout/qs_zen_mode_detail.xml +++ b/packages/SystemUI/res/layout/qs_zen_mode_detail.xml @@ -19,8 +19,9 @@ android:layout_height="match_parent" android:background="@color/system_secondary_color" > - - - #ff384248 #ff7fcac3 #fff0592b - #ffffffff - #ffcccccc #ff888888 #FFFFFFFF #FFFFFFFF diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index c15f25fbda17b..29955dd6f07ca 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -284,7 +284,6 @@ 8dp 30dp 16dp - 2dp 12sp 1dp diff --git a/packages/SystemUI/src/com/android/systemui/qs/FilterCanvas.java b/packages/SystemUI/src/com/android/systemui/qs/FilterCanvas.java deleted file mode 100644 index 05c8ee3f7352d..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/FilterCanvas.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.qs; - -import android.graphics.Canvas; -import android.graphics.Matrix; -import android.graphics.Paint; -import android.graphics.Path; -import android.graphics.Rect; - -/** Canvas that forwards calls to another canvas. Can be subclassed to transform drawing calls. - * Temporary solution to runtime modification of a single drawable shape into two - * enabled & disabled versions. See QSImageView. **/ -public class FilterCanvas extends Canvas { - private final Canvas mCanvas; - - public FilterCanvas(Canvas c) { - mCanvas = c; - } - - @Override - public void drawPath(Path path, Paint paint) { - mCanvas.drawPath(path, paint); - } - - @Override - public int getSaveCount() { - return mCanvas.getSaveCount(); - } - - @Override - public int save() { - return mCanvas.save(); - } - - @Override - public void translate(float dx, float dy) { - mCanvas.translate(dx, dy); - } - - @Override - public boolean clipRect(int left, int top, int right, int bottom) { - return mCanvas.clipRect(left, top, right, bottom); - } - - @Override - public boolean clipRect(Rect rect) { - return mCanvas.clipRect(rect); - } - - @Override - public void concat(Matrix matrix) { - mCanvas.concat(matrix); - } - - @Override - public void restoreToCount(int saveCount) { - mCanvas.restoreToCount(saveCount); - } - - @Override - public void drawRect(Rect r, Paint paint) { - mCanvas.drawRect(r, paint); - } -} \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSImageView.java b/packages/SystemUI/src/com/android/systemui/qs/QSImageView.java deleted file mode 100644 index ed67560aacaa6..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/qs/QSImageView.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.qs; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Style; -import android.graphics.Path; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.VectorDrawable; -import android.util.AttributeSet; -import android.widget.ImageView; - -import com.android.systemui.R; - -/** ImageView that performs runtime modification of vector drawables (using FilterCanvas). **/ -public class QSImageView extends ImageView { - - private final int mOutlineWidth; - private final int mColorEnabled; - private final int mColorDisabled; - private FilterCanvas mFilterCanvas; - private Canvas mCanvas; - private boolean mEnabledVersion = true; - private boolean mFilter; - - public QSImageView(Context context) { - this(context, null); - } - - public QSImageView(Context context, AttributeSet attrs) { - super(context, attrs); - final Resources res = context.getResources(); - mOutlineWidth = res.getDimensionPixelSize(R.dimen.quick_settings_tile_icon_outline); - mColorEnabled = res.getColor(R.color.quick_settings_tile_icon_enabled); - mColorDisabled = res.getColor(R.color.quick_settings_tile_icon_disabled); - } - - public void setEnabledVersion(boolean enabledVersion) { - mEnabledVersion = enabledVersion; - invalidate(); - } - - @Override - public void setImageDrawable(Drawable drawable) { - mFilter = drawable instanceof VectorDrawable; - super.setImageDrawable(drawable); - } - - @Override - public void setImageResource(int resId) { - setImageDrawable(mContext.getDrawable(resId)); - } - - @Override - public void draw(Canvas canvas) { - if (mFilter) { - if (canvas != mCanvas) { - mCanvas = canvas; - mFilterCanvas = new QSFilterCanvas(canvas); - } - super.draw(mFilterCanvas); - } else { - super.draw(canvas); - } - } - - private class QSFilterCanvas extends FilterCanvas { - public QSFilterCanvas(Canvas c) { - super(c); - } - - @Override - public void drawPath(Path path, Paint paint) { - if (mEnabledVersion) { - paint.setColor(mColorEnabled); - } else { - paint.setStyle(Style.STROKE); - paint.setStrokeJoin(Paint.Join.ROUND); - paint.setColor(mColorDisabled); - paint.setStrokeWidth(mOutlineWidth); - } - super.drawPath(path, paint); - } - } -} diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 38496b40d0f9c..2be364b19f8b6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -205,7 +205,6 @@ public abstract class QSTile implements Listenable { void collapsePanels(); Looper getLooper(); Context getContext(); - VectorDrawable getVectorDrawable(int resId); BluetoothController getBluetoothController(); LocationController getLocationController(); RotationLockController getRotationLockController(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java index 17a95fbc5b9e4..31aefe96a69a9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileView.java @@ -28,6 +28,7 @@ import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.ImageView.ScaleType; import android.widget.TextView; @@ -98,7 +99,7 @@ public class QSTileView extends ViewGroup { } protected View createIcon() { - QSImageView icon = new QSImageView(mContext); + final ImageView icon = new ImageView(mContext); icon.setId(android.R.id.icon); icon.setScaleType(ScaleType.CENTER_INSIDE); return icon; @@ -156,15 +157,12 @@ public class QSTileView extends ViewGroup { } protected void handleStateChanged(QSTile.State state) { - if (mIcon instanceof QSImageView) { - QSImageView qsiv = (QSImageView) mIcon; + if (mIcon instanceof ImageView) { + ImageView iv = (ImageView) mIcon; if (state.icon != null) { - qsiv.setImageDrawable(state.icon); + iv.setImageDrawable(state.icon); } else if (state.iconId > 0) { - qsiv.setImageResource(state.iconId); - } - if (state.icon != null && state instanceof QSTile.BooleanState) { - qsiv.setEnabledVersion(((QSTile.BooleanState)state).value); + iv.setImageResource(state.iconId); } } mLabel.setText(state.label); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java index 0c54040ba0c3d..c0f9bf22af6ad 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java @@ -65,7 +65,6 @@ public class AirplaneModeTile extends QSTile { state.value = airplaneMode; state.visible = true; state.label = mContext.getString(R.string.quick_settings_airplane_mode_label); - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_airplane); if (airplaneMode) { state.iconId = R.drawable.ic_qs_airplane_on; state.contentDescription = mContext.getString( diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 7a2e2d200d3f8..7335ab4f4f5c0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -72,14 +72,13 @@ public class BluetoothTile extends QSTile { final boolean connected = mController.isBluetoothConnected(); state.visible = supported; state.value = enabled; - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_bluetooth); final String stateContentDescription; if (enabled) { if (connected) { - state.iconId = R.drawable.ic_qs_bluetooth_on; + state.iconId = R.drawable.ic_qs_bluetooth_connected; stateContentDescription = mContext.getString(R.string.accessibility_desc_connected); } else { - state.iconId = R.drawable.ic_qs_bluetooth_not_connected; + state.iconId = R.drawable.ic_qs_bluetooth_on; stateContentDescription = mContext.getString(R.string.accessibility_desc_on); } state.label = mContext.getString(R.string.quick_settings_bluetooth_label); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java index dbb112cd43af1..81ea0eba3a68f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BugreportTile.java @@ -64,8 +64,7 @@ public class BugreportTile extends QSTile { @Override protected void handleUpdateState(State state, Object pushArg) { state.visible = mSetting.getValue() != 0; - state.iconId = com.android.internal.R.drawable.stat_sys_adb; - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_bugreport); + state.iconId = R.drawable.ic_qs_bugreport; state.label = mContext.getString(com.android.internal.R.string.bugreport_title); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 58575e4f66e7d..d0a12468c521b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -74,13 +74,13 @@ public class CastTile extends QSTile { state.visible = true; state.label = mContext .getString(R.string.quick_settings_remote_display_no_connection_label); - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_cast); if (arg instanceof CallbackInfo) { final CallbackInfo cb = (CallbackInfo) arg; if (cb.connectedRouteName != null) { state.value = !cb.connecting; } } + state.iconId = state.value ? R.drawable.ic_qs_cast_on : R.drawable.ic_qs_cast_off; } private static class CallbackInfo { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 72764e35f6f32..53013622d8c92 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -71,6 +71,6 @@ public class ColorInversionTile extends QSTile { state.visible = mVisible; state.value = enabled; state.label = mContext.getString(R.string.quick_settings_inversion_label); - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_invert_colors); + state.iconId = R.drawable.ic_qs_color_inversion; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 0eda9229069ac..f2ba558b9fdbc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -55,6 +55,6 @@ public class HotspotTile extends QSTile { protected void handleUpdateState(State state, Object arg) { state.visible = mController != null; state.label = mContext.getString(R.string.quick_settings_hotspot_label); - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_hotspot); + state.iconId = R.drawable.ic_qs_hotspot_off; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index f40705d373c42..c5ad9e65521de 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -65,8 +65,8 @@ public class LocationTile extends QSTile { if (state.value != locationEnabled) { state.value = locationEnabled; final AnimationDrawable d = (AnimationDrawable) mContext.getDrawable(locationEnabled - ? R.drawable.ic_location_on_anim - : R.drawable.ic_location_off_anim); + ? R.drawable.ic_qs_location_on + : R.drawable.ic_qs_location_off); state.icon = d; mUiHandler.post(new Runnable() { @Override @@ -75,15 +75,14 @@ public class LocationTile extends QSTile { } }); } - //state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_location); if (locationEnabled) { - if (state.icon == null) state.iconId = R.drawable.ic_location_24_01; + if (state.icon == null) state.iconId = R.drawable.ic_qs_location_01; state.label = mContext.getString(R.string.quick_settings_location_label); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_location, mContext.getString(R.string.accessibility_desc_on)); } else { - if (state.icon == null) state.iconId = R.drawable.ic_location_24_11; + if (state.icon == null) state.iconId = R.drawable.ic_qs_location_11; state.label = mContext.getString(R.string.quick_settings_location_off_label); state.contentDescription = mContext.getString( R.string.accessibility_quick_settings_location, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RingerModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RingerModeTile.java index ebb4cb2153e29..c5e9b52518f05 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RingerModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RingerModeTile.java @@ -67,13 +67,13 @@ public class RingerModeTile extends QSTile { state.visible = true; state.value = ringerMode; if (ringerMode == AudioManager.RINGER_MODE_VIBRATE) { - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_ringer_vibrate); + state.iconId = R.drawable.ic_qs_ringer_vibrate; state.label = "Vibrate"; } else if (ringerMode == AudioManager.RINGER_MODE_SILENT) { - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_ringer_silent); + state.iconId = R.drawable.ic_qs_ringer_silent; state.label = "Silent"; } else { - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_ringer_audible); + state.iconId = R.drawable.ic_qs_ringer_audible; state.label = "Audible"; } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 5c5078c40f35c..1b0967bad026a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -63,8 +63,8 @@ public class RotationLockTile extends QSTile { if (state.value != rotationLocked) { state.value = rotationLocked; final AnimationDrawable d = (AnimationDrawable) mContext.getDrawable(rotationLocked - ? R.drawable.ic_rotate_locked_anim - : R.drawable.ic_rotate_unlocked_anim); + ? R.drawable.ic_qs_rotation_locked + : R.drawable.ic_qs_rotation_unlocked); state.icon = d; mUiHandler.post(new Runnable() { @Override @@ -82,12 +82,12 @@ public class RotationLockTile extends QSTile { : R.string.quick_settings_rotation_locked_label; state.label = mContext.getString(label); if (state.icon == null) { - state.icon = mContext.getDrawable(R.drawable.ic_rotate_24_15); + state.icon = mContext.getDrawable(R.drawable.ic_qs_rotation_15); } } else { state.label = mContext.getString(R.string.quick_settings_rotation_unlocked_label); if (state.icon == null) { - state.icon = mContext.getDrawable(R.drawable.ic_rotate_24_01); + state.icon = mContext.getDrawable(R.drawable.ic_qs_rotation_01); } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeDetail.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeDetail.java index dceb85603db4e..2edefe7614804 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeDetail.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeDetail.java @@ -32,6 +32,7 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.ImageView; import android.widget.ListView; import android.widget.RadioButton; import android.widget.RelativeLayout; @@ -39,7 +40,6 @@ import android.widget.Switch; import android.widget.TextView; import com.android.systemui.R; -import com.android.systemui.qs.QSImageView; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.ZenModeController; @@ -72,9 +72,7 @@ public class ZenModeDetail extends RelativeLayout { mContext = getContext(); mController = mHost.getZenModeController(); - final QSImageView close = (QSImageView) findViewById(android.R.id.button1); - close.setImageDrawable(mHost.getVectorDrawable(R.drawable.ic_qs_close)); - close.setEnabledVersion(true); + final ImageView close = (ImageView) findViewById(android.R.id.button1); close.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -239,9 +237,7 @@ public class ZenModeDetail extends RelativeLayout { title.setText(condition.summary); title.setEnabled(enabled); title.setAlpha(enabled ? 1 : .5f); - final QSImageView button1 = (QSImageView) row.findViewById(android.R.id.button1); - button1.setImageDrawable(mHost.getVectorDrawable(R.drawable.ic_qs_minus)); - button1.setEnabledVersion(true); + final ImageView button1 = (ImageView) row.findViewById(android.R.id.button1); button1.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -250,9 +246,7 @@ public class ZenModeDetail extends RelativeLayout { } }); - final QSImageView button2 = (QSImageView) row.findViewById(android.R.id.button2); - button2.setImageDrawable(mHost.getVectorDrawable(R.drawable.ic_qs_plus)); - button2.setEnabledVersion(true); + final ImageView button2 = (ImageView) row.findViewById(android.R.id.button2); button2.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeTile.java index dbfef0cadec5a..bfa9c1937912d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ZenModeTile.java @@ -73,8 +73,7 @@ public class ZenModeTile extends QSTile { final boolean zen = arg instanceof Boolean ? (Boolean)arg : mController.isZen(); state.value = zen; state.visible = true; - state.iconId = R.drawable.stat_sys_zen_limited; - state.icon = mHost.getVectorDrawable(R.drawable.ic_qs_zen); + state.iconId = zen ? R.drawable.ic_qs_zen_on : R.drawable.ic_qs_zen_off; state.label = mContext.getString(R.string.zen_mode_title); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java index 6401695cafd40..9c39002372b92 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java @@ -89,7 +89,7 @@ public class InterceptedNotifications { return; } final Notification n = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.stat_sys_zen_limited) + .setSmallIcon(R.drawable.ic_qs_zen_on) .setContentTitle(mContext.getResources().getQuantityString( R.plurals.zen_mode_notification_title, mIntercepted.size(), mIntercepted.size())) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index a92061fbb8f4c..f56dadd84467c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -619,7 +619,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, mMoreIcon = mStatusBarView.findViewById(R.id.moreIcon); mNotificationIcons.setOverflowIndicator(mMoreIcon); mModeIcon = (ImageView)mStatusBarView.findViewById(R.id.modeIcon); - mModeIcon.setImageResource(R.drawable.stat_sys_zen_limited); + mModeIcon.setImageResource(R.drawable.ic_qs_zen_on); mStatusBarContents = (LinearLayout)mStatusBarView.findViewById(R.id.status_bar_contents); mTickerView = mStatusBarView.findViewById(R.id.ticker); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 1fe3be5836d6d..34d143af643a7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -18,7 +18,6 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.content.Intent; -import android.graphics.drawable.VectorDrawable; import android.os.HandlerThread; import android.os.Looper; @@ -136,11 +135,6 @@ public class QSTileHost implements QSTile.Host { return mContext; } - @Override - public VectorDrawable getVectorDrawable(int resId) { - return (VectorDrawable) mContext.getDrawable(resId); - } - @Override public BluetoothController getBluetoothController() { return mBluetooth;