diff --git a/Android.mk b/Android.mk index a63433085bd94c6b8af96d1afc166667ab9bff12..0b6ad140a4aec4652e92b5e68ac947aeb88355d0 100644 --- a/Android.mk +++ b/Android.mk @@ -44,7 +44,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ guava \ jsr305 \ settings-logtags \ - org.lineageos.platform.internal + org.lineageos.platform.internal \ + org.lineageos.platform.sdk LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 74cd3d4e687da7d617861ce3f61dee580b1ebdb2..538540bbf5fc2518ed89ee4b17f743e605f00590 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1694,7 +1694,7 @@ android:enabled="false" android:exported="true" android:taskAffinity="com.android.wizard" - android:theme="@style/SuwThemeGlif.Light" + android:theme="@style/Theme.Settings" android:label="@string/lock_screen_notifications_interstitial_title" android:icon="@drawable/ic_suggested_notifications"> @@ -2081,7 +2081,7 @@ + android:theme="@style/Theme.Dialog" /> @@ -2170,7 +2170,7 @@ android:label="@string/bluetooth_connection_permission_request" android:excludeFromRecents="true" android:permission="android.permission.BLUETOOTH_ADMIN" - android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> + android:theme="@style/Theme.AlertDialog"> @@ -2243,7 +2243,7 @@ @@ -2592,7 +2592,7 @@ + android:theme="@style/Theme.AlertDialog"> @@ -2610,7 +2610,7 @@ + android:theme="@style/Theme.AlertDialog"> @@ -2850,7 +2850,7 @@ + android:theme="@style/Theme.AlertDialog" /> @@ -3239,7 +3239,7 @@ diff --git a/res/drawable-anydpi-v21/ic_arrow_down_24dp.xml b/res/drawable-anydpi-v21/ic_arrow_down_24dp.xml index 3d408219f91f243656cd783e49d47709fc5cfba6..197231b1708ee07eb8f7f965361b662c62b17d8a 100644 --- a/res/drawable-anydpi-v21/ic_arrow_down_24dp.xml +++ b/res/drawable-anydpi-v21/ic_arrow_down_24dp.xml @@ -18,9 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/color_bar_progress.xml b/res/drawable/color_bar_progress.xml index d2774678636251360daaf3b0df80ac3e8b5e9f8d..9f3a1994a7602a86c481a280b08ff43ea893e1c8 100644 --- a/res/drawable/color_bar_progress.xml +++ b/res/drawable/color_bar_progress.xml @@ -21,7 +21,7 @@ - r + + android:color="@color/color_default_red1"/> diff --git a/res/drawable/data_sweep_warning.xml b/res/drawable/data_sweep_warning.xml index b0f5fda569f103760f62a8c8069a02836aaa2b12..c05b98792a73c0ef6e066832d4a0c664e6297b68 100644 --- a/res/drawable/data_sweep_warning.xml +++ b/res/drawable/data_sweep_warning.xml @@ -20,6 +20,6 @@ android:viewportWidth="2" android:viewportHeight="56"> diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml index 835ac5b58ac1e667bf6620ed866a996c6df1bd66..d0d24edff4c4efa35fe8fedaba1abd473de6d01a 100644 --- a/res/drawable/drag_handle.xml +++ b/res/drawable/drag_handle.xml @@ -18,10 +18,9 @@ android:height="24dp" android:width="24dp" android:viewportHeight="48" - android:viewportWidth="48" - android:tint="@color/material_grey_600"> + android:viewportWidth="48"> - diff --git a/res/drawable/fallback_home_unprovisioned_background.xml b/res/drawable/fallback_home_unprovisioned_background.xml index 9ec3874672a0cac5e8fc6bb561f1ce9a8d6b6986..0ade2aed00072bb72da9c41835f80d64969b4465 100644 --- a/res/drawable/fallback_home_unprovisioned_background.xml +++ b/res/drawable/fallback_home_unprovisioned_background.xml @@ -16,4 +16,4 @@ --> \ No newline at end of file + android:color="@color/color_default_background" /> \ No newline at end of file diff --git a/res/drawable/fingerprint_enroll_finish.xml b/res/drawable/fingerprint_enroll_finish.xml index 9bc72830620f1cc31ea073fb2f119dbd785242a4..9c9e263f73c670506b04568427096ce2e98504f7 100644 --- a/res/drawable/fingerprint_enroll_finish.xml +++ b/res/drawable/fingerprint_enroll_finish.xml @@ -21,7 +21,7 @@ android:viewportHeight="228.0" android:viewportWidth="228.0"> diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml index f87a882a74bff52306a60c5288309c7f3bae1bc4..89709b934eb9bce563d5ef08ac84701f212cc36a 100644 --- a/res/drawable/ic_add_24dp.xml +++ b/res/drawable/ic_add_24dp.xml @@ -17,9 +17,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_android.xml b/res/drawable/ic_android.xml index b9b407557c72b4e74ab224bef449d9e5a58fba80..5c919c96deb17900b29bde14a512464c01a56e7a 100644 --- a/res/drawable/ic_android.xml +++ b/res/drawable/ic_android.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="@color/default_icon_color"/> diff --git a/res/drawable/ic_apps_alt.xml b/res/drawable/ic_apps_alt.xml index 6902a96ea3139533038eb2963352abaa45ff4a63..6721f92cb1be5c6a0a5c6cf672452aa75cf40489 100644 --- a/res/drawable/ic_apps_alt.xml +++ b/res/drawable/ic_apps_alt.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_arrow_circle_down.xml b/res/drawable/ic_arrow_circle_down.xml new file mode 100644 index 0000000000000000000000000000000000000000..f7b03d6ad56511b6a4f6d97198070638ea390518 --- /dev/null +++ b/res/drawable/ic_arrow_circle_down.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_arrow_circle_up.xml b/res/drawable/ic_arrow_circle_up.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c610b3985dad3cd76971d8bb8b04f394dfcef62 --- /dev/null +++ b/res/drawable/ic_arrow_circle_up.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml index f334902646bcba28f64394b0561647d450ded86d..2cac0e153cca6e13c60ef18729824cf68a2065be 100644 --- a/res/drawable/ic_arrow_down_24dp.xml +++ b/res/drawable/ic_arrow_down_24dp.xml @@ -18,10 +18,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_attach_money_black_24dp.xml b/res/drawable/ic_attach_money_black_24dp.xml index 12605fd9c666016a8700df16efde955b2b79fadb..cace9de8c8b43a7d962574d9ecdf11f474e19a20 100644 --- a/res/drawable/ic_attach_money_black_24dp.xml +++ b/res/drawable/ic_attach_money_black_24dp.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"> \ No newline at end of file diff --git a/res/drawable/ic_audio_alarm.xml b/res/drawable/ic_audio_alarm.xml index 8322313f2fccb5c12e95dbb9136fe6f46bb69b56..d30c058332b6718fb67814200c0306b1dd6ab47c 100644 --- a/res/drawable/ic_audio_alarm.xml +++ b/res/drawable/ic_audio_alarm.xml @@ -11,13 +11,13 @@ android:pathData="M25.2477 32.5271H6.75229C3.02611 32.5271 0 29.501 0 25.7748V7.27939C0 3.55321 3.02611 0.5271 6.75229 0.5271H25.2477C28.9739 0.5271 32 3.55321 32 7.27939V25.7748C32 29.501 28.9739 32.5271 25.2477 32.5271Z" /> + android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color" /> \ No newline at end of file diff --git a/res/drawable/ic_back.xml b/res/drawable/ic_back.xml new file mode 100644 index 0000000000000000000000000000000000000000..608f11579e3a6e3dcce2b58a41cac548c4b1f8c8 --- /dev/null +++ b/res/drawable/ic_back.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_battery_alert_24dp.xml b/res/drawable/ic_battery_alert_24dp.xml index 5a512f720aefb2725600930cce5a061915618498..9783d51a851067d5570a6551b20ae477fad512e0 100644 --- a/res/drawable/ic_battery_alert_24dp.xml +++ b/res/drawable/ic_battery_alert_24dp.xml @@ -18,7 +18,7 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorError"> + android:tint="@color/color_default_orange1"> diff --git a/res/drawable/ic_battery_charging_full.xml b/res/drawable/ic_battery_charging_full.xml index 830853230a472c1e8704148f4cb37f4264651a99..b30138589ebbb0a1075f40ffac2b529f3f06eff3 100644 --- a/res/drawable/ic_battery_charging_full.xml +++ b/res/drawable/ic_battery_charging_full.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml index 5c736fdf4ed7d76ab359daee186a06438414a77d..3df83f5d24cf99decbb5f94c0127e334d7126e38 100644 --- a/res/drawable/ic_battery_circle.xml +++ b/res/drawable/ic_battery_circle.xml @@ -17,8 +17,7 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> - + \ No newline at end of file diff --git a/res/drawable/ic_battery_saver_accent_24dp.xml b/res/drawable/ic_battery_saver_accent_24dp.xml index c8def54883d3cc54b2dc0ba69b7e9b8467cb9e64..eb30697f41d4ad3d00d078ee7a8bde6a59a7be82 100644 --- a/res/drawable/ic_battery_saver_accent_24dp.xml +++ b/res/drawable/ic_battery_saver_accent_24dp.xml @@ -18,12 +18,11 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_bt_headphones_a2dp.xml b/res/drawable/ic_bt_headphones_a2dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..37f7903e70a0589ace3f338d547e8a708dbe94cb --- /dev/null +++ b/res/drawable/ic_bt_headphones_a2dp.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_bugreport.xml b/res/drawable/ic_bugreport.xml index b71de65e59e15533dce39ff426da2d74abc29c5a..e4b2423b9f9e791d531d6bbdaca0019a58d1febb 100644 --- a/res/drawable/ic_bugreport.xml +++ b/res/drawable/ic_bugreport.xml @@ -2,9 +2,8 @@ android:height="32dp" android:width="32dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> + android:fillColor="@color/default_icon_color" /> diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml index c84f18ede0595e45160523c91e5c0944e4cc383a..c88347a7f2a1827efd368ab85ee51b3cda5d96df 100644 --- a/res/drawable/ic_cancel.xml +++ b/res/drawable/ic_cancel.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_cancel_cross.xml b/res/drawable/ic_cancel_cross.xml new file mode 100644 index 0000000000000000000000000000000000000000..f700047202c14372c4048f2c8c0564239b27804e --- /dev/null +++ b/res/drawable/ic_cancel_cross.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml index 2ac48ef5be5258a3aeb77642fcc35ae0ccaaff86..d24d82e5b651274cb13c4d0d95faee4de09fccfe 100644 --- a/res/drawable/ic_cast_24dp.xml +++ b/res/drawable/ic_cast_24dp.xml @@ -7,20 +7,20 @@ diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml index 4f767cfbb112848ffd4f60f708889775d19ecdc1..27a4f97c66d1e75f4dd5ff2e296bbbb0ad112744 100644 --- a/res/drawable/ic_cellular_off.xml +++ b/res/drawable/ic_cellular_off.xml @@ -20,9 +20,9 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_chevron_right.xml b/res/drawable/ic_chevron_right.xml index 962dedb19c406e549d0d9917ba89d3b711518d07..3891796502d9fd399683bb52d35ded1750f34e03 100644 --- a/res/drawable/ic_chevron_right.xml +++ b/res/drawable/ic_chevron_right.xml @@ -6,6 +6,6 @@ android:viewportHeight="512"> diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml index 17e2b92a2d8c1280973f9e336edd87207e49369f..990c0e535dbf2084c3ee8ea437d813836457bdbc 100644 --- a/res/drawable/ic_chevron_right_24dp.xml +++ b/res/drawable/ic_chevron_right_24dp.xml @@ -21,7 +21,7 @@ android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:tint="?android:attr/colorControlNormal"> + android:tint="@color/default_icon_color"> diff --git a/res/drawable/ic_corp_badge.xml b/res/drawable/ic_corp_badge.xml new file mode 100644 index 0000000000000000000000000000000000000000..c6fd14084e33585d111986886ce684cffdcf0737 --- /dev/null +++ b/res/drawable/ic_corp_badge.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml index d2d55a9581b675885b74b780bcbb261c34939ca0..88607173687a174886a0b0196515a0cc6f18162b 100644 --- a/res/drawable/ic_data_saver.xml +++ b/res/drawable/ic_data_saver.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_delete.xml b/res/drawable/ic_delete.xml index d1290c50a0284d7126c9d32af0a78a695808b972..e9af39bdeb44683c314abaccecfd698bc76219eb 100644 --- a/res/drawable/ic_delete.xml +++ b/res/drawable/ic_delete.xml @@ -17,15 +17,14 @@ Copyright (C) 2015 The Android Open Source Project 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_devices_other.xml b/res/drawable/ic_devices_other.xml index 6338301e6f14417c037c61f727fc3e0e2725eb88..f2d9bad93c02550f64c13378741a014e2e406917 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -5,7 +5,7 @@ android:viewportHeight="33"> + android:fillColor="@color/color_icon_background_blue"/> + android:fillColor="@color/color_icon_background_blue"/> + + + \ No newline at end of file diff --git a/res/drawable/ic_do_not_disturb_on_24dp.xml b/res/drawable/ic_do_not_disturb_on_24dp.xml index cace8d4433f59bd3848bf9e8c8d75e9226d1172e..1d18cb2504eed46721eae17eafaa7da57a8a9bb1 100644 --- a/res/drawable/ic_do_not_disturb_on_24dp.xml +++ b/res/drawable/ic_do_not_disturb_on_24dp.xml @@ -17,12 +17,11 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml index 8755ccb4d05e7a5e2bb3bf679d6b323d12a59cb0..9b4cc03132e7469d8273152c28a6fa4629f1dca3 100644 --- a/res/drawable/ic_eject_24dp.xml +++ b/res/drawable/ic_eject_24dp.xml @@ -17,9 +17,8 @@ Copyright (C) 2015 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_event.xml b/res/drawable/ic_event.xml index a82d75449857054e9c1b7ce0576093160504b2bb..09d8ba7af06f13fb86db8043f37bc503da8a8e99 100644 --- a/res/drawable/ic_event.xml +++ b/res/drawable/ic_event.xml @@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project + android:color="@color/color_icon_background_blue" /> diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml index 7ccc08091724874b5827e8b3937e5f09cddd264d..8430ba92a86e6dfd85de5812e8a3c05016f9796b 100644 --- a/res/drawable/ic_expand_less.xml +++ b/res/drawable/ic_expand_less.xml @@ -19,11 +19,10 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_expand_more.xml b/res/drawable/ic_expand_more.xml index edffde399a0a75d21c6d6543834a6b7cf486cc00..d58d532f4bcf0111b69974d633924cc177e27cd2 100644 --- a/res/drawable/ic_expand_more.xml +++ b/res/drawable/ic_expand_more.xml @@ -19,11 +19,10 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_expand_more_inverse.xml b/res/drawable/ic_expand_more_inverse.xml index c39e3f97f0b62d241029ad69c355a9f89e45f9a6..f28800127aac11860ac7aac05ea56db88a6c3c39 100644 --- a/res/drawable/ic_expand_more_inverse.xml +++ b/res/drawable/ic_expand_more_inverse.xml @@ -19,11 +19,10 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorForegroundInverse"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml index 048826b88d9e1787392ff86bcdbf1a1f93709c8c..299913ca6f581aa001edf1649410687a8367b89e 100644 --- a/res/drawable/ic_fingerprint.xml +++ b/res/drawable/ic_fingerprint.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> + android:fillColor="@color/color_icon_background_blue"/> diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml index 5e3b55fbc06b7f7807cd73c710f52dc2904b3e8a..2e1bf3fb7f6142cbeaf307edc484c072ddc93dbc 100644 --- a/res/drawable/ic_folder_vd_theme_24.xml +++ b/res/drawable/ic_folder_vd_theme_24.xml @@ -6,7 +6,7 @@ diff --git a/res/drawable/ic_font_size_16dp.xml b/res/drawable/ic_font_size_16dp.xml index dd8cab887fed368c888807207f4f1e5c5e55a03e..863ecdd6132a73a626cf5d2f10ecaea92c0c80d6 100644 --- a/res/drawable/ic_font_size_16dp.xml +++ b/res/drawable/ic_font_size_16dp.xml @@ -17,10 +17,9 @@ android:width="16dp" android:height="16dp" android:viewportWidth="48" - android:viewportHeight="48" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="48"> diff --git a/res/drawable/ic_font_size_24dp.xml b/res/drawable/ic_font_size_24dp.xml index 063917a138be98de3e1d1224b4c2e3c8cf86622c..eafec2a46ce1968c27df92d5e39bea75759ad81b 100644 --- a/res/drawable/ic_font_size_24dp.xml +++ b/res/drawable/ic_font_size_24dp.xml @@ -17,10 +17,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="48" - android:viewportHeight="48" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="48"> diff --git a/res/drawable/ic_frequency_antenna.xml b/res/drawable/ic_frequency_antenna.xml index 581b83e607732cafe66ddd2c18f283075cafccac..9d9c6577b5f8663848827c9ef1f750db6745aa99 100644 --- a/res/drawable/ic_frequency_antenna.xml +++ b/res/drawable/ic_frequency_antenna.xml @@ -18,11 +18,10 @@ android:viewportWidth="24" android:viewportHeight="24" android:width="24dp" - android:height="24dp" - android:tint="@color/wifi_details_icon_color"> + android:height="24dp"> + android:fillColor="@color/default_icon_color" /> diff --git a/res/drawable/ic_friction_lock_closed.xml b/res/drawable/ic_friction_lock_closed.xml index 194c9afb4044ed46c3649669e9accad68b0d0c8e..8f1635d46eae2d3b53c909465585c0df80f5defd 100644 --- a/res/drawable/ic_friction_lock_closed.xml +++ b/res/drawable/ic_friction_lock_closed.xml @@ -21,6 +21,6 @@ android:height="18dp"> diff --git a/res/drawable/ic_friction_money.xml b/res/drawable/ic_friction_money.xml index 1018533d035816c4bce9a844143df80d5f61b995..3278495ae833432679d3bc230c7635af0b5d6b0b 100644 --- a/res/drawable/ic_friction_money.xml +++ b/res/drawable/ic_friction_money.xml @@ -20,7 +20,7 @@ android:width="18dp" android:height="18dp"> - + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml index f8bac71e8778646b3bb21956af9fafdb3964e32a..ac95682309f881b9affd0e81b5966439ee1c5780 100644 --- a/res/drawable/ic_help.xml +++ b/res/drawable/ic_help.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_homepage_accessibility.xml b/res/drawable/ic_homepage_accessibility.xml index fe2e3dc9ed32c4a1f076dadf665ae1450dcf7a0e..dcc58788abdc0ccc7c8e86995942bbeecc39f3fb 100644 --- a/res/drawable/ic_homepage_accessibility.xml +++ b/res/drawable/ic_homepage_accessibility.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> + + + \ No newline at end of file diff --git a/res/drawable/ic_keyboard.xml b/res/drawable/ic_keyboard.xml new file mode 100644 index 0000000000000000000000000000000000000000..fabc55da24966a2e6311b8caa74024f0d211617d --- /dev/null +++ b/res/drawable/ic_keyboard.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml index b1ed068abec08eb2eaa0327403cd5d144c81fc3a..39c27f524ad7826d0836c5ca3536c1c0051c1ea2 100644 --- a/res/drawable/ic_label.xml +++ b/res/drawable/ic_label.xml @@ -19,6 +19,6 @@ android:viewportWidth="48.0" android:viewportHeight="48.0"> diff --git a/res/drawable/ic_lightbulb_outline_24.xml b/res/drawable/ic_lightbulb_outline_24.xml index 89cf8fabc06b09e084c66f5f9f6f2d76cbd2ad72..ef236243439354a69f019d4dd0101eb381e34294 100644 --- a/res/drawable/ic_lightbulb_outline_24.xml +++ b/res/drawable/ic_lightbulb_outline_24.xml @@ -19,10 +19,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24.0"> + + + diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml index 4398527d7dd30f0a177f5fed9f3ae90356225eed..e83d30979cea95f6a511b341c83e0a97666ede2b 100644 --- a/res/drawable/ic_media_stream_off.xml +++ b/res/drawable/ic_media_stream_off.xml @@ -20,13 +20,13 @@ android:fillColor="#ffffff" android:pathData="M23.2666 22.048C23.7777 21.6035 24.1555 21.0035 24.2444 20.3591C24.4444 18.9813 23.2888 17.8924 21.6888 17.9146C20.9777 17.9369 20.311 18.1591 19.7555 18.5369L23.2666 22.048Z" /> diff --git a/res/drawable/ic_menu_add_inset.xml b/res/drawable/ic_menu_add_inset.xml index a4f0a6546605c6cfe739fe1d8fa278dd206da5f7..346b4e89b1627f010fed82478b5dd612f38ea7af 100644 --- a/res/drawable/ic_menu_add_inset.xml +++ b/res/drawable/ic_menu_add_inset.xml @@ -20,10 +20,9 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_menu_add_white.xml b/res/drawable/ic_menu_add_white.xml index 25a8ff0fd1acf8bc10c956e58c354e4202d115d1..40fb76744220fbb669ffa4271180e92da3d53593 100644 --- a/res/drawable/ic_menu_add_white.xml +++ b/res/drawable/ic_menu_add_white.xml @@ -20,9 +20,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_menu_sd_card.xml b/res/drawable/ic_menu_sd_card.xml new file mode 100644 index 0000000000000000000000000000000000000000..5af54225a1f023b8744d90480bbc3ce110b370df --- /dev/null +++ b/res/drawable/ic_menu_sd_card.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_mode_edit.xml b/res/drawable/ic_mode_edit.xml new file mode 100644 index 0000000000000000000000000000000000000000..97586ccac354ea7e5818dcf3d80266f8800ab5cd --- /dev/null +++ b/res/drawable/ic_mode_edit.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..2a9157dcfb2a49e87f7ea394fd621cefcc0c0745 --- /dev/null +++ b/res/drawable/ic_more_24.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml index 9f7f4fca4689d4aa8b81be691448ee3daaaca5db..8594582cc919a094fb234e5de9a7ba17e4552fbf 100644 --- a/res/drawable/ic_network_cell.xml +++ b/res/drawable/ic_network_cell.xml @@ -7,7 +7,7 @@ - + diff --git a/res/drawable/ic_nfc.xml b/res/drawable/ic_nfc.xml index d9321ac021affed0b4110a9291189a1b24f16154..266874080d2167dffb85ecdd54673da286e08fe9 100644 --- a/res/drawable/ic_nfc.xml +++ b/res/drawable/ic_nfc.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="@color/default_icon_color"/> diff --git a/res/drawable/ic_notifications_off_24dp.xml b/res/drawable/ic_notifications_off_24dp.xml index 3d02bca3b3736a8b9eb2de89436b7df0cf75fb9c..6e5219a4f8bfd2acc2960ba933229c5c43ecc764 100644 --- a/res/drawable/ic_notifications_off_24dp.xml +++ b/res/drawable/ic_notifications_off_24dp.xml @@ -21,7 +21,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" - android:tint="@color/red_1"> + android:tint="@color/color_default_red1"> + android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_open_wifi_notifications.xml b/res/drawable/ic_open_wifi_notifications.xml index 5435bdb476a33bc68a82a6fc65a7ca132235c8cd..60b16f0d04c5f27126800c26bce5bec436784578 100644 --- a/res/drawable/ic_open_wifi_notifications.xml +++ b/res/drawable/ic_open_wifi_notifications.xml @@ -17,21 +17,20 @@ 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"> + android:fillColor="@color/default_icon_color" /> + android:fillColor="@color/default_icon_color" /> + android:fillColor="@color/default_icon_color" /> + android:fillColor="@color/default_icon_color" /> + android:fillColor="@color/default_icon_color" /> diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml index 57591c2e8721cbe8489e6db40751361c3c11434a..294e6f4fe08cb14b3569709e37075a57bdfe30bb 100644 --- a/res/drawable/ic_password.xml +++ b/res/drawable/ic_password.xml @@ -20,15 +20,15 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_pattern.xml b/res/drawable/ic_pattern.xml index 003111ea6a7c2c5260ec99c07bbece7ba8bc4138..70a1a9397b945e87853f6277b33a167953c92271 100644 --- a/res/drawable/ic_pattern.xml +++ b/res/drawable/ic_pattern.xml @@ -20,18 +20,18 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_perm_alarm.xml b/res/drawable/ic_perm_alarm.xml index 3bb90b8a4692f52930a5a878f64d561195a6e01b..edf05cee074f92b9ca18a9bb9875766338b28ec1 100644 --- a/res/drawable/ic_perm_alarm.xml +++ b/res/drawable/ic_perm_alarm.xml @@ -17,9 +17,8 @@ android:height="24.0dp" android:width="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_audio.xml b/res/drawable/ic_perm_audio.xml index 3b9c4d22ceb39426244f5d248e927fcc08475dab..dabd0a12320f9408fcc0bf665d7fd29c49ca8d2d 100644 --- a/res/drawable/ic_perm_audio.xml +++ b/res/drawable/ic_perm_audio.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_background.xml b/res/drawable/ic_perm_background.xml index 8d4ab892f67eeeece8c728a7e3243ec61b9232ac..0f26653f739afdeb1be21f3d3311c6841e190631 100644 --- a/res/drawable/ic_perm_background.xml +++ b/res/drawable/ic_perm_background.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_bluetooth.xml b/res/drawable/ic_perm_bluetooth.xml index f68ba29959313d25211072df9f87e1a3294ffa94..fc0a67a6daf7c26dabe33c224f600baf45fd6970 100644 --- a/res/drawable/ic_perm_bluetooth.xml +++ b/res/drawable/ic_perm_bluetooth.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_boot.xml b/res/drawable/ic_perm_boot.xml index 197877a61545b74669f7c9264ee078be8e11f2e9..746f9189926c4c8cf6bcf32af037f2a3bf2f32b0 100644 --- a/res/drawable/ic_perm_boot.xml +++ b/res/drawable/ic_perm_boot.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_clipboard.xml b/res/drawable/ic_perm_clipboard.xml index d9a3c4bce85d20eaecbf0699d40a58f737b39056..bac8df3a6966c7ece4c474496e72f7258686b8d5 100644 --- a/res/drawable/ic_perm_clipboard.xml +++ b/res/drawable/ic_perm_clipboard.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_data.xml b/res/drawable/ic_perm_data.xml index d258b49c8c7ebd0e4e17331a3047604859a17903..ce99a6e11f65ea46d00d1cfe0827228c7df38d37 100644 --- a/res/drawable/ic_perm_data.xml +++ b/res/drawable/ic_perm_data.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_drawontop.xml b/res/drawable/ic_perm_drawontop.xml index 170de0cbd2efd021a4a5ce8684f1288a45fd873c..e11ea4847bf7d7d84086f86254aface0e1414111 100644 --- a/res/drawable/ic_perm_drawontop.xml +++ b/res/drawable/ic_perm_drawontop.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_location.xml b/res/drawable/ic_perm_location.xml index 3cba6846d2af2b1a1d19b0a4393b5bfb000859f2..d65b8da12ae0f9c6ef340c51d4bd5913f34a532f 100644 --- a/res/drawable/ic_perm_location.xml +++ b/res/drawable/ic_perm_location.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_microphone.xml b/res/drawable/ic_perm_microphone.xml index d8063ab63c8390dbf6d3918759bcbb058d396d59..c28ac427da12c1b7607baf2c0ff247043cb1a8f4 100644 --- a/res/drawable/ic_perm_microphone.xml +++ b/res/drawable/ic_perm_microphone.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_nfc.xml b/res/drawable/ic_perm_nfc.xml index bbc1732b9f373eadbc3b7c2f21291cf042f02d8b..b3e809851d059eb52903df67957d2f1f359c9a49 100644 --- a/res/drawable/ic_perm_nfc.xml +++ b/res/drawable/ic_perm_nfc.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_nosleep.xml b/res/drawable/ic_perm_nosleep.xml index 1483f1f8644036aeeb8c5dd6195cfbc7349b883e..b873bd7f97543ac9deaed612878fbbbe0766ff4b 100644 --- a/res/drawable/ic_perm_nosleep.xml +++ b/res/drawable/ic_perm_nosleep.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_notifications.xml b/res/drawable/ic_perm_notifications.xml index c6f27cdea4864ab72b8525caf2233f5043e7d4cd..f9f5e31717885ecf015d9e2a6d6b8d07d7c072fc 100644 --- a/res/drawable/ic_perm_notifications.xml +++ b/res/drawable/ic_perm_notifications.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_settings.xml b/res/drawable/ic_perm_settings.xml index 7562a76773c1f57f14777b6df90b6ee7b6cf5b4f..c07657e81cf0d5bb68853d5aeb68a576702d148d 100644 --- a/res/drawable/ic_perm_settings.xml +++ b/res/drawable/ic_perm_settings.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_sms.xml b/res/drawable/ic_perm_sms.xml index 25b639326812d188605b7f4e9dccdb4b7f22bf64..0718d04788164d7e6f9027e92afb5984ec02e1c1 100644 --- a/res/drawable/ic_perm_sms.xml +++ b/res/drawable/ic_perm_sms.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_su.xml b/res/drawable/ic_perm_su.xml index 0ae4ef2007352ef0cdf55365acb6f3e48ff84f14..88b672304a0d142818c184459d021be5fb87008e 100644 --- a/res/drawable/ic_perm_su.xml +++ b/res/drawable/ic_perm_su.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_turnscreenon.xml b/res/drawable/ic_perm_turnscreenon.xml index e68ed6c3bb77e4004a97d0162a1dd3dcd30064c7..08baf65d7f46808e49da0f3f77cc847ecefc7237 100644 --- a/res/drawable/ic_perm_turnscreenon.xml +++ b/res/drawable/ic_perm_turnscreenon.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_vibrate.xml b/res/drawable/ic_perm_vibrate.xml index 15dade2fef9ed3299c08aec9696a37c4dbb68487..7c3cc0771fefcfd6344bffd88bf410d303dff9d8 100644 --- a/res/drawable/ic_perm_vibrate.xml +++ b/res/drawable/ic_perm_vibrate.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_vpn.xml b/res/drawable/ic_perm_vpn.xml index 0050c228583ffc2ec0a94736f32249beab03bdae..54e795e6e6560f11b38fae88d2cfd23388a76c7f 100644 --- a/res/drawable/ic_perm_vpn.xml +++ b/res/drawable/ic_perm_vpn.xml @@ -17,10 +17,9 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_perm_wifi.xml b/res/drawable/ic_perm_wifi.xml index db5b4778c7bbb74b026a17cc0d8f095541daf372..16b7fa6aac4982c5f986a5e00cf1115be59456d4 100644 --- a/res/drawable/ic_perm_wifi.xml +++ b/res/drawable/ic_perm_wifi.xml @@ -17,9 +17,8 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="#FF000000"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_phone_info.xml b/res/drawable/ic_phone_info.xml index 7aee3e86ebca44995ddbfa5f003ac1693a77a436..57f07b3f6cf897af6365f4a40398a3cc3b8c7ec5 100644 --- a/res/drawable/ic_phone_info.xml +++ b/res/drawable/ic_phone_info.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_photo_library.xml b/res/drawable/ic_photo_library.xml index a60b05a4b4b220dfc5af6a5c8a94d95db856c01b..358e017d2ba3dae900388cf26d242c4289e0086d 100644 --- a/res/drawable/ic_photo_library.xml +++ b/res/drawable/ic_photo_library.xml @@ -7,7 +7,7 @@ + android:fillColor="@color/color_icon_background_blue"/> diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml new file mode 100644 index 0000000000000000000000000000000000000000..d2d664e3c50242630b73795532f26b8963451698 --- /dev/null +++ b/res/drawable/ic_print.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml new file mode 100644 index 0000000000000000000000000000000000000000..779679132fe7f10801a610188bb85ef76c8089d1 --- /dev/null +++ b/res/drawable/ic_print_error.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_private_dns.xml b/res/drawable/ic_private_dns.xml index a94fd380f8ee3a647231dfa6eeea85c8137d5c80..6a49334155b623f7e0ba2c80c0cfe4a924133c7a 100644 --- a/res/drawable/ic_private_dns.xml +++ b/res/drawable/ic_private_dns.xml @@ -6,7 +6,7 @@ diff --git a/res/drawable/ic_remove_24dp.xml b/res/drawable/ic_remove_24dp.xml index 923362360a5b7bcc1d7da74d570e3a9b1f37d156..db625c108d14a7642a55ba5723b17b611d8c3311 100644 --- a/res/drawable/ic_remove_24dp.xml +++ b/res/drawable/ic_remove_24dp.xml @@ -17,9 +17,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="48" - android:viewportHeight="48" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="48"> diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml index 8312acafdd84c688902ef7be13e5f812d0572d01..622ab78c240e5204df8a1d8a4f1e6e0331ae3bb3 100644 --- a/res/drawable/ic_restore.xml +++ b/res/drawable/ic_restore.xml @@ -6,7 +6,7 @@ diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml index 8f14e888f717fbbc3c47cb5499466df71ff39096..a23060fbc9b017fbc34c03d681857138bd7f5301 100644 --- a/res/drawable/ic_search_24dp.xml +++ b/res/drawable/ic_search_24dp.xml @@ -19,11 +19,10 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_security_lock_24dp.xml b/res/drawable/ic_security_lock_24dp.xml index fd49b23fcf13b6be4a6cab6637fefc1a5fc6f7a7..15835b2ee43d7a64c109bacddb7f4354d2206eb9 100644 --- a/res/drawable/ic_security_lock_24dp.xml +++ b/res/drawable/ic_security_lock_24dp.xml @@ -18,9 +18,8 @@ android:viewportWidth="24" android:viewportHeight="24" android:width="24dp" - android:height="24dp" - android:tint="@color/wifi_details_icon_color"> + android:height="24dp"> + android:fillColor="@color/default_icon_color" /> diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml index 44a4c2ed7467e8919fad1756dafb9ae8caf2967e..178687c0de65e4978a83dcf39c49cb69ead1c505 100644 --- a/res/drawable/ic_settings.xml +++ b/res/drawable/ic_settings.xml @@ -7,7 +7,7 @@ + android:fillColor="@color/color_icon_background_blue"/> + android:fillColor="@color/color_icon_background_blue"/> diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml index 231eadd91eb4916cb047c867e9f95d58e73fa705..54efd17b47647584d00b265d9b92245816eceb5d 100644 --- a/res/drawable/ic_settings_backup.xml +++ b/res/drawable/ic_settings_backup.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"> diff --git a/res/drawable/ic_settings_backup_restore.xml b/res/drawable/ic_settings_backup_restore.xml index 245b0fcc855ab0969628d5084bfac8f6083fa9ff..8fa76854f004bd11cd9393d550bd9a45ec14b71b 100644 --- a/res/drawable/ic_settings_backup_restore.xml +++ b/res/drawable/ic_settings_backup_restore.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="@color/default_icon_color"/> diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml index f93ab968077bcfeefcb54380e9679c84f842c8d9..5f9b87adf908aac61abcdb319a212e9549f82ec6 100644 --- a/res/drawable/ic_settings_bluetooth.xml +++ b/res/drawable/ic_settings_bluetooth.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> - - + diff --git a/res/drawable/ic_settings_language.xml b/res/drawable/ic_settings_language.xml index 962bfe0a9d55237807cdfa5b3e270edc6f0e712b..5f90b07d1cfb65acff83dda52343a53808d136ff 100644 --- a/res/drawable/ic_settings_language.xml +++ b/res/drawable/ic_settings_language.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml index 178b131554586a40711dc68d25e2009c930e265a..ff02f85f398a453d190a4fe91e5b8bba68fe6027 100644 --- a/res/drawable/ic_settings_night_display.xml +++ b/res/drawable/ic_settings_night_display.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"> \ No newline at end of file diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml index 308d09fb72f28b9ac431349c0560dffbe2a107b5..001c3c6b03ad451a3cf11c592c4376a1b6ed7a30 100644 --- a/res/drawable/ic_settings_print.xml +++ b/res/drawable/ic_settings_print.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_widget_background.xml b/res/drawable/ic_settings_widget_background.xml index 6d81d47c71008b046b6d4b591d2def5a161d04f4..1ad242541c1ca25c037097c7c8eaa83b614a0db8 100644 --- a/res/drawable/ic_settings_widget_background.xml +++ b/res/drawable/ic_settings_widget_background.xml @@ -17,7 +17,8 @@ android:viewportWidth="192" android:viewportHeight="192" android:width="72dp" - android:height="72dp"> + android:height="72dp" + android:tint="@color/color_default_foreground"> diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml index 0cc986b48ac907c7e08a8300b98d247b3d95bb32..f49a426893a0c937a84470dd5cfb9f0845f2526e 100644 --- a/res/drawable/ic_settings_wireless.xml +++ b/res/drawable/ic_settings_wireless.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_shortcut_data_usage.xml b/res/drawable/ic_shortcut_data_usage.xml index 36a148cb215d79cdb55434c8df55388274d19336..2141accbfed369ce725c42e6d9a454e032f86c4b 100644 --- a/res/drawable/ic_shortcut_data_usage.xml +++ b/res/drawable/ic_shortcut_data_usage.xml @@ -24,7 +24,7 @@ android:viewportHeight="78.0"> diff --git a/res/drawable/ic_shortcut_wireless.xml b/res/drawable/ic_shortcut_wireless.xml index 2fd05a55816b9740aee2a0425244b108718b944d..8adc007b1cbbdc9a154ff926579a365f3d09e8fe 100644 --- a/res/drawable/ic_shortcut_wireless.xml +++ b/res/drawable/ic_shortcut_wireless.xml @@ -24,7 +24,7 @@ android:viewportHeight="78.0"> diff --git a/res/drawable/ic_signal_location.xml b/res/drawable/ic_signal_location.xml new file mode 100644 index 0000000000000000000000000000000000000000..d8c5d05c6caa97365bd42b52d6fcb60650cfcfcc --- /dev/null +++ b/res/drawable/ic_signal_location.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/ic_signal_workmode_enable.xml b/res/drawable/ic_signal_workmode_enable.xml index f7e8c806b1b5dec1c6bd1e2c6c0626d93ce5acff..47288d7c101691df8f99b155e306c562832486ea 100644 --- a/res/drawable/ic_signal_workmode_enable.xml +++ b/res/drawable/ic_signal_workmode_enable.xml @@ -5,5 +5,5 @@ android:viewportHeight="42.0"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_skip.xml b/res/drawable/ic_skip.xml index 43762156f6e1221b7f74749c8f62b52d69af2276..73df047cc01b6176308fe4bfaa231ed86fba8e65 100644 --- a/res/drawable/ic_skip.xml +++ b/res/drawable/ic_skip.xml @@ -21,6 +21,6 @@ android:viewportHeight="24" android:autoMirrored="true"> diff --git a/res/drawable/ic_storage.xml b/res/drawable/ic_storage.xml index 55e66c3d8bce0bc2ca147b6608798eec2426bcf6..4a9729398896e0e70068173e54192f23b420a169 100644 --- a/res/drawable/ic_storage.xml +++ b/res/drawable/ic_storage.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"> diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml index 99e2698633d762016e50d49bb751f7e341512037..22c4f234dafd1ad288b52267c4cccb9fca5b7a70 100644 --- a/res/drawable/ic_storage_wizard_external.xml +++ b/res/drawable/ic_storage_wizard_external.xml @@ -76,13 +76,13 @@ android:pathData="M73.63,41L68.13,41L64.01,45.2L64,53.6C64,54.37 64.62,55 65.38,55L73.63,55C74.38,55 75,54.37 75,53.6L75,42.4C75,41.63 74.38,41 73.63,41ZM69.5,45.2L68.13,45.2L68.13,42.4L69.5,42.4L69.5,45.2ZM71.56,45.2L70.19,45.2L70.19,42.4L71.56,42.4L71.56,45.2ZM73.63,45.2L72.25,45.2L72.25,42.4L73.63,42.4L73.63,45.2Z" android:strokeColor="#00000000" android:fillType="nonZero" - android:fillColor="?android:attr/colorAccent" + android:fillColor="@color/color_icon_background_blue" android:strokeWidth="1"/> diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml index 615b21567370186510f734c099e2c981bfd24cb9..99aeecef687609785ca700eb0cf1d82cb08abd49 100644 --- a/res/drawable/ic_suggestion_close_button.xml +++ b/res/drawable/ic_suggestion_close_button.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml index bf5ee2effe715e6d25caeccd83919c6a1cdc25bb..dc80cfd5ddb5dd29e6cf524b07972d16937de7a4 100644 --- a/res/drawable/ic_suggestion_fingerprint.xml +++ b/res/drawable/ic_suggestion_fingerprint.xml @@ -18,23 +18,22 @@ diff --git a/res/drawable/ic_supervisor.xml b/res/drawable/ic_supervisor.xml new file mode 100644 index 0000000000000000000000000000000000000000..60fc60be8d46bcb7f006eb865e07e207502ca3a7 --- /dev/null +++ b/res/drawable/ic_supervisor.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_support_24dp.xml b/res/drawable/ic_support_24dp.xml index b7e2f53f0224728f30ac7b8bbcaea689575fc784..da605deca8905b6fe3799dc4c99cc27d90ed8c41 100644 --- a/res/drawable/ic_support_24dp.xml +++ b/res/drawable/ic_support_24dp.xml @@ -20,10 +20,9 @@ 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="@color/default_icon_color"/> diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml index 45a2dbdb9110f17ea57ab2fb8e92e0eacae28d72..f6485593b3070d22437384153de8b3912fc2efb4 100644 --- a/res/drawable/ic_sync.xml +++ b/res/drawable/ic_sync.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="@color/default_icon_color"/> diff --git a/res/drawable/ic_timelapse.xml b/res/drawable/ic_timelapse.xml index ba97bae8c907384c8562c830e27a84f01c7563eb..20ed27287263b99f983fffd1a30a0c41f33b1f8a 100644 --- a/res/drawable/ic_timelapse.xml +++ b/res/drawable/ic_timelapse.xml @@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project + android:color="@color/color_icon_background_blue" /> diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml index 962bfe0a9d55237807cdfa5b3e270edc6f0e712b..5f90b07d1cfb65acff83dda52343a53808d136ff 100644 --- a/res/drawable/ic_translate_24dp.xml +++ b/res/drawable/ic_translate_24dp.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml index 20da9c33a6625508459cb71addd2db822be2b4bb..98f9545e4f665990fa73dd7caf3e2bf4605283a7 100644 --- a/res/drawable/ic_wallpaper.xml +++ b/res/drawable/ic_wallpaper.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_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml index 2ca48e0fb068a98bf8b7934c2d9dccfb463b8ec0..d19b36aeefedb8fe69e47b1ed1369688caf77969 100644 --- a/res/drawable/ic_warning_24dp.xml +++ b/res/drawable/ic_warning_24dp.xml @@ -19,10 +19,10 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml index 9c0a9845d939eb7df3d5ad8561b6f9c19643bc09..2f58964f6f0de5211ee28bd673f114690e913207 100644 --- a/res/drawable/ic_wifi_signal_lock.xml +++ b/res/drawable/ic_wifi_signal_lock.xml @@ -7,13 +7,13 @@ \ No newline at end of file diff --git a/res/drawable/ic_wifi_tethering.xml b/res/drawable/ic_wifi_tethering.xml index 3c5dd449af0e0ad5df6ee5e6f93b046f93c1ddc5..89935c00268549d351843e08ed3d7de97894b901 100644 --- a/res/drawable/ic_wifi_tethering.xml +++ b/res/drawable/ic_wifi_tethering.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> + android:color="@color/color_default_background" /> diff --git a/res/drawable/tile_icon_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml index 4a7c708fb4542177b1d08256c72d7b5f8c07013f..05acb14e870acc30ffe3de4e1e7cd97252853b30 100644 --- a/res/drawable/tile_icon_animation_speed.xml +++ b/res/drawable/tile_icon_animation_speed.xml @@ -17,9 +17,8 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/tile_icon_force_rtl.xml b/res/drawable/tile_icon_force_rtl.xml index e87bddeeb0e28236323e3a2db344017527423647..4ec02e9ebd508d0cde7ae52f2da404d298afcc3a 100644 --- a/res/drawable/tile_icon_force_rtl.xml +++ b/res/drawable/tile_icon_force_rtl.xml @@ -17,45 +17,50 @@ Copyright (C) 2017 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/res/drawable/tile_icon_graphics.xml b/res/drawable/tile_icon_graphics.xml index af611aca947da801c9ee49ee845dcdda8dbaec49..6b6bb1bbf9b16a88c90ae90630b654459c3e7e02 100644 --- a/res/drawable/tile_icon_graphics.xml +++ b/res/drawable/tile_icon_graphics.xml @@ -17,37 +17,36 @@ Copyright (C) 2015 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/tile_icon_show_layout.xml b/res/drawable/tile_icon_show_layout.xml index e23b24cd945fe2f818942c7c052be68951f79839..c9321872aaa62bfdcbcf18fde7314f6e926fa6f1 100644 --- a/res/drawable/tile_icon_show_layout.xml +++ b/res/drawable/tile_icon_show_layout.xml @@ -17,45 +17,50 @@ Copyright (C) 2015 The Android Open Source Project android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/tile_icon_winscope_trace.xml b/res/drawable/tile_icon_winscope_trace.xml index 256304944768d9706e7909144c33b1d3867964cf..0df01871442ce68c0c77505c2c0757b8a1455765 100644 --- a/res/drawable/tile_icon_winscope_trace.xml +++ b/res/drawable/tile_icon_winscope_trace.xml @@ -17,13 +17,12 @@ 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="@color/default_icon_color"/> + android:fillColor="@color/default_icon_color"/> diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml index 4d6f798c39c8dc868be4134f91a5d32b0082a8a7..0c8a0fc293f23f5a6683dafe806e7a13f1fff75c 100644 --- a/res/layout-land/choose_lock_pattern.xml +++ b/res/layout-land/choose_lock_pattern.xml @@ -67,6 +67,7 @@ diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml index 9c90d6fd548523f256a6061c3421aae4e25cb10b..a0f53f099bc24bd810680d0bf738f19f7794c81f 100644 --- a/res/layout-land/confirm_lock_pattern_normal.xml +++ b/res/layout-land/confirm_lock_pattern_normal.xml @@ -50,11 +50,13 @@ diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index 2c94524069eae444bbba44b5b861ce0d0f729924..e9c456974d8bb482ebf6437f2f0c5dc69f283d0d 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -36,6 +36,7 @@ diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml index 77dd12d6dbc0b41d339efef5bc50fdbd8e430dc7..c4b9c529761c162bd4857129cf164ea0817dcf21 100644 --- a/res/layout/choose_lock_pattern_common.xml +++ b/res/layout/choose_lock_pattern_common.xml @@ -50,6 +50,7 @@ @@ -72,6 +73,7 @@ diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml index 8cc8db448e0bc62bdb0661e9c3adccebf4b52bde..357cee2147f440aec713201e9d224bfcf47af83a 100644 --- a/res/layout/empty_printers_list_service_enabled.xml +++ b/res/layout/empty_printers_list_service_enabled.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="12dip" - android:src="@drawable/ic_grayedout_printer" + android:src="@drawable/ic_print" android:importantForAccessibility="no"> diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml index f827e37371c8eb4c4f03e513f4873e0b3b718b00..995bc2a2f922f0ad1ed0b1f29f3464afb11e1fd4 100644 --- a/res/layout/encryption_interstitial.xml +++ b/res/layout/encryption_interstitial.xml @@ -34,6 +34,7 @@ diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml index ffdd623d5fb1e5b929a8f80a8552b6131b678c45..1fdff8d693b83b55a8273bfffedad87e688ec20f 100644 --- a/res/layout/filter_spinner_item.xml +++ b/res/layout/filter_spinner_item.xml @@ -23,6 +23,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="marquee" - android:textColor="?android:attr/colorForegroundInverse" + android:textColor="@color/color_default_primary_text" android:textAppearance="@style/TextAppearance.Switch" android:textAlignment="inherit" /> diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml index 00a452ca8e894155dc774fda39fbafa2ad6cea9a..41e5b595b870fe91180a62a2d94f14b7e70f4140 100644 --- a/res/layout/fingerprint_enroll_enrolling_base.xml +++ b/res/layout/fingerprint_enroll_enrolling_base.xml @@ -40,6 +40,7 @@ @@ -42,6 +43,7 @@ diff --git a/res/layout/multi_sim_dialog.xml b/res/layout/multi_sim_dialog.xml index d0e7df8758d47fc373ef766eeacc36c9c920756b..fa7a148bc5f23abf518793f7b5665722dfdbd1d4 100644 --- a/res/layout/multi_sim_dialog.xml +++ b/res/layout/multi_sim_dialog.xml @@ -44,7 +44,6 @@ android:hint="@string/sim_name_hint" android:inputType="textNoSuggestions" android:maxLength="@integer/sim_name_length" - android:textColor="@android:color/black" style="?android:attr/textAppearanceMedium" /> @@ -82,7 +81,6 @@ android:text="@string/sim_editor_carrier" /> diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml index 1036e247eaf3b4836498e177ab82ba5e72be5bc0..b09a7595b2fc3ae0259c446e9847ee8ddeba3ff3 100644 --- a/res/layout/printer_dropdown_item.xml +++ b/res/layout/printer_dropdown_item.xml @@ -78,7 +78,6 @@ android:paddingLeft="16dip" android:contentDescription="@string/printer_info_desc" android:src="@drawable/ic_info" - android:tint="?android:attr/colorControlNormal" android:tintMode="src_in" /> diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml index 939ff92b9ac99f9b51cf743e2f02e9f1a57b11f9..bea94091e35a036ef536a93ddd9e56980d1f29fd 100644 --- a/res/layout/redaction_interstitial.xml +++ b/res/layout/redaction_interstitial.xml @@ -36,6 +36,7 @@ @@ -50,6 +51,7 @@ \ No newline at end of file diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml index c430d6de126667debc3cdf86a1a94733486776ba..0d31f17b4e120684ef663d21f49c1b3d126ab04f 100644 --- a/res/layout/settings_main_dashboard.xml +++ b/res/layout/settings_main_dashboard.xml @@ -40,7 +40,7 @@ android:id="@+id/search_action_bar" android:layout_width="match_parent" android:layout_height="@dimen/search_bar_height" - android:background="?android:attr/selectableItemBackground" + android:background="@color/color_default_foreground" android:contentInsetStartWithNavigation="64dp" android:navigationIcon="@drawable/ic_search_24dp" android:theme="?android:attr/actionBarTheme"> diff --git a/res/layout/setup_choose_lock_generic_fingerprint_header.xml b/res/layout/setup_choose_lock_generic_fingerprint_header.xml index ec5d750f896efb37f6256dcda338c07925f724f4..7f7c795a40e074c8c2530fd2fee2e1e9e079d166 100644 --- a/res/layout/setup_choose_lock_generic_fingerprint_header.xml +++ b/res/layout/setup_choose_lock_generic_fingerprint_header.xml @@ -17,6 +17,7 @@ diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml index 29e125ba9abb1cfb73341909d54b27a360cd06a2..1b1b7204b46c2b46af7e9960160944b80ce30d6d 100644 --- a/res/layout/switch_bar.xml +++ b/res/layout/switch_bar.xml @@ -46,8 +46,7 @@ android:id="@+id/switch_widget" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:theme="@style/Widget.SwitchBar.Switch" /> + android:layout_gravity="center_vertical" /> diff --git a/res/layout/user_credential_preference.xml b/res/layout/user_credential_preference.xml index 3671b7fac5b72a2cab36e3f5a5d099d40dbe599e..9c8a72886ac805af46dd114b033cd032e7e2dab4 100644 --- a/res/layout/user_credential_preference.xml +++ b/res/layout/user_credential_preference.xml @@ -28,8 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="?android:attr/listPreferredItemPaddingStart" - android:src="@android:drawable/ic_lock_lock" - android:tint="?android:attr/colorAccent"/> + android:src="@drawable/ic_lock_lock"/> diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml index 92241af4551cd958a1f26866ebe91e6d1853972c..6df42c4260d9a60e7534683ae438236ef4ad5b92 100644 --- a/res/menu/time_zone_base_search_menu.xml +++ b/res/menu/time_zone_base_search_menu.xml @@ -19,7 +19,7 @@ diff --git a/res/values-night/bools.xml b/res/values-night/bools.xml new file mode 100644 index 0000000000000000000000000000000000000000..694fbea0bb29ea4545b58c7bbfdaea557e04b7ec --- /dev/null +++ b/res/values-night/bools.xml @@ -0,0 +1,19 @@ + + + + + false + diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..75068f23a562acd7d43710491c3fe23a8a78d727 --- /dev/null +++ b/res/values-night/colors.xml @@ -0,0 +1,4 @@ + + + #DEFFFFFF + \ No newline at end of file diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..c6fe28d019fc48a30081bf9ec8452860af027d23 --- /dev/null +++ b/res/values-night/themes.xml @@ -0,0 +1,23 @@ + + + + + + + + \ No newline at end of file diff --git a/res/values/bools.xml b/res/values/bools.xml index 29de06bceae081ce1134e61f10cdbaef7cbdb435..ff27412ff3305fcfe1217cfb049d6ed13d62f6ec 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -176,4 +176,6 @@ false + + true diff --git a/res/values/colors.xml b/res/values/colors.xml index d2cb66feb80912754d80033cc085b44e8b7aa8da..e864c6fd3281bea2af2942eb3ab42aad5ce0a1cb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -15,127 +15,146 @@ --> - #000 - #F00 - #00F - - #FFCED7DB - - #8a000000 + @lineageos.platform:color/color_default_accent + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary_dark + @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_foreground + @lineageos.platform:color/color_default_divider + @lineageos.platform:color/color_default_selector + @lineageos.platform:color/color_default_blue1 + @lineageos.platform:color/color_default_blue2 + @lineageos.platform:color/color_default_red1 + @lineageos.platform:color/color_default_orange1 + @lineageos.platform:color/color_default_green1 + @lineageos.platform:color/color_default_gray1 + @lineageos.platform:color/color_default_gray2 + @lineageos.platform:color/color_default_view_on_accent + + #0088ED + + @color/color_default_red1 + + @color/color_default_foreground + + @color/color_default_primary_text #ff9a9a9a #ff666666 #ff9a9a9a #70606060 - #20ffffff - @android:color/holo_blue_light - #ffbdbdbd + @color/color_default_divider + @color/color_default_primary_text + @color/color_default_accent @color/lock_pattern_view_regular_color - #ff84ffff - @color/suw_color_accent_light - #fff44336 - #89ffffff - #89000000 + @color/color_default_accent + @color/color_default_accent + @color/color_default_red1 + @color/color_default_accent + @color/color_default_accent - #00000000 - #ff37474f + @color/color_default_background + @color/color_default_accent - #ffffff + @color/color_default_accent - @android:color/white + @color/color_default_background - ?android:attr/colorAccent - #ffffffff - #de000000 + @color/color_default_background + @color/color_default_primary_text + @color/color_default_secondary_text - #ff384248 - #ffced7db + @color/color_default_accent + @color/color_default_gray1 - #ffe0e0e0 - @*android:color/accent_device_default_light + @color/color_default_divider + @color/color_default_accent #60000000 - #33b5e5 + @color/color_default_accent - #ff009587 + @color/color_default_accent #ffF3B300 - #ffff9700 - #ffff5621 + @color/color_default_orange1 + @color/color_default_red1 - #ff384248 + @color/color_default_gray1 - #ffabffec + @color/color_default_accent - #8a000000 - #4d000000 + @color/color_default_accent + @color/color_default_gray1 - #4285F4 - #3367D6 - #f5f5f5 - #ffffff - #ff80868B - - - #ffffffff - #ff323232 - #99323232 - #99ffffff - #689f38 - #ffffffff - #eeeeee - #689f38 - #ffffffff - #4285f4 - #ffffffff - - #B0BEC5 + @color/color_default_blue1 + @color/color_default_blue2 + @color/color_default_gray1 + @color/color_default_gray2 + @color/color_default_gray2 + + + @color/color_default_primary_text + @color/color_default_secondary_text + @color/color_default_secondary_text + @color/color_default_primary_text + @color/color_default_green1 + @color/color_default_primary_text + @color/color_default_foreground + @color/color_default_green1 + @color/color_default_view_on_accent + @color/color_default_accent + @color/color_default_view_on_accent + + @color/color_default_accent - #ffffff + @color/color_default_background - #3c3c3c + @color/color_default_primary_dark - #fff5f5f5 + @color/color_default_background - @*android:color/accent_device_default_dark + @color/color_default_accent - #89000000 + @color/default_icon_color - #10000000 - #05000000 + @color/color_default_foreground + @color/color_default_foreground - #2196F3 - #72B70F - #FF7E0F - #258982 - #FFA727 - #01B1AF - #C14CE6 - #0F9D58 - #F15B8D - #5011C1 - #9E9E9E - #9FA8DA - #26459C - #1A73E8 + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_background + @color/color_default_foreground + @color/color_default_foreground - @*android:color/material_red_A700 + @color/color_default_red1 - #43a047 - #ef6c00 - #f44336 - #4caf50 - #fdd835 - #f44336 + @color/color_default_green1 + @color/color_default_orange1 + @color/color_default_red1 + @color/color_default_green1 + @color/color_default_orange1 + @color/color_default_red1 + #DE000000 diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml index a4c11850f79a363bbbeeb1c7ff7902f30fcca8e3..da858890af380b3a0dcb2f08cacc483d525599c6 100644 --- a/res/values/lineage_colors.xml +++ b/res/values/lineage_colors.xml @@ -16,7 +16,7 @@ --> - @*android:color/accent_device_default_light + @color/color_default_accent #ffab47bc #fff2a600 #ffec407a diff --git a/res/values/lineage_styles.xml b/res/values/lineage_styles.xml index 1ce2e23597b4f8baf2fea3df29dce45735204077..02f070c8dfbf1619987c1f4abc9121e565fb8914 100644 --- a/res/values/lineage_styles.xml +++ b/res/values/lineage_styles.xml @@ -17,7 +17,7 @@ diff --git a/res/values/styles.xml b/res/values/styles.xml index f82d0e5e8540ca3e35414b377f12bd2462e6338e..fd0ac6097474caf5092bce535b7a5fad474da038 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -78,7 +78,7 @@ @@ -193,14 +193,15 @@ 12sp viewStart @android:style/TextAppearance.Material.Body1 - ?android:attr/colorError + @color/color_default_red1 @@ -412,7 +413,7 @@ - + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 8c3864967e424b35c5540288b00beae2cbe0533e..d4ddb08df5e49af1c49064bdb81c0ce4e63544b4 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -21,111 +21,250 @@ @@ -205,7 +488,27 @@ layouts against a remote context using our local theme colors. Due to the implementation details of Theme, we can't reference any local resources and MUST instead use the values directly. So use #ff263238 instead of @color/theme_primary and so on. --> - + + + + + + + + + diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index fb21deb661d623ef079e78318686e1f3cc0e8806..d29ee0b70d1f998c7a4ad4c8e2186f00374b39ab 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -684,8 +684,8 @@ public class DeviceAdminAdd extends Activity { tv.setMaxLines(mAddMsgEllipsized ? getEllipsizedLines() : MAX_ADD_MSG_LINES); mAddMsgExpander.setImageResource(mAddMsgEllipsized ? - com.android.internal.R.drawable.expander_ic_minimized : - com.android.internal.R.drawable.expander_ic_maximized); + R.drawable.ic_arrow_circle_down : + R.drawable.ic_arrow_circle_up); } int getEllipsizedLines() { diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 533ea4bbf1525e0c3d2479fcd196c7b1f5189892..0ed8f36044da51ba5785fe19a142954a6f2478f5 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -35,6 +35,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; @@ -323,6 +324,7 @@ public class SettingsActivity extends SettingsDrawerActivity actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned); actionBar.setHomeButtonEnabled(deviceProvisioned); actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard); + actionBar.setBackgroundDrawable(new ColorDrawable(getColor(R.color.color_default_primary_dark))); } mSwitchBar = findViewById(R.id.switch_bar); if (mSwitchBar != null) { diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 6b60e87f85c0eb20c56cd94a167231b6922f2e07..e685eade304ad8140de62cf72f0e9461e21aa638 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -217,7 +217,7 @@ public class AccountSyncSettings extends AccountPreferenceBase { .setIcon(R.drawable.ic_menu_refresh_holo_dark); MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel)) - .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel); + .setIcon(R.drawable.ic_cancel_cross); syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT); diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java index d4abe6c4e28597b30e98f9cc1e6c609289608b6d..1c4b05778624e94fbc7bb058d26dc6e5d1fa8f5e 100644 --- a/src/com/android/settings/applications/RunningState.java +++ b/src/com/android/settings/applications/RunningState.java @@ -719,7 +719,7 @@ public class RunningState { } } return context.getDrawable( - com.android.internal.R.drawable.ic_menu_cc); + R.drawable.ic_supervisor); } } diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index fdb20c9535999554e9dcde3c5ee602f265dfcedb..4f899be15425a186888efbd44b04ab79827d3e80 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -92,7 +92,7 @@ public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenc if (mUsageState != null && (Boolean) newValue != mUsageState.isPermissible()) { if (mUsageState.isPermissible() && mDpm.isProfileOwnerApp(mPackageName)) { new AlertDialog.Builder(getContext()) - .setIcon(com.android.internal.R.drawable.ic_dialog_alert_material) + .setIcon(R.drawable.ic_dialog_alert_material) .setTitle(android.R.string.dialog_alert_title) .setMessage(R.string.work_profile_usage_access_warning) .setPositiveButton(R.string.okay, null) diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index eec2008021e1c0fea923d62cc243523d0dd2e82a..afd18937d700a81e39d14358e4c3b87b5652a086 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -256,7 +256,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { if (DEBUG) { menu.add(Menu.NONE, MENU_STATS_TYPE, Menu.NONE, R.string.menu_stats_total) - .setIcon(com.android.internal.R.drawable.ic_menu_info_details) + .setIcon(R.drawable.ic_info_outline_24dp) .setAlphabeticShortcut('t'); } diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index cceb31d29e71081d2989f2ee5cb185b108f19c13..57c13c2a8a45f0720e4ab4c456501d37d66c49da 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -726,7 +726,7 @@ public class ApnEditor extends SettingsPreferenceFragment menu.add(0, MENU_SAVE, 0, R.string.menu_save) .setIcon(android.R.drawable.ic_menu_save); menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel) - .setIcon(android.R.drawable.ic_menu_close_clear_cancel); + .setIcon(R.drawable.ic_cancel_cross); } @Override diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index c16642a60e5ef7c96bb1f84570c746afac8a3cf6..bcf7085c3ffb1b83c18442dce0c59d99bc96b1c8 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -244,8 +244,8 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { switch (info.getState()) { case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { - Drawable icon = getActivity().getDrawable(com.android.internal.R.drawable.ic_print); - icon.setTint(tintColor); + Drawable icon = getActivity().getDrawable(R.drawable.ic_print); + //icon.setTint(tintColor); mPrintJobPreference.setIcon(icon); break; } @@ -253,8 +253,8 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { case PrintJobInfo.STATE_FAILED: case PrintJobInfo.STATE_BLOCKED: { Drawable icon = getActivity().getDrawable( - com.android.internal.R.drawable.ic_print_error); - icon.setTint(tintColor); + R.drawable.ic_print_error); + //icon.setTint(tintColor); mPrintJobPreference.setIcon(icon); break; } diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 21ee360e98ba2fed587d7852f4ad2b3c30416466..b0f5b41f6271b34f1b6273c5595c67a1e3cca9d1 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -210,6 +210,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment Drawable drawable = service.getResolveInfo().loadIcon(pm); if (drawable != null) { + drawable.mutate().setTint(context.getResources().getColor(R.color.color_default_accent)); preference.setIcon(drawable); } @@ -363,8 +364,8 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { Drawable icon = getActivity().getDrawable( - com.android.internal.R.drawable.ic_print); - icon.setTint(tintColor); + R.drawable.ic_print); + //icon.setTint(tintColor); preference.setIcon(icon); break; } @@ -372,8 +373,8 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment case PrintJobInfo.STATE_FAILED: case PrintJobInfo.STATE_BLOCKED: { Drawable icon = getActivity().getDrawable( - com.android.internal.R.drawable.ic_print_error); - icon.setTint(tintColor); + R.drawable.ic_print_error); + //icon.setTint(tintColor); preference.setIcon(icon); break; } diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index c40d4da198f4c35db1af58a4c6561d4a53d00fbb..38c6ce98e0bd95de518a238d3036200a5031ee26 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -317,7 +317,7 @@ public class EntityHeaderController { return this; } actionBar.setBackgroundDrawable( - new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimary))); + new ColorDrawable(Utils.getColorAttr(activity, android.R.attr.colorPrimaryDark))); actionBar.setElevation(0); if (mRecyclerView != null && mLifecycle != null) { ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView); diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index def48e00e54fef5f172fdf6d650b71c893544f33..ba059aefc08b4b3ba14cdc919fbb49a4acab250b 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,6 +17,8 @@ package com.android.settings.wifi; import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.support.annotation.DrawableRes; import android.support.v7.preference.PreferenceViewHolder; import android.view.View; @@ -33,10 +35,12 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem private OnGearClickListener mOnGearClickListener; private boolean mIsCaptivePortal; + private Context mContext; public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks) { super(accessPoint, context, cache, iconResId, forSavedNetworks); + this.mContext = context; } @Override @@ -87,6 +91,14 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem } } + @Override + public void setIcon(Drawable drawable) { + if (drawable != null) { + drawable.setColorFilter(mContext.getColor(R.color.default_icon_color), PorterDuff.Mode.SRC_IN); + } + super.setIcon(drawable); + } + public interface OnGearClickListener { void onGearClick(ConnectedAccessPointPreference p); } diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 93097db3d25d1b0f0bd3b29fa7095896ee374e53..b0117e5b48539c1f8c52db179a72a34b6db59799 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,6 +17,8 @@ package com.android.settings.wifi; import android.app.Fragment; import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.support.v7.preference.PreferenceViewHolder; import android.widget.ImageView; import com.android.settings.R; @@ -26,17 +28,20 @@ import com.android.settingslib.wifi.AccessPointPreference; public class LongPressAccessPointPreference extends AccessPointPreference { private final Fragment mFragment; + private Context mContext; public LongPressAccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache, boolean forSavedNetworks, Fragment fragment) { super(accessPoint, context, cache, forSavedNetworks); mFragment = fragment; + this.mContext = context; } public LongPressAccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache, boolean forSavedNetworks, int iconResId, Fragment fragment) { super(accessPoint, context, cache, iconResId, forSavedNetworks); mFragment = fragment; + this.mContext = mFragment.getContext(); } @Override @@ -48,4 +53,12 @@ public class LongPressAccessPointPreference extends AccessPointPreference { view.itemView.setLongClickable(true); } } + + @Override + public void setIcon(Drawable drawable) { + if (drawable != null) { + drawable.setColorFilter(mContext.getColor(R.color.default_icon_color), PorterDuff.Mode.SRC_IN); + } + super.setIcon(drawable); + } } diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index b10d07ef5ab99a3ce6e5edd69977d9cf70f906ed..efc65260c79ea82908e46ad80f8b1f3f865d25af 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -409,13 +409,10 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController mRssiSignalLevel = signalLevel; Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel); - wifiIcon.setTint(Utils.getColorAccent(mContext)); + wifiIcon.setTint(mContext.getResources().getColor(R.color.default_icon_color)); mEntityHeaderController.setIcon(wifiIcon).done(mFragment.getActivity(), true /* rebind */); - Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate(); - wifiIconDark.setTint(mContext.getResources().getColor( - R.color.wifi_details_icon_color, mContext.getTheme())); - mSignalStrengthPref.setIcon(wifiIconDark); + mSignalStrengthPref.setIcon(wifiIcon); mSignalStrengthPref.setDetailText(mSignalStr[mRssiSignalLevel]); } diff --git a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml index cedf5b9eb624a62923e5f78337165cb51efee3c1..9428c93f83b3454377f11b81a95c6d5450107066 100644 --- a/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml +++ b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml @@ -56,6 +56,7 @@