From 93d2294eabd4d6fb9fa54a0fd57816fc53fa1348 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 24 Feb 2017 17:06:19 -0800 Subject: [PATCH] Experimental change to use colorful icons in Settings home Bug: 34978809 Test: manual Change-Id: Ia48404dd631d996dfcc25457baef9f60ab4408cb --- AndroidManifest.xml | 17 ++++++------ res/drawable/ic_dashboard_apps.xml | 25 ++++++++++++++++++ res/drawable/ic_dashboard_display.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_network.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_security.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_sound.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_storage.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_system.xml | 26 +++++++++++++++++++ res/drawable/ic_dashboard_user.xml | 30 ++++++++++++++++++++++ res/drawable/ic_devices_other.xml | 5 ++-- res/drawable/ic_help.xml | 5 ++-- res/drawable/ic_settings_accessibility.xml | 5 ++-- res/drawable/ic_settings_battery.xml | 5 ++-- 13 files changed, 228 insertions(+), 20 deletions(-) create mode 100644 res/drawable/ic_dashboard_apps.xml create mode 100644 res/drawable/ic_dashboard_display.xml create mode 100644 res/drawable/ic_dashboard_network.xml create mode 100644 res/drawable/ic_dashboard_security.xml create mode 100644 res/drawable/ic_dashboard_sound.xml create mode 100644 res/drawable/ic_dashboard_storage.xml create mode 100644 res/drawable/ic_dashboard_system.xml create mode 100644 res/drawable/ic_dashboard_user.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 02ef330319f..46fb80d0f16 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -891,7 +891,7 @@ @@ -1271,7 +1271,7 @@ @@ -3013,7 +3013,7 @@ + android:icon="@drawable/ic_dashboard_network"> @@ -3052,7 +3052,7 @@ + android:icon="@drawable/ic_dashboard_apps"> @@ -3091,7 +3091,8 @@ + android:targetActivity="Settings$SoundSettingsActivity" + android:icon="@drawable/ic_dashboard_sound"> @@ -3107,7 +3108,7 @@ + android:icon="@drawable/ic_dashboard_storage"> @@ -3134,7 +3135,7 @@ + android:icon="@drawable/ic_dashboard_user"> @@ -3165,7 +3166,7 @@ + android:icon="@drawable/ic_dashboard_system"> diff --git a/res/drawable/ic_dashboard_apps.xml b/res/drawable/ic_dashboard_apps.xml new file mode 100644 index 00000000000..c0083a6c26b --- /dev/null +++ b/res/drawable/ic_dashboard_apps.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_dashboard_display.xml b/res/drawable/ic_dashboard_display.xml new file mode 100644 index 00000000000..ae367cf6dde --- /dev/null +++ b/res/drawable/ic_dashboard_display.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_dashboard_network.xml b/res/drawable/ic_dashboard_network.xml new file mode 100644 index 00000000000..6c7ee2e7cf6 --- /dev/null +++ b/res/drawable/ic_dashboard_network.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_dashboard_security.xml b/res/drawable/ic_dashboard_security.xml new file mode 100644 index 00000000000..1e6a1e88896 --- /dev/null +++ b/res/drawable/ic_dashboard_security.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_dashboard_sound.xml b/res/drawable/ic_dashboard_sound.xml new file mode 100644 index 00000000000..0cd3b04960c --- /dev/null +++ b/res/drawable/ic_dashboard_sound.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_dashboard_storage.xml b/res/drawable/ic_dashboard_storage.xml new file mode 100644 index 00000000000..2b6160e8dbe --- /dev/null +++ b/res/drawable/ic_dashboard_storage.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_dashboard_system.xml b/res/drawable/ic_dashboard_system.xml new file mode 100644 index 00000000000..fdd92144cdd --- /dev/null +++ b/res/drawable/ic_dashboard_system.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_dashboard_user.xml b/res/drawable/ic_dashboard_user.xml new file mode 100644 index 00000000000..302d33ead3c --- /dev/null +++ b/res/drawable/ic_dashboard_user.xml @@ -0,0 +1,30 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index 20639a3a6e9..73407a36f57 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -17,9 +17,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:fillColor="#0b9c57"/> diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml index 7a225e50342..5b056e76fb0 100644 --- a/res/drawable/ic_help.xml +++ b/res/drawable/ic_help.xml @@ -17,9 +17,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:fillColor="#f3501d"/> diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index 34c0bddec50..a689c4af0cf 100644 --- a/res/drawable/ic_settings_accessibility.xml +++ b/res/drawable/ic_settings_accessibility.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml index c8e053d1f30..f1e56d81764 100644 --- a/res/drawable/ic_settings_battery.xml +++ b/res/drawable/ic_settings_battery.xml @@ -17,10 +17,9 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0">