From e27e1423608de4cc0bd602f16a126ec498d63ed7 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 5 Dec 2016 13:33:49 -0800 Subject: [PATCH] Add tint for cellular icon. It contains the following types: 1. cellular basic type(no_signal, no_sim) 2. cellular signal strength(e.g. *_signal_full_0.xml) 3. signal type(e.g. lte, g, h) Bug: 32592245 Test: Manual Change-Id: I430d3c831a672bad53651eec1b8a8b2caa2f4b54 --- packages/SystemUI/res/drawable/ic_qs_no_sim.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_0.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_1.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_1x.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_2.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_3.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_3g.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_4.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_4g.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml | 3 ++- .../res/drawable/ic_qs_signal_carrier_network_change.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_disabled.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_e.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_g.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_h.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_lte.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml | 3 ++- packages/SystemUI/res/drawable/ic_qs_signal_r.xml | 3 ++- 24 files changed, 48 insertions(+), 24 deletions(-) diff --git a/packages/SystemUI/res/drawable/ic_qs_no_sim.xml b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml index bd46012a98f93..2d831b2e3e3f0 100644 --- a/packages/SystemUI/res/drawable/ic_qs_no_sim.xml +++ b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml index 71c40df982dd9..3a55623132000 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="16.0dp" android:height="32dp" android:viewportWidth="12.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml index 8a488170e4381..e9f5a0b0a50ee 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml @@ -18,7 +18,8 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml index 39cc94cad4dbc..769d64891e019 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml @@ -18,7 +18,8 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml index 012e95e985ce5..1bec1b8aed9bd 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml @@ -18,7 +18,8 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml index 42045d1e52cc5..8e1f8eb418738 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="16.0dp" android:height="32dp" android:viewportWidth="12.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml index 4d7f325073dc5..e0c6b68cf618d 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml @@ -17,7 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml b/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml index 96e2fd4e5f826..1c068e5b4fb26 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml @@ -17,7 +17,8 @@ android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml index e49a40949a41d..4c904219cf14a 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="6.6666665dp" android:height="32dp" android:viewportWidth="5.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml index 326373ddc9e81..db4df76184962 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml index 8baa4ebd0c267..6e5439d16d503 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml index bf19a718e0fc9..194edc3089ac9 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml index 01839e8589ef0..b57af5c265f34 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml index 48151ad78a6c2..7d754a856ec77 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml index 9d42a441849fb..64aadf94a582b 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="9.333333dp" android:height="32dp" android:viewportWidth="7.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml index f509d714fd43b..31918a99617d2 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="8.0dp" android:height="32dp" android:viewportWidth="6.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml index b7242e69378ff..87660756989a4 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="17.333334dp" android:height="32dp" android:viewportWidth="13.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml index 3af0629997282..5ff7d8575a771 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml @@ -17,7 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml index f7fd97c60667b..4e65004080609 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml @@ -18,7 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_r.xml b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml index 66f64c9183297..2c10dc3f86ba8 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_r.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="8.0dp" android:height="32dp" android:viewportWidth="6.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?android:attr/colorControlNormal">