From 1b2f023059805beaaabafd6ba469341c9f2c3d11 Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 25 Nov 2021 21:20:50 +0600 Subject: [PATCH] 3270-P-UI_revamp issue: https://gitlab.e.foundation/e/backlog/-/issues/3270 --- Android.mk | 3 +- AndroidManifest.xml | 18 +- .../ic_arrow_down_24dp.xml | 5 +- res/drawable/color_bar_progress.xml | 2 +- res/drawable/conversation_message_icon.xml | 2 +- res/drawable/data_sweep_limit.xml | 2 +- res/drawable/data_sweep_warning.xml | 2 +- res/drawable/drag_handle.xml | 5 +- ...fallback_home_unprovisioned_background.xml | 2 +- res/drawable/fingerprint_enroll_finish.xml | 4 +- res/drawable/ic_add.xml | 2 +- res/drawable/ic_add_24dp.xml | 5 +- res/drawable/ic_android.xml | 5 +- res/drawable/ic_apps_alt.xml | 2 +- res/drawable/ic_arrow_circle_down.xml | 10 + res/drawable/ic_arrow_circle_up.xml | 10 + res/drawable/ic_arrow_down_24dp.xml | 5 +- res/drawable/ic_attach_money_black_24dp.xml | 5 +- res/drawable/ic_audio_alarm.xml | 4 +- res/drawable/ic_audio_alarm_mute.xml | 6 +- res/drawable/ic_auto_wifi.xml | 9 +- res/drawable/ic_back.xml | 26 + res/drawable/ic_battery_alert_24dp.xml | 2 +- res/drawable/ic_battery_charging_full.xml | 4 +- res/drawable/ic_battery_circle.xml | 5 +- res/drawable/ic_battery_saver_accent_24dp.xml | 7 +- res/drawable/ic_bt_headphones_a2dp.xml | 11 + res/drawable/ic_bugreport.xml | 5 +- res/drawable/ic_cancel.xml | 4 +- res/drawable/ic_cancel_cross.xml | 10 + res/drawable/ic_cast_24dp.xml | 10 +- res/drawable/ic_cellular_off.xml | 4 +- res/drawable/ic_chevron_right.xml | 2 +- res/drawable/ic_chevron_right_24dp.xml | 2 +- res/drawable/ic_corp_badge.xml | 13 + res/drawable/ic_data_saver.xml | 5 +- res/drawable/ic_delete.xml | 9 +- res/drawable/ic_devices_other.xml | 2 +- res/drawable/ic_devices_other_black.xml | 2 +- res/drawable/ic_dialog_alert_material.xml | 10 + res/drawable/ic_do_not_disturb_on_24dp.xml | 7 +- res/drawable/ic_eject_24dp.xml | 5 +- res/drawable/ic_event.xml | 2 +- res/drawable/ic_expand_less.xml | 5 +- res/drawable/ic_expand_more.xml | 5 +- res/drawable/ic_expand_more_inverse.xml | 5 +- res/drawable/ic_fingerprint.xml | 2 +- res/drawable/ic_fingerprint_24dp.xml | 2 +- res/drawable/ic_fingerprint_header.xml | 2 +- res/drawable/ic_fingerprint_list_icon.xml | 2 +- res/drawable/ic_fingerprint_success.xml | 2 +- res/drawable/ic_folder_vd_theme_24.xml | 2 +- res/drawable/ic_font_size_16dp.xml | 5 +- res/drawable/ic_font_size_24dp.xml | 5 +- res/drawable/ic_frequency_antenna.xml | 5 +- res/drawable/ic_friction_lock_closed.xml | 2 +- res/drawable/ic_friction_money.xml | 2 +- res/drawable/ic_headset_24dp.xml | 5 +- res/drawable/ic_help.xml | 2 +- res/drawable/ic_homepage_accessibility.xml | 2 +- res/drawable/ic_homepage_connected_device.xml | 2 +- res/drawable/ic_homepage_display.xml | 2 +- res/drawable/ic_homepage_network.xml | 2 +- res/drawable/ic_homepage_storage.xml | 2 +- res/drawable/ic_homepage_system_dashboard.xml | 2 +- res/drawable/ic_hotspot.xml | 2 +- res/drawable/ic_info.xml | 10 + res/drawable/ic_keyboard.xml | 10 + res/drawable/ic_label.xml | 2 +- res/drawable/ic_lightbulb_outline_24.xml | 5 +- res/drawable/ic_lock_lock.xml | 10 + res/drawable/ic_media_stream_off.xml | 4 +- res/drawable/ic_menu_add.xml | 2 +- res/drawable/ic_menu_add_inset.xml | 5 +- res/drawable/ic_menu_add_white.xml | 5 +- res/drawable/ic_menu_sd_card.xml | 10 + res/drawable/ic_mode_edit.xml | 10 + res/drawable/ic_more_24.xml | 10 + res/drawable/ic_network_cell.xml | 2 +- .../ic_new_device_suggestion_24dp.xml | 5 +- res/drawable/ic_nfc.xml | 5 +- res/drawable/ic_notifications_off_24dp.xml | 2 +- res/drawable/ic_open_wifi_autoconnect.xml | 5 +- res/drawable/ic_open_wifi_notifications.xml | 13 +- res/drawable/ic_password.xml | 8 +- res/drawable/ic_pattern.xml | 10 +- res/drawable/ic_perm_alarm.xml | 5 +- res/drawable/ic_perm_audio.xml | 5 +- res/drawable/ic_perm_background.xml | 5 +- res/drawable/ic_perm_bluetooth.xml | 5 +- res/drawable/ic_perm_boot.xml | 5 +- res/drawable/ic_perm_clipboard.xml | 5 +- res/drawable/ic_perm_data.xml | 5 +- res/drawable/ic_perm_drawontop.xml | 5 +- res/drawable/ic_perm_location.xml | 5 +- res/drawable/ic_perm_microphone.xml | 5 +- res/drawable/ic_perm_nfc.xml | 5 +- res/drawable/ic_perm_nosleep.xml | 5 +- res/drawable/ic_perm_notifications.xml | 5 +- res/drawable/ic_perm_settings.xml | 5 +- res/drawable/ic_perm_sms.xml | 5 +- res/drawable/ic_perm_su.xml | 5 +- res/drawable/ic_perm_turnscreenon.xml | 5 +- res/drawable/ic_perm_vibrate.xml | 5 +- res/drawable/ic_perm_vpn.xml | 5 +- res/drawable/ic_perm_wifi.xml | 5 +- res/drawable/ic_phone_info.xml | 2 +- res/drawable/ic_photo_library.xml | 2 +- res/drawable/ic_pin.xml | 2 +- res/drawable/ic_print.xml | 10 + res/drawable/ic_print_error.xml | 10 + res/drawable/ic_private_dns.xml | 2 +- res/drawable/ic_remove_24dp.xml | 5 +- res/drawable/ic_restore.xml | 2 +- res/drawable/ic_search_24dp.xml | 5 +- res/drawable/ic_security_lock_24dp.xml | 5 +- res/drawable/ic_settings.xml | 2 +- res/drawable/ic_settings_24dp.xml | 2 +- res/drawable/ic_settings_accessibility.xml | 2 +- res/drawable/ic_settings_aod.xml | 6 +- res/drawable/ic_settings_backup.xml | 5 +- res/drawable/ic_settings_backup_restore.xml | 5 +- res/drawable/ic_settings_bluetooth.xml | 2 +- res/drawable/ic_settings_camera.xml | 2 +- res/drawable/ic_settings_display.xml | 2 +- res/drawable/ic_settings_gestures.xml | 2 +- res/drawable/ic_settings_home.xml | 5 +- res/drawable/ic_settings_language.xml | 2 +- res/drawable/ic_settings_multiuser.xml | 2 +- res/drawable/ic_settings_nfc_payment.xml | 2 +- res/drawable/ic_settings_night_display.xml | 5 +- res/drawable/ic_settings_print.xml | 2 +- res/drawable/ic_settings_storage.xml | 2 +- res/drawable/ic_settings_sync.xml | 5 +- .../ic_settings_widget_background.xml | 3 +- res/drawable/ic_settings_wireless.xml | 2 +- res/drawable/ic_shortcut_battery.xml | 2 +- res/drawable/ic_shortcut_data_usage.xml | 2 +- res/drawable/ic_shortcut_wireless.xml | 2 +- res/drawable/ic_signal_location.xml | 13 + res/drawable/ic_signal_workmode_enable.xml | 2 +- res/drawable/ic_skip.xml | 2 +- res/drawable/ic_storage.xml | 5 +- res/drawable/ic_storage_wizard_external.xml | 4 +- res/drawable/ic_storage_wizard_internal.xml | 6 +- res/drawable/ic_suggested_notifications.xml | 4 +- res/drawable/ic_suggestion_close_button.xml | 2 +- res/drawable/ic_suggestion_fingerprint.xml | 11 +- res/drawable/ic_supervisor.xml | 10 + res/drawable/ic_support_24dp.xml | 5 +- res/drawable/ic_swap_horiz.xml | 2 +- res/drawable/ic_sync.xml | 5 +- res/drawable/ic_timelapse.xml | 2 +- res/drawable/ic_translate_24dp.xml | 2 +- res/drawable/ic_volume_ringer_vibrate.xml | 2 +- res/drawable/ic_volume_up_24dp.xml | 6 +- res/drawable/ic_wallpaper.xml | 5 +- res/drawable/ic_warning_24dp.xml | 4 +- res/drawable/ic_wifi_signal_0.xml | 8 +- res/drawable/ic_wifi_signal_1.xml | 8 +- res/drawable/ic_wifi_signal_2.xml | 8 +- res/drawable/ic_wifi_signal_3.xml | 8 +- res/drawable/ic_wifi_signal_4.xml | 8 +- res/drawable/ic_wifi_signal_lock.xml | 6 +- res/drawable/ic_wifi_tethering.xml | 2 +- res/drawable/preference_background.xml | 2 +- res/drawable/tile_icon_animation_speed.xml | 5 +- res/drawable/tile_icon_force_rtl.xml | 35 +- res/drawable/tile_icon_graphics.xml | 21 +- res/drawable/tile_icon_show_layout.xml | 35 +- res/drawable/tile_icon_winscope_trace.xml | 7 +- res/layout-land/choose_lock_pattern.xml | 2 + .../confirm_lock_pattern_normal.xml | 2 + .../fingerprint_enroll_enrolling.xml | 3 + .../fingerprint_enroll_find_sensor.xml | 2 + res/layout-land/fingerprint_enroll_finish.xml | 2 + res/layout/choose_lock_password.xml | 1 + res/layout/choose_lock_pattern_common.xml | 2 + res/layout/confirm_lock_password_normal.xml | 1 + .../confirm_lock_pattern_normal_base.xml | 2 + .../crypt_keeper_switch_input_method.xml | 2 +- res/layout/empty_print_state.xml | 2 +- .../empty_printers_list_service_enabled.xml | 2 +- res/layout/encryption_interstitial.xml | 1 + res/layout/filter_spinner_item.xml | 2 +- .../fingerprint_enroll_enrolling_base.xml | 2 + .../fingerprint_enroll_find_sensor_base.xml | 1 + res/layout/fingerprint_enroll_finish_base.xml | 1 + .../fingerprint_enroll_introduction.xml | 2 + res/layout/multi_sim_dialog.xml | 3 - res/layout/printer_dropdown_item.xml | 1 - res/layout/redaction_interstitial.xml | 4 + res/layout/settings_color_picker_item.xml | 1 - res/layout/settings_main_dashboard.xml | 2 +- ...choose_lock_generic_fingerprint_header.xml | 1 + .../setup_choose_lock_generic_header.xml | 1 + res/layout/storage_wizard_init.xml | 4 +- res/layout/switch_bar.xml | 3 +- res/layout/user_credential_preference.xml | 3 +- res/menu/time_zone_base_search_menu.xml | 2 +- res/values-night/bools.xml | 19 + res/values-night/colors.xml | 4 + res/values-night/themes.xml | 23 + res/values/bools.xml | 2 + res/values/colors.xml | 183 +++--- res/values/lineage_colors.xml | 2 +- res/values/lineage_styles.xml | 2 +- res/values/styles.xml | 57 +- res/values/themes.xml | 555 ++++++++++++++++-- src/com/android/settings/DeviceAdminAdd.java | 4 +- .../android/settings/SettingsActivity.java | 2 + .../accounts/AccountSyncSettings.java | 2 +- .../settings/applications/RunningState.java | 2 +- .../applications/UsageAccessDetails.java | 2 +- .../settings/fuelgauge/PowerUsageSummary.java | 2 +- .../android/settings/network/ApnEditor.java | 2 +- .../print/PrintJobSettingsFragment.java | 8 +- .../settings/print/PrintSettingsFragment.java | 9 +- .../widget/EntityHeaderController.java | 2 +- .../wifi/ConnectedAccessPointPreference.java | 12 + .../wifi/LongPressAccessPointPreference.java | 13 + .../WifiDetailPreferenceController.java | 7 +- .../fingerprint_enroll_find_sensor.xml | 1 + 223 files changed, 1320 insertions(+), 563 deletions(-) create mode 100644 res/drawable/ic_arrow_circle_down.xml create mode 100644 res/drawable/ic_arrow_circle_up.xml create mode 100644 res/drawable/ic_back.xml create mode 100644 res/drawable/ic_bt_headphones_a2dp.xml create mode 100644 res/drawable/ic_cancel_cross.xml create mode 100644 res/drawable/ic_corp_badge.xml create mode 100644 res/drawable/ic_dialog_alert_material.xml create mode 100644 res/drawable/ic_info.xml create mode 100644 res/drawable/ic_keyboard.xml create mode 100644 res/drawable/ic_lock_lock.xml create mode 100644 res/drawable/ic_menu_sd_card.xml create mode 100644 res/drawable/ic_mode_edit.xml create mode 100644 res/drawable/ic_more_24.xml create mode 100644 res/drawable/ic_print.xml create mode 100644 res/drawable/ic_print_error.xml create mode 100644 res/drawable/ic_signal_location.xml create mode 100644 res/drawable/ic_supervisor.xml create mode 100644 res/values-night/bools.xml create mode 100644 res/values-night/colors.xml create mode 100644 res/values-night/themes.xml diff --git a/Android.mk b/Android.mk index a63433085bd..0b6ad140a4a 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 74cd3d4e687..538540bbf5f 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 3d408219f91..197231b1708 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 d2774678636..9f3a1994a76 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 b0f5fda569f..c05b98792a7 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 835ac5b58ac..d0d24edff4c 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 9ec3874672a..0ade2aed000 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 9bc72830620..9c9e263f73c 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 f87a882a74b..89709b934eb 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 b9b407557c7..5c919c96deb 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 6902a96ea31..6721f92cb1b 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 00000000000..f7b03d6ad56 --- /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 00000000000..8c610b3985d --- /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 f334902646b..2cac0e153cc 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 12605fd9c66..cace9de8c8b 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 8322313f2fc..d30c058332b 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 00000000000..608f11579e3 --- /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 5a512f720ae..9783d51a851 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 830853230a4..b30138589eb 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 5c736fdf4ed..3df83f5d24c 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 c8def54883d..eb30697f41d 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 00000000000..37f7903e70a --- /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 b71de65e59e..e4b2423b9f9 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 c84f18ede05..c88347a7f2a 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 00000000000..f700047202c --- /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 2ac48ef5be5..d24d82e5b65 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 4f767cfbb11..27a4f97c66d 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 962dedb19c4..3891796502d 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 17e2b92a2d8..990c0e535db 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 00000000000..c6fd14084e3 --- /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 d2d55a9581b..88607173687 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 d1290c50a02..e9af39bdeb4 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 6338301e6f1..f2d9bad93c0 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 cace8d4433f..1d18cb2504e 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 8755ccb4d05..9b4cc03132e 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 a82d7544985..09d8ba7af06 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 7ccc0809172..8430ba92a86 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 edffde399a0..d58d532f4bc 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 c39e3f97f0b..f28800127aa 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 048826b88d9..299913ca6f5 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 5e3b55fbc06..2e1bf3fb7f6 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 dd8cab887fe..863ecdd6132 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 063917a138b..eafec2a46ce 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 581b83e6077..9d9c6577b5f 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 194c9afb404..8f1635d46ea 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 1018533d035..3278495ae83 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 f8bac71e877..ac95682309f 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 fe2e3dc9ed3..dcc58788abd 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 00000000000..fabc55da249 --- /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 b1ed068abec..39c27f524ad 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 89cf8fabc06..ef236243439 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 4398527d7dd..e83d30979ce 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 a4f0a654660..346b4e89b16 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 25a8ff0fd1a..40fb7674422 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 00000000000..5af54225a1f --- /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 00000000000..97586ccac35 --- /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 00000000000..2a9157dcfb2 --- /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 9f7f4fca468..8594582cc91 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 d9321ac021a..266874080d2 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 3d02bca3b37..6e5219a4f8b 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 5435bdb476a..60b16f0d04c 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 57591c2e872..294e6f4fe08 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 003111ea6a7..70a1a9397b9 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 3bb90b8a469..edf05cee074 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 3b9c4d22ceb..dabd0a12320 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 8d4ab892f67..0f26653f739 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 f68ba299593..fc0a67a6daf 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 197877a6154..746f9189926 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 d9a3c4bce85..bac8df3a696 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 d258b49c8c7..ce99a6e11f6 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 170de0cbd2e..e11ea4847bf 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 3cba6846d2a..d65b8da12ae 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 d8063ab63c8..c28ac427da1 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 bbc1732b9f3..b3e809851d0 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 1483f1f8644..b873bd7f975 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 c6f27cdea48..f9f5e317178 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 7562a76773c..c07657e81cf 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 25b63932681..0718d047881 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 0ae4ef20073..88b672304a0 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 e68ed6c3bb7..08baf65d7f4 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 15dade2fef9..7c3cc0771fe 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 0050c228583..54e795e6e65 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 db5b4778c7b..16b7fa6aac4 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 7aee3e86ebc..57f07b3f6cf 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 a60b05a4b4b..358e017d2ba 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 00000000000..d2d664e3c50 --- /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 00000000000..779679132fe --- /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 a94fd380f8e..6a49334155b 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 923362360a5..db625c108d1 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 8312acafdd8..622ab78c240 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 8f14e888f71..a23060fbc9b 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 fd49b23fcf1..15835b2ee43 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 44a4c2ed746..178687c0de6 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 231eadd91eb..54efd17b476 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 245b0fcc855..8fa76854f00 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 f93ab968077..5f9b87adf90 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 962bfe0a9d5..5f90b07d1cf 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 178b1315545..ff02f85f398 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 308d09fb72f..001c3c6b03a 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 6d81d47c710..1ad242541c1 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 0cc986b48ac..f49a426893a 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 36a148cb215..2141accbfed 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 2fd05a55816..8adc007b1cb 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 00000000000..d8c5d05c6ca --- /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 f7e8c806b1b..47288d7c101 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 43762156f6e..73df047cc01 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 55e66c3d8bc..4a972939889 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 99e2698633d..22c4f234daf 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 615b2156737..99aeecef687 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 bf5ee2effe7..dc80cfd5ddb 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 00000000000..60fc60be8d4 --- /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 b7e2f53f022..da605deca89 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 45a2dbdb911..f6485593b30 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 ba97bae8c90..20ed2728726 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 962bfe0a9d5..5f90b07d1cf 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 20da9c33a66..98f9545e4f6 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 2ca48e0fb06..d19b36aeefe 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 9c0a9845d93..2f58964f6f0 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 3c5dd449af0..89935c00268 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 4a7c708fb45..05acb14e870 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 e87bddeeb0e..4ec02e9ebd5 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 af611aca947..6b6bb1bbf9b 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 e23b24cd945..c9321872aaa 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 25630494476..0df01871442 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 4d6f798c39c..0c8a0fc293f 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 9c90d6fd548..a0f53f099bc 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 2c94524069e..e9c456974d8 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 77dd12d6dbc..c4b9c529761 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 8cc8db448e0..357cee2147f 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 f827e37371c..995bc2a2f92 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 ffdd623d5fb..1fdff8d693b 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 00a452ca8e8..41e5b595b87 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 d0e7df8758d..fa7a148bc5f 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 1036e247eaf..b09a7595b2f 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 939ff92b9ac..bea94091e35 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 c430d6de126..0d31f17b4e1 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 ec5d750f896..7f7c795a40e 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 29e125ba9ab..1b1b7204b46 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 3671b7fac5b..9c8a72886ac 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 92241af4551..6df42c4260d 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 00000000000..694fbea0bb2 --- /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 00000000000..75068f23a56 --- /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 00000000000..c6fe28d019f --- /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 29de06bceae..ff27412ff33 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 d2cb66feb80..e864c6fd328 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 a4c11850f79..da858890af3 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 1ce2e23597b..02f070c8dfb 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 f82d0e5e854..fd0ac609747 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 8c3864967e4..d4ddb08df5e 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 fb21deb661d..d29ee0b70d1 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 533ea4bbf15..0ed8f36044d 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 6b60e87f85c..e685eade304 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 d4abe6c4e28..1c4b0577862 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 fdb20c95359..4f899be1542 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 eec2008021e..afd18937d70 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 cceb31d29e7..57c13c2a8a4 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 c16642a60e5..bcf7085c3ff 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 21ee360e98b..b0f5b41f627 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 c40d4da198f..38c6ce98e0b 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 def48e00e54..ba059aefc08 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 93097db3d25..b0117e5b485 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 b10d07ef5ab..efc65260c79 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 cedf5b9eb62..9428c93f83b 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 @@