From a8e78a4cb31683d42a6a2a7183cdc10235f65f2a Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 6 Jan 2022 23:46:38 +0600 Subject: [PATCH] 4510-Q-Update_icon_colors issue: https://gitlab.e.foundation/e/backlog/-/issues/4510 --- ...ingerprint_background_1_path_animation.xml | 4 +- ...ingerprint_background_2_path_animation.xml | 4 +- ...ingerprint_background_5_path_animation.xml | 4 +- ...ingerprint_background_6_path_animation.xml | 4 +- ...ingerprint_background_7_path_animation.xml | 4 +- res/color/bottom_navigation_colors.xml | 4 +- res/color/lock_pattern_view_success_color.xml | 2 +- res/color/preference_highligh_color.xml | 2 +- res/color/sliding_tab_title_text_color.xml | 4 +- res/color/storage_wizard_button.xml | 4 +- .../unlock_pattern_view_success_color.xml | 2 +- res/drawable/dark_theme.xml | 2 +- res/drawable/drag_handle.xml | 2 +- res/drawable/face_enroll_introduction.xml | 8 +- ...fallback_home_unprovisioned_background.xml | 2 +- res/drawable/fingerprint_enroll_finish.xml | 38 +++++----- .../fingerprint_enroll_introduction.xml | 20 ++--- res/drawable/ic_account_circle_24dp.xml | 7 +- res/drawable/ic_add_24dp.xml | 2 +- res/drawable/ic_android.xml | 2 +- res/drawable/ic_apps_filter_settings_24dp.xml | 4 +- res/drawable/ic_arrow_back.xml | 2 +- res/drawable/ic_arrow_circle_down.xml | 2 +- res/drawable/ic_arrow_circle_up.xml | 2 +- res/drawable/ic_arrow_down_24dp.xml | 2 +- res/drawable/ic_attach_money_black_24dp.xml | 2 +- res/drawable/ic_audio_alarm.xml | 2 +- res/drawable/ic_audio_alarm_mute.xml | 2 +- res/drawable/ic_auto_wifi.xml | 6 +- res/drawable/ic_battery_charging_full.xml | 4 +- res/drawable/ic_battery_circle.xml | 2 +- res/drawable/ic_battery_saver_accent_24dp.xml | 2 +- res/drawable/ic_bt_headphones_a2dp.xml | 2 +- res/drawable/ic_cancel.xml | 4 +- res/drawable/ic_cancel_cross.xml | 2 +- res/drawable/ic_cast_24dp.xml | 2 +- res/drawable/ic_cellular_1_bar.xml | 4 +- res/drawable/ic_cellular_off.xml | 9 +-- res/drawable/ic_check_circle_green.xml | 2 +- res/drawable/ic_chevron_right_24dp.xml | 2 +- res/drawable/ic_corp_badge.xml | 4 +- res/drawable/ic_data_saver.xml | 6 +- res/drawable/ic_delete.xml | 6 +- res/drawable/ic_delete_accent.xml | 2 +- res/drawable/ic_devices_other.xml | 2 +- res/drawable/ic_dialog_alert_material.xml | 2 +- res/drawable/ic_do_not_disturb_on_24dp.xml | 4 +- res/drawable/ic_eject_24dp.xml | 2 +- res/drawable/ic_event.xml | 2 +- res/drawable/ic_event_white.xml | 2 +- res/drawable/ic_expand_less.xml | 2 +- res/drawable/ic_expand_more_inverse.xml | 2 +- .../ic_face_enroll_introduction_detail.xml | 4 +- .../ic_face_enroll_introduction_people.xml | 2 +- .../ic_face_enroll_introduction_shield.xml | 2 +- ...ic_face_enroll_introduction_visibility.xml | 6 +- res/drawable/ic_face_header.xml | 4 +- res/drawable/ic_feedback_24dp.xml | 6 +- res/drawable/ic_find_in_page_24px.xml | 2 +- res/drawable/ic_fingerprint.xml | 12 +-- res/drawable/ic_fingerprint_24dp.xml | 2 +- res/drawable/ic_fingerprint_header.xml | 12 +-- res/drawable/ic_fingerprint_list_icon.xml | 12 +-- res/drawable/ic_fingerprint_success.xml | 4 +- res/drawable/ic_folder_vd_theme_24.xml | 6 +- res/drawable/ic_font_size_16dp.xml | 2 +- res/drawable/ic_font_size_24dp.xml | 2 +- res/drawable/ic_frequency_antenna.xml | 2 +- res/drawable/ic_friction_lock_closed.xml | 2 +- res/drawable/ic_friction_money.xml | 2 +- res/drawable/ic_gesture_play_button.xml | 6 +- res/drawable/ic_gray_scale_24dp.xml | 2 +- res/drawable/ic_headset_24dp.xml | 2 +- res/drawable/ic_help.xml | 2 +- res/drawable/ic_homepage_accessibility.xml | 2 +- res/drawable/ic_homepage_accounts.xml | 2 +- res/drawable/ic_homepage_battery.xml | 14 ++-- res/drawable/ic_homepage_connected_device.xml | 2 +- res/drawable/ic_homepage_display.xml | 2 +- res/drawable/ic_homepage_network.xml | 8 +- res/drawable/ic_homepage_privacy.xml | 2 +- res/drawable/ic_homepage_search.xml | 2 +- res/drawable/ic_homepage_system_dashboard.xml | 2 +- res/drawable/ic_hotspot.xml | 14 ++-- res/drawable/ic_info.xml | 2 +- res/drawable/ic_info_outline_24dp.xml | 6 +- res/drawable/ic_keyboard.xml | 2 +- res/drawable/ic_label.xml | 2 +- res/drawable/ic_lightbulb_outline_24.xml | 2 +- res/drawable/ic_local_phone_24_lib.xml | 12 +-- res/drawable/ic_lock_lock.xml | 2 +- res/drawable/ic_media_stream_off.xml | 4 +- res/drawable/ic_menu_sd_card.xml | 2 +- res/drawable/ic_mode_edit.xml | 2 +- res/drawable/ic_more_24.xml | 2 +- res/drawable/ic_network_cell.xml | 2 +- res/drawable/ic_nfc.xml | 2 +- res/drawable/ic_notification_alert.xml | 2 +- res/drawable/ic_notification_silence.xml | 2 +- res/drawable/ic_notifications_alert.xml | 2 +- res/drawable/ic_open_wifi_autoconnect.xml | 2 +- res/drawable/ic_open_wifi_notifications.xml | 10 +-- res/drawable/ic_pan_tool_18dp.xml | 2 +- res/drawable/ic_password.xml | 8 +- res/drawable/ic_pattern.xml | 10 +-- 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 | 2 +- res/drawable/ic_print_error.xml | 2 +- res/drawable/ic_privacy_shield_24dp.xml | 4 +- res/drawable/ic_private_dns.xml | 2 +- res/drawable/ic_qrcode.xml | 26 +++++++ res/drawable/ic_qrcode_24dp.xml | 2 +- .../ic_radio_button_checked_black_24dp.xml | 2 +- .../ic_radio_button_unchecked_black_24dp.xml | 2 +- res/drawable/ic_remove_24dp.xml | 2 +- res/drawable/ic_restore.xml | 2 +- res/drawable/ic_scan_24dp.xml | 2 +- res/drawable/ic_sd_card.xml | 2 +- res/drawable/ic_search.xml | 24 ++++++ res/drawable/ic_security_lock_24dp.xml | 2 +- res/drawable/ic_settings_24dp.xml | 6 +- res/drawable/ic_settings_accent.xml | 4 +- res/drawable/ic_settings_accessibility.xml | 2 +- res/drawable/ic_settings_accounts.xml | 2 +- res/drawable/ic_settings_adaptive_sleep.xml | 2 +- res/drawable/ic_settings_all.xml | 2 +- res/drawable/ic_settings_aod.xml | 6 +- res/drawable/ic_settings_backup.xml | 2 +- res/drawable/ic_settings_backup_restore.xml | 2 +- res/drawable/ic_settings_battery.xml | 14 ++-- res/drawable/ic_settings_battery_white.xml | 2 +- res/drawable/ic_settings_bluetooth.xml | 2 +- res/drawable/ic_settings_camera.xml | 2 +- res/drawable/ic_settings_close.xml | 2 +- res/drawable/ic_settings_cog.xml | 29 +++++++ res/drawable/ic_settings_data_usage.xml | 8 +- res/drawable/ic_settings_delete.xml | 6 +- res/drawable/ic_settings_disable.xml | 2 +- res/drawable/ic_settings_display.xml | 2 +- res/drawable/ic_settings_display_white.xml | 2 +- res/drawable/ic_settings_enable.xml | 2 +- res/drawable/ic_settings_force_stop.xml | 6 +- res/drawable/ic_settings_gestures.xml | 6 +- res/drawable/ic_settings_home.xml | 2 +- res/drawable/ic_settings_install.xml | 4 +- res/drawable/ic_settings_language.xml | 2 +- res/drawable/ic_settings_location.xml | 4 +- res/drawable/ic_settings_memory.xml | 22 +++--- res/drawable/ic_settings_multiuser.xml | 6 +- res/drawable/ic_settings_nfc_payment.xml | 2 +- res/drawable/ic_settings_night_display.xml | 2 +- res/drawable/ic_settings_open.xml | 2 +- res/drawable/ic_settings_personal.xml | 4 +- res/drawable/ic_settings_phone_idle.xml | 2 +- res/drawable/ic_settings_print.xml | 2 +- res/drawable/ic_settings_privacy.xml | 6 +- res/drawable/ic_settings_security.xml | 4 +- res/drawable/ic_settings_security_white.xml | 4 +- res/drawable/ic_settings_sign_in.xml | 2 +- res/drawable/ic_settings_storage.xml | 2 +- res/drawable/ic_settings_sync.xml | 2 +- .../ic_settings_system_dashboard_white.xml | 6 +- res/drawable/ic_settings_voice_calls.xml | 2 +- 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_flashlight.xml | 4 +- res/drawable/ic_signal_location.xml | 4 +- res/drawable/ic_signal_strength_4g.xml | 4 +- res/drawable/ic_signal_workmode_enable.xml | 2 +- res/drawable/ic_sim_alert.xml | 2 +- res/drawable/ic_sim_sd.xml | 2 +- res/drawable/ic_skip.xml | 2 +- res/drawable/ic_storage.xml | 2 +- res/drawable/ic_storage_white.xml | 2 +- res/drawable/ic_storage_wizard_external.xml | 10 +-- 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_dnd.xml | 4 +- res/drawable/ic_suggestion_fingerprint.xml | 10 +-- res/drawable/ic_suggestion_night_display.xml | 2 +- res/drawable/ic_suggestion_security.xml | 4 +- res/drawable/ic_suggestion_wireless.xml | 2 +- res/drawable/ic_supervisor.xml | 2 +- res/drawable/ic_support_24dp.xml | 2 +- res/drawable/ic_swap_horiz.xml | 2 +- res/drawable/ic_sync.xml | 4 +- res/drawable/ic_sync_problem_24dp.xml | 2 +- res/drawable/ic_theme.xml | 2 +- res/drawable/ic_timelapse.xml | 2 +- res/drawable/ic_timelapse_white.xml | 2 +- res/drawable/ic_translate_24dp.xml | 2 +- res/drawable/ic_visibility_18dp.xml | 2 +- res/drawable/ic_volume_ringer_vibrate.xml | 12 +-- res/drawable/ic_volume_up_24dp.xml | 6 +- res/drawable/ic_wallpaper.xml | 2 +- res/drawable/ic_warning_24dp.xml | 6 +- res/drawable/ic_wifi_privacy_24dp.xml | 6 +- 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 | 6 +- res/drawable/signal_strength_1x.xml | 4 +- res/drawable/signal_strength_3g.xml | 4 +- res/drawable/signal_strength_g.xml | 2 +- res/drawable/signal_strength_lte.xml | 6 +- res/drawable/thumb.xml | 2 +- res/drawable/tile_icon_animation_speed.xml | 2 +- res/drawable/tile_icon_force_rtl.xml | 32 ++++---- res/drawable/tile_icon_graphics.xml | 18 ++--- res/drawable/tile_icon_sensors_off.xml | 4 +- res/drawable/tile_icon_show_layout.xml | 35 +++++---- res/drawable/tile_icon_winscope_trace.xml | 4 +- res/drawable/wifi_dpp_success.xml | 2 +- res/layout-land/confirm_lock_password.xml | 2 +- res/layout-land/confirm_lock_pattern.xml | 2 +- .../font_size_activity.xml | 4 - .../screen_zoom_activity.xml | 4 - .../admin_disabled_other_options_footer.xml | 2 +- res/layout/admin_support_details_dialog.xml | 2 +- res/layout/apn_preference_layout.xml | 2 +- res/layout/battery_active_view.xml | 2 +- res/layout/battery_header.xml | 4 +- res/layout/battery_history_detail.xml | 8 +- res/layout/battery_usage_graph.xml | 6 +- res/layout/bluetooth_pin_entry.xml | 6 +- res/layout/bugreport_options_dialog.xml | 4 +- res/layout/conditional_card_full_tile.xml | 2 +- res/layout/conditional_card_half_tile.xml | 2 +- res/layout/conditional_card_header_icon.xml | 2 +- res/layout/confirm_lock_password_base.xml | 2 +- res/layout/confirm_lock_pattern_base.xml | 2 +- res/layout/data_usage_detail.xml | 8 +- res/layout/data_usage_graph.xml | 4 +- res/layout/data_usage_summary_preference.xml | 10 +-- .../dialog_back_gesture_sensitivity.xml | 8 +- ...ialog_mobile_network_color_picker_item.xml | 2 +- res/layout/dialog_mobile_network_rename.xml | 8 +- res/layout/empty_print_state.xml | 4 +- .../empty_printers_list_service_enabled.xml | 2 +- res/layout/fallback_home_finishing_boot.xml | 4 +- res/layout/font_size_activity.xml | 4 - res/layout/horizontal_preference.xml | 2 +- res/layout/locale_drag_cell.xml | 2 +- res/layout/lockscreen_remote_input.xml | 2 +- res/layout/nfc_payment_empty.xml | 2 +- res/layout/notification_app.xml | 2 +- res/layout/notification_log_row.xml | 10 +-- res/layout/panel_layout.xml | 2 +- res/layout/preference.xml | 4 +- res/layout/preference_app_restrictions.xml | 4 +- res/layout/preference_balance_slider.xml | 2 +- res/layout/preference_increasing_ring.xml | 8 +- res/layout/preference_multiline_title.xml | 4 +- res/layout/preference_progress_category.xml | 2 +- res/layout/preference_radio.xml | 4 +- .../preference_radio_with_extra_widget.xml | 2 +- res/layout/preference_single_target.xml | 2 +- res/layout/preference_two_target_radio.xml | 2 +- res/layout/preference_volume_slider.xml | 4 +- res/layout/preference_widget_add.xml | 1 - res/layout/preference_widget_gear.xml | 2 +- res/layout/preference_widget_gear_no_bg.xml | 2 +- ...erence_widget_gear_optional_background.xml | 4 +- .../preference_widget_seekbar_settings.xml | 4 +- res/layout/preference_widget_summary.xml | 2 +- res/layout/print_job_summary.xml | 2 +- res/layout/printer_dropdown_item.xml | 2 +- res/layout/radio_with_summary.xml | 2 +- res/layout/restricted_dialog_singlechoice.xml | 2 +- res/layout/restricted_popup_menu_item.xml | 2 +- ...stricted_preference_user_delete_widget.xml | 2 +- res/layout/restricted_radio_with_summary.xml | 4 +- res/layout/running_processes_header.xml | 18 ++--- res/layout/running_processes_item.xml | 6 +- res/layout/screen_zoom_activity.xml | 4 - res/layout/screen_zoom_preview_settings.xml | 30 ++++---- res/layout/search_bar.xml | 2 +- res/layout/select_account_list_item.xml | 2 +- res/layout/settings_summary_preference.xml | 8 +- res/layout/sliding_tab_indicator_view.xml | 2 +- .../spinner_dropdown_restricted_item.xml | 2 +- res/layout/storage_internal_forget.xml | 2 +- res/layout/storage_internal_format.xml | 2 +- res/layout/storage_internal_unmount.xml | 2 +- res/layout/storage_item.xml | 2 +- res/layout/storage_summary.xml | 2 +- res/layout/storage_volume.xml | 2 +- res/layout/storage_wizard_checklist.xml | 11 +-- res/layout/storage_wizard_generic.xml | 2 +- res/layout/storage_wizard_init.xml | 12 +-- res/layout/storage_wizard_progress.xml | 4 +- res/layout/switch_bar.xml | 2 +- res/layout/tall_preference_category.xml | 2 +- res/layout/time_zone_list_item.xml | 6 +- res/layout/time_zone_search_header.xml | 2 +- res/layout/time_zone_search_item.xml | 6 +- res/layout/trust_agent_item.xml | 2 +- res/layout/trusted_credential.xml | 2 +- res/layout/two_line_list_item.xml | 2 +- res/layout/user_credential.xml | 4 +- res/layout/user_dictionary_item.xml | 2 +- res/layout/user_info_header.xml | 2 +- res/layout/wfc_simple_disclaimer_item.xml | 2 +- res/layout/widget_text_views.xml | 4 +- res/layout/wifi_display_preference.xml | 2 +- .../wifi_dpp_qrcode_generator_fragment.xml | 2 +- res/layout/zen_rule_type.xml | 2 +- res/menu/time_zone_base_search_menu.xml | 2 +- res/values-night/colors.xml | 20 +++++ res/values-night/styles.xml | 4 + res/values/colors.xml | 15 ++-- res/values/styles.xml | 60 +++++++++------ res/values/themes.xml | 75 +++++++++++++++++-- res/xml/single_choice_list_item_2.xml | 2 +- res/xml/vpn_app_management.xml | 2 +- ...ccessibilityGestureNavigationTutorial.java | 2 +- .../applications/RunningProcessesView.java | 2 +- .../FingerprintLocationAnimationView.java | 2 +- ...ancedBluetoothDetailsHeaderController.java | 8 +- .../bluetooth/BluetoothSliceBuilder.java | 4 +- .../datausage/ChartDataUsagePreference.java | 2 +- .../datausage/DataUsageSummaryPreference.java | 4 +- .../deviceinfo/StorageItemPreference.java | 6 +- .../deviceinfo/StorageVolumePreference.java | 2 +- .../deviceinfo/StorageWizardBase.java | 1 - .../StorageItemPreferenceController.java | 2 +- .../storage/UserProfileController.java | 3 +- .../ActionDisabledByAdminDialogHelper.java | 2 +- .../settings/flashlight/FlashlightSlice.java | 3 +- .../settings/fuelgauge/BatteryMeterView.java | 4 +- .../fuelgauge/BatterySaverDrawable.java | 3 +- .../deviceinfo/DataUsageSlice.java | 1 - .../deviceinfo/DeviceInfoSlice.java | 1 - .../deviceinfo/StorageSlice.java | 1 - .../slices/BatteryFixSlice.java | 3 +- .../slices/BluetoothDevicesSlice.java | 5 +- .../slices/ContextualAdaptiveSleepSlice.java | 1 - .../slices/DarkThemeSlice.java | 3 +- .../slices/FaceSetupSlice.java | 3 +- .../slices/LowStorageSlice.java | 3 +- .../slices/NotificationChannelSlice.java | 3 +- .../settings/location/LocationSlice.java | 3 +- .../media/MediaOutputIndicatorSlice.java | 3 +- .../settings/media/MediaOutputSlice.java | 3 +- .../telephony/Enhanced4gLteSliceHelper.java | 1 - .../network/telephony/MobileDataSlice.java | 3 +- .../network/telephony/MobileNetworkUtils.java | 2 +- .../ChannelListPreferenceController.java | 1 - .../notification/ImportancePreference.java | 4 +- .../notification/ZenModeSliceBuilder.java | 3 +- .../print/PrintJobPreferenceController.java | 2 +- .../settings/print/PrintSettingsFragment.java | 4 +- ...ermissionBarChartPreferenceController.java | 2 +- .../actionbar/SearchMenuController.java | 2 +- .../settings/sim/SimListDialogFragment.java | 2 +- .../settings/slices/SliceBuilderUtils.java | 19 ++--- .../android/settings/widget/DonutView.java | 6 +- .../RadioButtonPreferenceWithExtraWidget.java | 2 +- .../wifi/LongPressAccessPointPreference.java | 2 +- .../wifi/calling/WifiCallingSliceHelper.java | 5 +- .../WifiDetailPreferenceController.java | 6 +- .../dpp/WifiDppQrCodeGeneratorFragment.java | 2 +- .../settings/wifi/slice/WifiSlice.java | 10 +-- .../wifi/tether/WifiTetherSsidPreference.java | 2 +- tests/robotests/res/layout/preference.xml | 4 +- tests/robotests/res/values/themes.xml | 4 +- wrap_alpha.py | 2 +- 375 files changed, 938 insertions(+), 793 deletions(-) create mode 100644 res/drawable/ic_qrcode.xml create mode 100644 res/drawable/ic_search.xml create mode 100644 res/drawable/ic_settings_cog.xml create mode 100644 res/values-night/colors.xml diff --git a/res/anim/enrollment_fingerprint_background_1_path_animation.xml b/res/anim/enrollment_fingerprint_background_1_path_animation.xml index 76235c452d5..988ccc01b89 100644 --- a/res/anim/enrollment_fingerprint_background_1_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_1_path_animation.xml @@ -22,7 +22,7 @@ android:duration="300" android:propertyName="fillColor" android:valueFrom="#000000" - android:valueTo="@color/color_default_accent" + android:valueTo="@color/color_icon_background_blue" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml index 76235c452d5..988ccc01b89 100644 --- a/res/anim/enrollment_fingerprint_background_2_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_2_path_animation.xml @@ -22,7 +22,7 @@ android:duration="300" android:propertyName="fillColor" android:valueFrom="#000000" - android:valueTo="@color/color_default_accent" + android:valueTo="@color/color_icon_background_blue" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> diff --git a/res/anim/enrollment_fingerprint_background_5_path_animation.xml b/res/anim/enrollment_fingerprint_background_5_path_animation.xml index 76235c452d5..988ccc01b89 100644 --- a/res/anim/enrollment_fingerprint_background_5_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_5_path_animation.xml @@ -22,7 +22,7 @@ android:duration="300" android:propertyName="fillColor" android:valueFrom="#000000" - android:valueTo="@color/color_default_accent" + android:valueTo="@color/color_icon_background_blue" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> diff --git a/res/anim/enrollment_fingerprint_background_6_path_animation.xml b/res/anim/enrollment_fingerprint_background_6_path_animation.xml index 76235c452d5..988ccc01b89 100644 --- a/res/anim/enrollment_fingerprint_background_6_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_6_path_animation.xml @@ -22,7 +22,7 @@ android:duration="300" android:propertyName="fillColor" android:valueFrom="#000000" - android:valueTo="@color/color_default_accent" + android:valueTo="@color/color_icon_background_blue" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> diff --git a/res/anim/enrollment_fingerprint_background_7_path_animation.xml b/res/anim/enrollment_fingerprint_background_7_path_animation.xml index 76235c452d5..988ccc01b89 100644 --- a/res/anim/enrollment_fingerprint_background_7_path_animation.xml +++ b/res/anim/enrollment_fingerprint_background_7_path_animation.xml @@ -22,7 +22,7 @@ android:duration="300" android:propertyName="fillColor" android:valueFrom="#000000" - android:valueTo="@color/color_default_accent" + android:valueTo="@color/color_icon_background_blue" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> diff --git a/res/color/bottom_navigation_colors.xml b/res/color/bottom_navigation_colors.xml index 659ef506a61..b425c601d1a 100644 --- a/res/color/bottom_navigation_colors.xml +++ b/res/color/bottom_navigation_colors.xml @@ -18,8 +18,8 @@ + android:color="@color/color_default_accent" /> + android:color="@color/color_default_primary_text" /> \ No newline at end of file diff --git a/res/color/lock_pattern_view_success_color.xml b/res/color/lock_pattern_view_success_color.xml index 075e91958a4..6c5a38d407d 100644 --- a/res/color/lock_pattern_view_success_color.xml +++ b/res/color/lock_pattern_view_success_color.xml @@ -15,5 +15,5 @@ --> - + diff --git a/res/color/preference_highligh_color.xml b/res/color/preference_highligh_color.xml index f8d54d470e7..0ce0e63b8fd 100644 --- a/res/color/preference_highligh_color.xml +++ b/res/color/preference_highligh_color.xml @@ -16,5 +16,5 @@ --> - + \ No newline at end of file diff --git a/res/color/sliding_tab_title_text_color.xml b/res/color/sliding_tab_title_text_color.xml index d6bfbcc039d..02798e9f4f9 100644 --- a/res/color/sliding_tab_title_text_color.xml +++ b/res/color/sliding_tab_title_text_color.xml @@ -17,6 +17,6 @@ - + android:color="@color/color_default_secondary_text"/> + diff --git a/res/color/storage_wizard_button.xml b/res/color/storage_wizard_button.xml index 38c7d523ea1..e2049e51cdf 100644 --- a/res/color/storage_wizard_button.xml +++ b/res/color/storage_wizard_button.xml @@ -17,6 +17,6 @@ - + android:color="@color/color_default_accent" /> + diff --git a/res/color/unlock_pattern_view_success_color.xml b/res/color/unlock_pattern_view_success_color.xml index 075e91958a4..6c5a38d407d 100644 --- a/res/color/unlock_pattern_view_success_color.xml +++ b/res/color/unlock_pattern_view_success_color.xml @@ -15,5 +15,5 @@ --> - + diff --git a/res/drawable/dark_theme.xml b/res/drawable/dark_theme.xml index 803062c5ec9..6734bc4e67b 100644 --- a/res/drawable/dark_theme.xml +++ b/res/drawable/dark_theme.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml index 0704f710e64..aafd2008029 100644 --- a/res/drawable/drag_handle.xml +++ b/res/drawable/drag_handle.xml @@ -20,7 +20,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/face_enroll_introduction.xml b/res/drawable/face_enroll_introduction.xml index 818536a79ea..a571e36d396 100644 --- a/res/drawable/face_enroll_introduction.xml +++ b/res/drawable/face_enroll_introduction.xml @@ -26,19 +26,19 @@ android:fillType="evenOdd" android:pathData="M150,0C67.16,0,0,67.16,0,150s67.16,150,150,150 s150-67.16,150-150S232.84,0,150,0 M150,4c39,0,75.66,15.19,103.24,42.76C280.81,74.34,296,111,296,150s-15.19,75.66-42.76,103.24 C225.66,280.81,189,296,150,296s-75.66-15.19-103.24-42.76C19.19,225.66,4,189,4,150S19.19,74.34,46.76,46.76 C74.34,19.19,111,4,150,4" /> \ No newline at end of file diff --git a/res/drawable/fallback_home_unprovisioned_background.xml b/res/drawable/fallback_home_unprovisioned_background.xml index 0ade2aed000..5e1733a2d40 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_foreground" /> \ No newline at end of file diff --git a/res/drawable/fingerprint_enroll_finish.xml b/res/drawable/fingerprint_enroll_finish.xml index 479caee69e5..a530edc405b 100644 --- a/res/drawable/fingerprint_enroll_finish.xml +++ b/res/drawable/fingerprint_enroll_finish.xml @@ -21,80 +21,80 @@ android:viewportHeight="228.0" android:viewportWidth="228.0"> diff --git a/res/drawable/fingerprint_enroll_introduction.xml b/res/drawable/fingerprint_enroll_introduction.xml index 089b61f8d84..e9a62e9ee35 100644 --- a/res/drawable/fingerprint_enroll_introduction.xml +++ b/res/drawable/fingerprint_enroll_introduction.xml @@ -21,33 +21,33 @@ android:viewportHeight="210.0" android:viewportWidth="210.0"> diff --git a/res/drawable/ic_account_circle_24dp.xml b/res/drawable/ic_account_circle_24dp.xml index f41f57929c3..def8d4b80a0 100644 --- a/res/drawable/ic_account_circle_24dp.xml +++ b/res/drawable/ic_account_circle_24dp.xml @@ -17,12 +17,11 @@ android:width="32dp" android:height="32dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml index 1387bf40bcf..380c60597ac 100644 --- a/res/drawable/ic_add_24dp.xml +++ b/res/drawable/ic_add_24dp.xml @@ -19,7 +19,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_android.xml b/res/drawable/ic_android.xml index 71f3fed80b0..5c919c96deb 100644 --- a/res/drawable/ic_android.xml +++ b/res/drawable/ic_android.xml @@ -20,5 +20,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_apps_filter_settings_24dp.xml b/res/drawable/ic_apps_filter_settings_24dp.xml index 01a53a7e7e1..bfa2125d786 100644 --- a/res/drawable/ic_apps_filter_settings_24dp.xml +++ b/res/drawable/ic_apps_filter_settings_24dp.xml @@ -20,9 +20,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml index 1f6a921f147..b8315a5a04a 100644 --- a/res/drawable/ic_arrow_back.xml +++ b/res/drawable/ic_arrow_back.xml @@ -20,6 +20,6 @@ android:viewportHeight="24" android:autoMirrored="true"> diff --git a/res/drawable/ic_arrow_circle_down.xml b/res/drawable/ic_arrow_circle_down.xml index 4193466b846..ced202720a8 100644 --- a/res/drawable/ic_arrow_circle_down.xml +++ b/res/drawable/ic_arrow_circle_down.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_arrow_circle_up.xml b/res/drawable/ic_arrow_circle_up.xml index a739f368048..787b8058444 100644 --- a/res/drawable/ic_arrow_circle_up.xml +++ b/res/drawable/ic_arrow_circle_up.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml index 9efd9d8cf8a..3fd4b50de54 100644 --- a/res/drawable/ic_arrow_down_24dp.xml +++ b/res/drawable/ic_arrow_down_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" 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 aef0995fea7..cace9de8c8b 100644 --- a/res/drawable/ic_attach_money_black_24dp.xml +++ b/res/drawable/ic_attach_money_black_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" 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 3bd484336c3..ea678dbb32c 100644 --- a/res/drawable/ic_audio_alarm.xml +++ b/res/drawable/ic_audio_alarm.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_audio_alarm_mute.xml b/res/drawable/ic_audio_alarm_mute.xml index 83fc2edca21..ae32c3540ae 100644 --- a/res/drawable/ic_audio_alarm_mute.xml +++ b/res/drawable/ic_audio_alarm_mute.xml @@ -5,6 +5,6 @@ android:viewportWidth="48.0" android:viewportHeight="48.0"> \ No newline at end of file diff --git a/res/drawable/ic_auto_wifi.xml b/res/drawable/ic_auto_wifi.xml index 441b761c9c4..004052c88b5 100644 --- a/res/drawable/ic_auto_wifi.xml +++ b/res/drawable/ic_auto_wifi.xml @@ -20,15 +20,15 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color" /> \ No newline at end of file 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 bb913e86a96..3df83f5d24c 100644 --- a/res/drawable/ic_battery_circle.xml +++ b/res/drawable/ic_battery_circle.xml @@ -18,6 +18,6 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> - \ 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 31eb1930103..7622f146e37 100644 --- a/res/drawable/ic_battery_saver_accent_24dp.xml +++ b/res/drawable/ic_battery_saver_accent_24dp.xml @@ -16,4 +16,4 @@ + android:tint="@color/color_icon_background_blue" /> diff --git a/res/drawable/ic_bt_headphones_a2dp.xml b/res/drawable/ic_bt_headphones_a2dp.xml index a91283164b5..37f7903e70a 100644 --- a/res/drawable/ic_bt_headphones_a2dp.xml +++ b/res/drawable/ic_bt_headphones_a2dp.xml @@ -5,7 +5,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml index 2b700a3dd46..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 index a51a484ee98..56c420f98ba 100644 --- a/res/drawable/ic_cancel_cross.xml +++ b/res/drawable/ic_cancel_cross.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml index 5b442585bab..b12780a0e24 100644 --- a/res/drawable/ic_cast_24dp.xml +++ b/res/drawable/ic_cast_24dp.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml index 76dbed574d3..88bdec66089 100644 --- a/res/drawable/ic_cellular_off.xml +++ b/res/drawable/ic_cellular_off.xml @@ -18,15 +18,14 @@ Copyright (C) 2014 The Android Open Source Project android:height="24dp" android:autoMirrored="true" android:viewportHeight="24" - android:viewportWidth="24" - android:tint="?android:attr/colorAccent"> + android:viewportWidth="24"> diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml index ef3428e03b9..a67a2c6ebd1 100644 --- a/res/drawable/ic_check_circle_green.xml +++ b/res/drawable/ic_check_circle_green.xml @@ -23,6 +23,6 @@ android:fillColor="#0F9D58" android:pathData="M32,5.3C17.3,5.3 5.3,17.3 5.3,32s12,26.7 26.7,26.7s26.7,-12 26.7,-26.7S46.7,5.3 32,5.3z"/> diff --git a/res/drawable/ic_chevron_right_24dp.xml b/res/drawable/ic_chevron_right_24dp.xml index 10160e76f69..32ee73d95cc 100644 --- a/res/drawable/ic_chevron_right_24dp.xml +++ b/res/drawable/ic_chevron_right_24dp.xml @@ -21,6 +21,6 @@ android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - diff --git a/res/drawable/ic_corp_badge.xml b/res/drawable/ic_corp_badge.xml index 028e61b3b8a..c6fd14084e3 100644 --- a/res/drawable/ic_corp_badge.xml +++ b/res/drawable/ic_corp_badge.xml @@ -5,9 +5,9 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml index feb407cfd89..801ef387bbb 100644 --- a/res/drawable/ic_data_saver.xml +++ b/res/drawable/ic_data_saver.xml @@ -20,13 +20,13 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml index e08bbf70647..e9af39bdeb4 100644 --- a/res/drawable/ic_delete.xml +++ b/res/drawable/ic_delete.xml @@ -19,12 +19,12 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_delete_accent.xml b/res/drawable/ic_delete_accent.xml index 2f087e8e341..6692cb23e68 100644 --- a/res/drawable/ic_delete_accent.xml +++ b/res/drawable/ic_delete_accent.xml @@ -16,4 +16,4 @@ + android:tint="@color/color_icon_background_blue" /> diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index 1d5fb2ff863..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/default_icon_color"/> \ 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 e799afc9e0b..1d18cb2504e 100644 --- a/res/drawable/ic_do_not_disturb_on_24dp.xml +++ b/res/drawable/ic_do_not_disturb_on_24dp.xml @@ -19,9 +19,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml index 1a6ab14b156..9b4cc03132e 100644 --- a/res/drawable/ic_eject_24dp.xml +++ b/res/drawable/ic_eject_24dp.xml @@ -19,6 +19,6 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" 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_event_white.xml b/res/drawable/ic_event_white.xml index 54e01067c94..9869472a7a0 100644 --- a/res/drawable/ic_event_white.xml +++ b/res/drawable/ic_event_white.xml @@ -20,6 +20,6 @@ Copyright (C) 2018 The Android Open Source Project android:viewportHeight="24.0"> diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml index fbae47236d3..8430ba92a86 100644 --- a/res/drawable/ic_expand_less.xml +++ b/res/drawable/ic_expand_less.xml @@ -22,7 +22,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_expand_more_inverse.xml b/res/drawable/ic_expand_more_inverse.xml index b148d2f2231..f28800127aa 100644 --- a/res/drawable/ic_expand_more_inverse.xml +++ b/res/drawable/ic_expand_more_inverse.xml @@ -22,7 +22,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_face_enroll_introduction_detail.xml b/res/drawable/ic_face_enroll_introduction_detail.xml index 901a8a2cb4c..05083aba113 100644 --- a/res/drawable/ic_face_enroll_introduction_detail.xml +++ b/res/drawable/ic_face_enroll_introduction_detail.xml @@ -25,9 +25,9 @@ \ No newline at end of file diff --git a/res/drawable/ic_face_enroll_introduction_people.xml b/res/drawable/ic_face_enroll_introduction_people.xml index 4f5074d6138..2e368e8f866 100644 --- a/res/drawable/ic_face_enroll_introduction_people.xml +++ b/res/drawable/ic_face_enroll_introduction_people.xml @@ -19,7 +19,7 @@ + android:tint="@color/color_icon_background_blue"> + android:tint="@color/color_icon_background_blue"> + android:tint="@color/color_icon_background_blue"> - - diff --git a/res/drawable/ic_face_header.xml b/res/drawable/ic_face_header.xml index 77244120963..731123e3fa7 100644 --- a/res/drawable/ic_face_header.xml +++ b/res/drawable/ic_face_header.xml @@ -21,10 +21,10 @@ android:viewportWidth="24"> \ No newline at end of file diff --git a/res/drawable/ic_feedback_24dp.xml b/res/drawable/ic_feedback_24dp.xml index 7fa4a6278be..c4e9cb11bd1 100644 --- a/res/drawable/ic_feedback_24dp.xml +++ b/res/drawable/ic_feedback_24dp.xml @@ -19,12 +19,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_find_in_page_24px.xml b/res/drawable/ic_find_in_page_24px.xml index 54438275b42..bb397b62667 100644 --- a/res/drawable/ic_find_in_page_24px.xml +++ b/res/drawable/ic_find_in_page_24px.xml @@ -21,6 +21,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_fingerprint.xml b/res/drawable/ic_fingerprint.xml index 2d24a4d7b8e..ef0622c874c 100644 --- a/res/drawable/ic_fingerprint.xml +++ b/res/drawable/ic_fingerprint.xml @@ -6,26 +6,26 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_fingerprint_24dp.xml b/res/drawable/ic_fingerprint_24dp.xml index d235609d6eb..c6d7b7b7f06 100644 --- a/res/drawable/ic_fingerprint_24dp.xml +++ b/res/drawable/ic_fingerprint_24dp.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_fingerprint_list_icon.xml b/res/drawable/ic_fingerprint_list_icon.xml index 646e9807aa1..14856bd7e34 100644 --- a/res/drawable/ic_fingerprint_list_icon.xml +++ b/res/drawable/ic_fingerprint_list_icon.xml @@ -6,26 +6,26 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_fingerprint_success.xml b/res/drawable/ic_fingerprint_success.xml index 14a585c4aca..a9bc6de92fa 100644 --- a/res/drawable/ic_fingerprint_success.xml +++ b/res/drawable/ic_fingerprint_success.xml @@ -22,8 +22,8 @@ android:viewportHeight="40.0"> + android:fillColor="@color/color_icon_background_blue"/> + android:fillColor="@android:color/white"/> diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml index faa67fbe383..784b125af9a 100644 --- a/res/drawable/ic_folder_vd_theme_24.xml +++ b/res/drawable/ic_folder_vd_theme_24.xml @@ -6,15 +6,15 @@ diff --git a/res/drawable/ic_font_size_16dp.xml b/res/drawable/ic_font_size_16dp.xml index 751fef7138f..00ab49ace8b 100644 --- a/res/drawable/ic_font_size_16dp.xml +++ b/res/drawable/ic_font_size_16dp.xml @@ -19,7 +19,7 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/res/drawable/ic_font_size_24dp.xml b/res/drawable/ic_font_size_24dp.xml index 071429ae1c5..615b81c1313 100644 --- a/res/drawable/ic_font_size_24dp.xml +++ b/res/drawable/ic_font_size_24dp.xml @@ -19,7 +19,7 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/res/drawable/ic_frequency_antenna.xml b/res/drawable/ic_frequency_antenna.xml index 2e14d0f6d1d..9d9c6577b5f 100644 --- a/res/drawable/ic_frequency_antenna.xml +++ b/res/drawable/ic_frequency_antenna.xml @@ -23,5 +23,5 @@ android:pathData="M12,5c-3.9,0-7,3.1-7,7h2c0-2.8,2.2-5,5-5s5,2.2,5,5h2C19,8.1,15.9,5,12,5z M13,14.3c0.9-0.4,1.5-1.3,1.5-2.3 c0-1.4-1.1-2.5-2.5-2.5S9.5,10.6,9.5,12c0,1,0.6,1.9,1.5,2.3v3.3L7.6,21L9,22.4l3-3l3,3l1.4-1.4L13,17.6V14.3z M12,1 C5.9,1,1,5.9,1,12h2c0-5,4-9,9-9s9,4,9,9h2C23,5.9,18.1,1,12,1z" - android:fillColor="@color/color_default_accent" /> + 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 a35dc9a735d..326c88984a0 100644 --- a/res/drawable/ic_friction_lock_closed.xml +++ b/res/drawable/ic_friction_lock_closed.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_friction_money.xml b/res/drawable/ic_friction_money.xml index fff25d00f7f..1e30ee94e95 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"> - - - - + + + diff --git a/res/drawable/ic_gray_scale_24dp.xml b/res/drawable/ic_gray_scale_24dp.xml index 815b0752ab7..359bcc02b02 100644 --- a/res/drawable/ic_gray_scale_24dp.xml +++ b/res/drawable/ic_gray_scale_24dp.xml @@ -19,7 +19,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_headset_24dp.xml b/res/drawable/ic_headset_24dp.xml index 35f5be2832d..8b1c03bc175 100644 --- a/res/drawable/ic_headset_24dp.xml +++ b/res/drawable/ic_headset_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml index ea676944412..fae4abce079 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 db52edffb72..dcc58788abd 100644 --- a/res/drawable/ic_homepage_accessibility.xml +++ b/res/drawable/ic_homepage_accessibility.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_homepage_connected_device.xml b/res/drawable/ic_homepage_connected_device.xml index 1bbdd28e185..430d65abd5e 100644 --- a/res/drawable/ic_homepage_connected_device.xml +++ b/res/drawable/ic_homepage_connected_device.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_homepage_privacy.xml b/res/drawable/ic_homepage_privacy.xml index 7fc10c360bf..85b5c6c58b3 100644 --- a/res/drawable/ic_homepage_privacy.xml +++ b/res/drawable/ic_homepage_privacy.xml @@ -4,7 +4,7 @@ android:viewportWidth="21.637253" android:viewportHeight="21.637253"> diff --git a/res/drawable/ic_homepage_system_dashboard.xml b/res/drawable/ic_homepage_system_dashboard.xml index d0e02b5e495..60a1714396d 100644 --- a/res/drawable/ic_homepage_system_dashboard.xml +++ b/res/drawable/ic_homepage_system_dashboard.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_info.xml b/res/drawable/ic_info.xml index e53b5588f9b..35ae6f07fca 100644 --- a/res/drawable/ic_info.xml +++ b/res/drawable/ic_info.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml index 8f97ce93e6e..06f74ba9643 100644 --- a/res/drawable/ic_info_outline_24dp.xml +++ b/res/drawable/ic_info_outline_24dp.xml @@ -20,12 +20,12 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/res/drawable/ic_keyboard.xml b/res/drawable/ic_keyboard.xml index d2ce7c5b98d..53ea6894668 100644 --- a/res/drawable/ic_keyboard.xml +++ b/res/drawable/ic_keyboard.xml @@ -21,6 +21,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml index d1810a120c0..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 e079b4b5e06..b88752367f6 100644 --- a/res/drawable/ic_lightbulb_outline_24.xml +++ b/res/drawable/ic_lightbulb_outline_24.xml @@ -21,7 +21,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_lock_lock.xml b/res/drawable/ic_lock_lock.xml index 9b09bc28981..e83bf81c454 100644 --- a/res/drawable/ic_lock_lock.xml +++ b/res/drawable/ic_lock_lock.xml @@ -21,6 +21,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml index 76e8ee1a791..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" /> \ No newline at end of file diff --git a/res/drawable/ic_mode_edit.xml b/res/drawable/ic_mode_edit.xml index c38cba709d5..996894386b0 100644 --- a/res/drawable/ic_mode_edit.xml +++ b/res/drawable/ic_mode_edit.xml @@ -5,6 +5,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml index 5def0c25af8..0209345c270 100644 --- a/res/drawable/ic_more_24.xml +++ b/res/drawable/ic_more_24.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml index 764781c1b9c..8594582cc91 100644 --- a/res/drawable/ic_network_cell.xml +++ b/res/drawable/ic_network_cell.xml @@ -7,7 +7,7 @@ + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_notification_alert.xml b/res/drawable/ic_notification_alert.xml index 1fccfaec0b3..55cf0680125 100644 --- a/res/drawable/ic_notification_alert.xml +++ b/res/drawable/ic_notification_alert.xml @@ -34,7 +34,7 @@ Copyright (C) 2019 The Android Open Source Project android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_notification_silence.xml b/res/drawable/ic_notification_silence.xml index be1b73da81f..87469e8b475 100644 --- a/res/drawable/ic_notification_silence.xml +++ b/res/drawable/ic_notification_silence.xml @@ -34,7 +34,7 @@ Copyright (C) 2019 The Android Open Source Project android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_notifications_alert.xml b/res/drawable/ic_notifications_alert.xml index 3dfa3bbe438..554dc26f5e2 100644 --- a/res/drawable/ic_notifications_alert.xml +++ b/res/drawable/ic_notifications_alert.xml @@ -19,6 +19,6 @@ Copyright (C) 2019 The Android Open Source Project android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_open_wifi_autoconnect.xml b/res/drawable/ic_open_wifi_autoconnect.xml index 37b8d08e69a..d3c10c33615 100644 --- a/res/drawable/ic_open_wifi_autoconnect.xml +++ b/res/drawable/ic_open_wifi_autoconnect.xml @@ -20,5 +20,5 @@ 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 55fbe16b3f1..60b16f0d04c 100644 --- a/res/drawable/ic_open_wifi_notifications.xml +++ b/res/drawable/ic_open_wifi_notifications.xml @@ -20,17 +20,17 @@ 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_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml index a12560ea29d..a8bb88f32da 100644 --- a/res/drawable/ic_pan_tool_18dp.xml +++ b/res/drawable/ic_pan_tool_18dp.xml @@ -7,6 +7,6 @@ + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml index 67983218713..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 fee4b013416..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_phone_info.xml b/res/drawable/ic_phone_info.xml index ada4d9f6fb6..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 6217067f9cf..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 index 01e345625fd..d2d664e3c50 100644 --- a/res/drawable/ic_print.xml +++ b/res/drawable/ic_print.xml @@ -6,5 +6,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> \ No newline at end of file diff --git a/res/drawable/ic_print_error.xml b/res/drawable/ic_print_error.xml index ef4745cdce3..779679132fe 100644 --- a/res/drawable/ic_print_error.xml +++ b/res/drawable/ic_print_error.xml @@ -6,5 +6,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> \ No newline at end of file diff --git a/res/drawable/ic_privacy_shield_24dp.xml b/res/drawable/ic_privacy_shield_24dp.xml index 02a1c637477..2066b2366d8 100644 --- a/res/drawable/ic_privacy_shield_24dp.xml +++ b/res/drawable/ic_privacy_shield_24dp.xml @@ -20,9 +20,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_private_dns.xml b/res/drawable/ic_private_dns.xml index 88e25913a87..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_qrcode.xml b/res/drawable/ic_qrcode.xml new file mode 100644 index 00000000000..e1d8296307c --- /dev/null +++ b/res/drawable/ic_qrcode.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_qrcode_24dp.xml b/res/drawable/ic_qrcode_24dp.xml index 3691db74831..2b44ffa9f96 100644 --- a/res/drawable/ic_qrcode_24dp.xml +++ b/res/drawable/ic_qrcode_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_radio_button_checked_black_24dp.xml b/res/drawable/ic_radio_button_checked_black_24dp.xml index 27b7c61dc51..1ed0ca54894 100644 --- a/res/drawable/ic_radio_button_checked_black_24dp.xml +++ b/res/drawable/ic_radio_button_checked_black_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/res/drawable/ic_radio_button_unchecked_black_24dp.xml index fd289428bbe..8c7f92c7335 100644 --- a/res/drawable/ic_radio_button_unchecked_black_24dp.xml +++ b/res/drawable/ic_radio_button_unchecked_black_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_remove_24dp.xml b/res/drawable/ic_remove_24dp.xml index 82443fe5022..28049129f41 100644 --- a/res/drawable/ic_remove_24dp.xml +++ b/res/drawable/ic_remove_24dp.xml @@ -19,6 +19,6 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml index e79c406c7d1..622ab78c240 100644 --- a/res/drawable/ic_restore.xml +++ b/res/drawable/ic_restore.xml @@ -6,7 +6,7 @@ diff --git a/res/drawable/ic_scan_24dp.xml b/res/drawable/ic_scan_24dp.xml index 3739e1e5da4..481df6d0233 100644 --- a/res/drawable/ic_scan_24dp.xml +++ b/res/drawable/ic_scan_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_sd_card.xml b/res/drawable/ic_sd_card.xml index 0f4c18c5c71..2ff754ddae9 100644 --- a/res/drawable/ic_sd_card.xml +++ b/res/drawable/ic_sd_card.xml @@ -6,7 +6,7 @@ diff --git a/res/drawable/ic_search.xml b/res/drawable/ic_search.xml new file mode 100644 index 00000000000..d05bf423449 --- /dev/null +++ b/res/drawable/ic_search.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_security_lock_24dp.xml b/res/drawable/ic_security_lock_24dp.xml index e30c161bd44..15835b2ee43 100644 --- a/res/drawable/ic_security_lock_24dp.xml +++ b/res/drawable/ic_security_lock_24dp.xml @@ -21,5 +21,5 @@ android:height="24dp"> + android:fillColor="@color/default_icon_color" /> diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml index e0dbb26846a..cdf47d5322d 100644 --- a/res/drawable/ic_settings_24dp.xml +++ b/res/drawable/ic_settings_24dp.xml @@ -7,15 +7,15 @@ + android:fillColor="@color/color_icon_background_blue"/> + android:fillColor="@android:color/white"/> + android:fillColor="@android:color/white"/> diff --git a/res/drawable/ic_settings_accent.xml b/res/drawable/ic_settings_accent.xml index a3d917d6912..b719d3ab095 100644 --- a/res/drawable/ic_settings_accent.xml +++ b/res/drawable/ic_settings_accent.xml @@ -20,9 +20,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index 1bdd6a44eb3..eed402641d8 100644 --- a/res/drawable/ic_settings_accessibility.xml +++ b/res/drawable/ic_settings_accessibility.xml @@ -5,7 +5,7 @@ android:viewportHeight="32"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_settings_aod.xml b/res/drawable/ic_settings_aod.xml index 35c60033ad1..d72fa9d6bfd 100644 --- a/res/drawable/ic_settings_aod.xml +++ b/res/drawable/ic_settings_aod.xml @@ -21,13 +21,13 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_backup.xml b/res/drawable/ic_settings_backup.xml index 8eaf64f00ce..67ee1b2b55a 100644 --- a/res/drawable/ic_settings_backup.xml +++ b/res/drawable/ic_settings_backup.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_backup_restore.xml b/res/drawable/ic_settings_backup_restore.xml index d69149f20df..8fa76854f00 100644 --- a/res/drawable/ic_settings_backup_restore.xml +++ b/res/drawable/ic_settings_backup_restore.xml @@ -20,5 +20,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml index a19de30c812..c1b022484ac 100644 --- a/res/drawable/ic_settings_battery.xml +++ b/res/drawable/ic_settings_battery.xml @@ -24,28 +24,28 @@ android:fillColor="#2CCF69" android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" /> diff --git a/res/drawable/ic_settings_battery_white.xml b/res/drawable/ic_settings_battery_white.xml index 621f37dc1d4..bca27fad405 100644 --- a/res/drawable/ic_settings_battery_white.xml +++ b/res/drawable/ic_settings_battery_white.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml index 80fb602a8e1..1d5dd0968dd 100644 --- a/res/drawable/ic_settings_bluetooth.xml +++ b/res/drawable/ic_settings_bluetooth.xml @@ -5,6 +5,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml index d8900554734..2dcbab7b4e1 100644 --- a/res/drawable/ic_settings_camera.xml +++ b/res/drawable/ic_settings_camera.xml @@ -22,7 +22,7 @@ android:viewportHeight="48" android:autoMirrored="true"> - diff --git a/res/drawable/ic_settings_cog.xml b/res/drawable/ic_settings_cog.xml new file mode 100644 index 00000000000..4c28e1022da --- /dev/null +++ b/res/drawable/ic_settings_cog.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml index fd550ee87a9..0128355adda 100644 --- a/res/drawable/ic_settings_data_usage.xml +++ b/res/drawable/ic_settings_data_usage.xml @@ -9,19 +9,19 @@ android:fillColor="#E83A52" android:pathData="M25.2477 32H6.75229C3.02611 32 0 28.9739 0 25.2477V6.75229C0 3.02611 3.02611 0 6.75229 0H25.2477C28.9739 0 32 3.02611 32 6.75229V25.2477C32 28.9739 28.9739 32 25.2477 32Z" /> \ No newline at end of file diff --git a/res/drawable/ic_settings_delete.xml b/res/drawable/ic_settings_delete.xml index 8d5a5ff019c..ac079ffebda 100644 --- a/res/drawable/ic_settings_delete.xml +++ b/res/drawable/ic_settings_delete.xml @@ -20,12 +20,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_disable.xml b/res/drawable/ic_settings_disable.xml index f5ed2ca86f6..bafccaffb73 100644 --- a/res/drawable/ic_settings_disable.xml +++ b/res/drawable/ic_settings_disable.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml index 267021a74dd..024af9a899e 100644 --- a/res/drawable/ic_settings_display.xml +++ b/res/drawable/ic_settings_display.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_settings_enable.xml b/res/drawable/ic_settings_enable.xml index ea698e864dd..27fa79b9f27 100644 --- a/res/drawable/ic_settings_enable.xml +++ b/res/drawable/ic_settings_enable.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_force_stop.xml b/res/drawable/ic_settings_force_stop.xml index 2fc9b5eced0..b0c36df6d76 100644 --- a/res/drawable/ic_settings_force_stop.xml +++ b/res/drawable/ic_settings_force_stop.xml @@ -20,12 +20,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml index 753dfd44a75..00ff7859f23 100644 --- a/res/drawable/ic_settings_gestures.xml +++ b/res/drawable/ic_settings_gestures.xml @@ -6,14 +6,14 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_settings_home.xml b/res/drawable/ic_settings_home.xml index 60b2ebd6fa2..0afa64bb119 100644 --- a/res/drawable/ic_settings_home.xml +++ b/res/drawable/ic_settings_home.xml @@ -18,6 +18,6 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> - diff --git a/res/drawable/ic_settings_install.xml b/res/drawable/ic_settings_install.xml index c96449b94ff..80a6efaa63f 100644 --- a/res/drawable/ic_settings_install.xml +++ b/res/drawable/ic_settings_install.xml @@ -20,9 +20,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_language.xml b/res/drawable/ic_settings_language.xml index 690c1639eed..5f90b07d1cf 100644 --- a/res/drawable/ic_settings_language.xml +++ b/res/drawable/ic_settings_language.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_settings_memory.xml b/res/drawable/ic_settings_memory.xml index 799e371112a..eeee0483df8 100644 --- a/res/drawable/ic_settings_memory.xml +++ b/res/drawable/ic_settings_memory.xml @@ -6,46 +6,46 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_settings_multiuser.xml b/res/drawable/ic_settings_multiuser.xml index 949491ef80d..a45e8f6cbd5 100644 --- a/res/drawable/ic_settings_multiuser.xml +++ b/res/drawable/ic_settings_multiuser.xml @@ -6,14 +6,14 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/ic_settings_nfc_payment.xml b/res/drawable/ic_settings_nfc_payment.xml index 92b8b99c630..26565717486 100644 --- a/res/drawable/ic_settings_nfc_payment.xml +++ b/res/drawable/ic_settings_nfc_payment.xml @@ -17,6 +17,6 @@ diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml index f730a07ba9b..c4013b060bd 100644 --- a/res/drawable/ic_settings_night_display.xml +++ b/res/drawable/ic_settings_night_display.xml @@ -19,6 +19,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/res/drawable/ic_settings_open.xml b/res/drawable/ic_settings_open.xml index e7198de9b43..dd14c01d8e3 100644 --- a/res/drawable/ic_settings_open.xml +++ b/res/drawable/ic_settings_open.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_personal.xml b/res/drawable/ic_settings_personal.xml index d092ffa4f41..fa9da6e958e 100644 --- a/res/drawable/ic_settings_personal.xml +++ b/res/drawable/ic_settings_personal.xml @@ -20,9 +20,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_settings_phone_idle.xml b/res/drawable/ic_settings_phone_idle.xml index 9a1e8e095c7..6bad242d245 100644 --- a/res/drawable/ic_settings_phone_idle.xml +++ b/res/drawable/ic_settings_phone_idle.xml @@ -20,5 +20,5 @@ android:viewportHeight="48"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml index 3551e6210aa..001c3c6b03a 100644 --- a/res/drawable/ic_settings_print.xml +++ b/res/drawable/ic_settings_print.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml index 05b1c6596ef..25546337bac 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -19,9 +19,9 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_settings_sign_in.xml b/res/drawable/ic_settings_sign_in.xml index 1d3312433ce..0baaa1d550d 100644 --- a/res/drawable/ic_settings_sign_in.xml +++ b/res/drawable/ic_settings_sign_in.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml index f7aba8f8aeb..a94b52893dc 100644 --- a/res/drawable/ic_settings_storage.xml +++ b/res/drawable/ic_settings_storage.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml index 17a2417878a..084e76a145b 100644 --- a/res/drawable/ic_settings_system_dashboard_white.xml +++ b/res/drawable/ic_settings_system_dashboard_white.xml @@ -19,12 +19,12 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_voice_calls.xml b/res/drawable/ic_settings_voice_calls.xml index d13100fa78b..14b8d8ea186 100644 --- a/res/drawable/ic_settings_voice_calls.xml +++ b/res/drawable/ic_settings_voice_calls.xml @@ -20,5 +20,5 @@ android:viewportHeight="48"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml index 5cabb3e73b2..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 878b262dec3..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 70822e89409..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_flashlight.xml b/res/drawable/ic_signal_flashlight.xml index 833c5229d4f..eb170cd1d97 100644 --- a/res/drawable/ic_signal_flashlight.xml +++ b/res/drawable/ic_signal_flashlight.xml @@ -20,9 +20,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_signal_location.xml b/res/drawable/ic_signal_location.xml index 903152b4db9..d8c5d05c6ca 100644 --- a/res/drawable/ic_signal_location.xml +++ b/res/drawable/ic_signal_location.xml @@ -5,9 +5,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_signal_strength_4g.xml b/res/drawable/ic_signal_strength_4g.xml index 837ae3d2870..73151125f47 100644 --- a/res/drawable/ic_signal_strength_4g.xml +++ b/res/drawable/ic_signal_strength_4g.xml @@ -19,9 +19,9 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="13.0" android:viewportHeight="24.0"> \ 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 0fa3b37d07d..06d511470fb 100644 --- a/res/drawable/ic_signal_workmode_enable.xml +++ b/res/drawable/ic_signal_workmode_enable.xml @@ -4,6 +4,6 @@ android:viewportWidth="42.0" android:viewportHeight="42.0"> diff --git a/res/drawable/ic_sim_alert.xml b/res/drawable/ic_sim_alert.xml index 627fe5584e1..1fe136f986f 100644 --- a/res/drawable/ic_sim_alert.xml +++ b/res/drawable/ic_sim_alert.xml @@ -20,7 +20,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_sim_sd.xml b/res/drawable/ic_sim_sd.xml index e7e33778888..47676171b00 100644 --- a/res/drawable/ic_sim_sd.xml +++ b/res/drawable/ic_sim_sd.xml @@ -21,6 +21,6 @@ \ No newline at end of file diff --git a/res/drawable/ic_skip.xml b/res/drawable/ic_skip.xml index df9881d3f52..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 616b45c2a47..4a972939889 100644 --- a/res/drawable/ic_storage.xml +++ b/res/drawable/ic_storage.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_storage_white.xml b/res/drawable/ic_storage_white.xml index 2ac7c3953ab..3f0f7dd4205 100644 --- a/res/drawable/ic_storage_white.xml +++ b/res/drawable/ic_storage_white.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml index 301297cd339..d2609ce971a 100644 --- a/res/drawable/ic_storage_wizard_external.xml +++ b/res/drawable/ic_storage_wizard_external.xml @@ -22,13 +22,13 @@ android:pathData="M64,64m-64,0a64,64 0,1 1,128 0a64,64 0,1 1,-128 0" android:strokeColor="#00000000" android:fillType="evenOdd" - android:fillColor="@color/color_default_view_on_accent" + android:fillColor="@android:color/white" android:strokeWidth="1"/> diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml index 5662c7c6438..760311edff7 100644 --- a/res/drawable/ic_suggestion_close_button.xml +++ b/res/drawable/ic_suggestion_close_button.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0"> diff --git a/res/drawable/ic_suggestion_dnd.xml b/res/drawable/ic_suggestion_dnd.xml index 50113539711..9991c1256a8 100644 --- a/res/drawable/ic_suggestion_dnd.xml +++ b/res/drawable/ic_suggestion_dnd.xml @@ -19,9 +19,9 @@ 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 0947f76472e..dc80cfd5ddb 100644 --- a/res/drawable/ic_suggestion_fingerprint.xml +++ b/res/drawable/ic_suggestion_fingerprint.xml @@ -21,19 +21,19 @@ android:viewportWidth="32.0" android:viewportHeight="32.0"> diff --git a/res/drawable/ic_suggestion_night_display.xml b/res/drawable/ic_suggestion_night_display.xml index 43162058dd1..f3221c7cfde 100644 --- a/res/drawable/ic_suggestion_night_display.xml +++ b/res/drawable/ic_suggestion_night_display.xml @@ -19,6 +19,6 @@ android:viewportHeight="24" android:viewportWidth="24"> diff --git a/res/drawable/ic_suggestion_security.xml b/res/drawable/ic_suggestion_security.xml index 720519381c6..9d87b338ac5 100644 --- a/res/drawable/ic_suggestion_security.xml +++ b/res/drawable/ic_suggestion_security.xml @@ -19,9 +19,9 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/res/drawable/ic_suggestion_wireless.xml b/res/drawable/ic_suggestion_wireless.xml index 18ee359f442..9ae0e4e4f27 100644 --- a/res/drawable/ic_suggestion_wireless.xml +++ b/res/drawable/ic_suggestion_wireless.xml @@ -19,6 +19,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_supervisor.xml b/res/drawable/ic_supervisor.xml index 24a0ccbf8b9..60fc60be8d4 100644 --- a/res/drawable/ic_supervisor.xml +++ b/res/drawable/ic_supervisor.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_support_24dp.xml b/res/drawable/ic_support_24dp.xml index 4e1235e3e56..da605deca89 100644 --- a/res/drawable/ic_support_24dp.xml +++ b/res/drawable/ic_support_24dp.xml @@ -22,7 +22,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml index 6f7771aa988..b87b92fd0ed 100644 --- a/res/drawable/ic_sync.xml +++ b/res/drawable/ic_sync.xml @@ -19,9 +19,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_sync_problem_24dp.xml b/res/drawable/ic_sync_problem_24dp.xml index 900fe404eb5..67d73172c54 100644 --- a/res/drawable/ic_sync_problem_24dp.xml +++ b/res/drawable/ic_sync_problem_24dp.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_theme.xml b/res/drawable/ic_theme.xml index 8e97607e2dc..6f69847b255 100644 --- a/res/drawable/ic_theme.xml +++ b/res/drawable/ic_theme.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> 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_timelapse_white.xml b/res/drawable/ic_timelapse_white.xml index f4cb2b00799..b45e858c62b 100644 --- a/res/drawable/ic_timelapse_white.xml +++ b/res/drawable/ic_timelapse_white.xml @@ -20,6 +20,6 @@ Copyright (C) 2018 The Android Open Source Project android:viewportHeight="24.0"> diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml index 690c1639eed..5f90b07d1cf 100644 --- a/res/drawable/ic_translate_24dp.xml +++ b/res/drawable/ic_translate_24dp.xml @@ -6,7 +6,7 @@ android:viewportHeight="32"> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/ic_volume_ringer_vibrate.xml b/res/drawable/ic_volume_ringer_vibrate.xml index 4256c3ffb15..4153cb758ca 100644 --- a/res/drawable/ic_volume_ringer_vibrate.xml +++ b/res/drawable/ic_volume_ringer_vibrate.xml @@ -7,23 +7,23 @@ diff --git a/res/drawable/ic_volume_up_24dp.xml b/res/drawable/ic_volume_up_24dp.xml index 7f6dcaa958d..0216826bce8 100644 --- a/res/drawable/ic_volume_up_24dp.xml +++ b/res/drawable/ic_volume_up_24dp.xml @@ -20,12 +20,12 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml index e08f8544754..8a6faa23018 100644 --- a/res/drawable/ic_wallpaper.xml +++ b/res/drawable/ic_wallpaper.xml @@ -19,6 +19,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml index 94efde512c0..d31c2d36372 100644 --- a/res/drawable/ic_warning_24dp.xml +++ b/res/drawable/ic_warning_24dp.xml @@ -19,12 +19,12 @@ Copyright (C) 2018 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/ic_wifi_privacy_24dp.xml b/res/drawable/ic_wifi_privacy_24dp.xml index deb91342816..dba9ab32b08 100644 --- a/res/drawable/ic_wifi_privacy_24dp.xml +++ b/res/drawable/ic_wifi_privacy_24dp.xml @@ -20,12 +20,12 @@ android:width="24dp" android:height="24dp"> diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml index a0c2eb503a0..5680558e437 100644 --- a/res/drawable/ic_wifi_signal_0.xml +++ b/res/drawable/ic_wifi_signal_0.xml @@ -7,22 +7,22 @@ diff --git a/res/drawable/ic_wifi_signal_lock.xml b/res/drawable/ic_wifi_signal_lock.xml index 430139904a0..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 a375e5c44a5..c55f7261614 100644 --- a/res/drawable/ic_wifi_tethering.xml +++ b/res/drawable/ic_wifi_tethering.xml @@ -6,13 +6,13 @@ android:viewportHeight="32"> \ No newline at end of file diff --git a/res/drawable/signal_strength_3g.xml b/res/drawable/signal_strength_3g.xml index 7a951f7e55b..2f70f56dbaa 100644 --- a/res/drawable/signal_strength_3g.xml +++ b/res/drawable/signal_strength_3g.xml @@ -20,9 +20,9 @@ android:viewportWidth="13.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/signal_strength_g.xml b/res/drawable/signal_strength_g.xml index ebff17f208e..7fa0b7ae266 100644 --- a/res/drawable/signal_strength_g.xml +++ b/res/drawable/signal_strength_g.xml @@ -20,6 +20,6 @@ android:viewportWidth="7.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/signal_strength_lte.xml b/res/drawable/signal_strength_lte.xml index e056709a851..d1bbbb0b069 100644 --- a/res/drawable/signal_strength_lte.xml +++ b/res/drawable/signal_strength_lte.xml @@ -20,12 +20,12 @@ android:viewportWidth="13.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/thumb.xml b/res/drawable/thumb.xml index 42fbd8cc115..53dafb0ff81 100644 --- a/res/drawable/thumb.xml +++ b/res/drawable/thumb.xml @@ -27,6 +27,6 @@ android:paddingLeft="8dp" android:paddingRight="8dp" /> - + \ No newline at end of file diff --git a/res/drawable/tile_icon_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml index d0c2aa45c42..05acb14e870 100644 --- a/res/drawable/tile_icon_animation_speed.xml +++ b/res/drawable/tile_icon_animation_speed.xml @@ -19,6 +19,6 @@ Copyright (C) 2017 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/tile_icon_force_rtl.xml b/res/drawable/tile_icon_force_rtl.xml index 907db9efb79..4054b2ececb 100644 --- a/res/drawable/tile_icon_force_rtl.xml +++ b/res/drawable/tile_icon_force_rtl.xml @@ -19,42 +19,48 @@ Copyright (C) 2017 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/tile_icon_graphics.xml b/res/drawable/tile_icon_graphics.xml index b0521e431a6..6b6bb1bbf9b 100644 --- a/res/drawable/tile_icon_graphics.xml +++ b/res/drawable/tile_icon_graphics.xml @@ -19,34 +19,34 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/tile_icon_sensors_off.xml b/res/drawable/tile_icon_sensors_off.xml index accb1670d10..11855c523d0 100644 --- a/res/drawable/tile_icon_sensors_off.xml +++ b/res/drawable/tile_icon_sensors_off.xml @@ -22,7 +22,7 @@ \ 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 d97d31a5eeb..0df01871442 100644 --- a/res/drawable/tile_icon_winscope_trace.xml +++ b/res/drawable/tile_icon_winscope_trace.xml @@ -20,9 +20,9 @@ android:viewportHeight="24.0"> + android:fillColor="@color/default_icon_color"/> + android:fillColor="@color/default_icon_color"/> diff --git a/res/drawable/wifi_dpp_success.xml b/res/drawable/wifi_dpp_success.xml index d8ed51407ef..aa8924876eb 100644 --- a/res/drawable/wifi_dpp_success.xml +++ b/res/drawable/wifi_dpp_success.xml @@ -11,7 +11,7 @@ android:fillColor="#E8EAED"/> + android:fillColor="@color/color_icon_background_blue"/> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml index 544dd269d84..d6b2228a818 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -35,7 +35,7 @@ android:layout_marginTop="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?android:attr/colorAccent"/> + android:textColor="@color/color_default_accent"/> + android:textColor="@color/color_default_accent"/> @@ -90,8 +88,6 @@ android:layout_alignParentEnd="true" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_font_size_24dp" - android:tint="?android:attr/textColorPrimary" - android:tintMode="src_in" android:scaleType="center" android:focusable="true" android:contentDescription="@string/font_size_make_larger_desc" /> diff --git a/res/layout-sw300dp-land/screen_zoom_activity.xml b/res/layout-sw300dp-land/screen_zoom_activity.xml index 0f1c000b000..9b15ddbef96 100644 --- a/res/layout-sw300dp-land/screen_zoom_activity.xml +++ b/res/layout-sw300dp-land/screen_zoom_activity.xml @@ -79,8 +79,6 @@ android:layout_alignParentStart="true" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_remove_24dp" - android:tint="?android:attr/textColorPrimary" - android:tintMode="src_in" android:scaleType="center" android:focusable="true" android:contentDescription="@string/screen_zoom_make_smaller_desc" /> @@ -92,8 +90,6 @@ android:layout_alignParentEnd="true" android:background="?android:attr/selectableItemBackgroundBorderless" android:src="@drawable/ic_add_24dp" - android:tint="?android:attr/textColorPrimary" - android:tintMode="src_in" android:scaleType="center" android:focusable="true" android:contentDescription="@string/screen_zoom_make_larger_desc" /> diff --git a/res/layout/admin_disabled_other_options_footer.xml b/res/layout/admin_disabled_other_options_footer.xml index 31327bbfe72..22e25a9a836 100644 --- a/res/layout/admin_disabled_other_options_footer.xml +++ b/res/layout/admin_disabled_other_options_footer.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/admin_more_details" - android:textColor="?android:attr/colorAccent" + android:textColor="@color/color_default_accent" android:clickable="true" android:background="?android:attr/selectableItemBackground" /> \ No newline at end of file diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml index 66eaf0de62b..79b8e90fef0 100644 --- a/res/layout/admin_support_details_dialog.xml +++ b/res/layout/admin_support_details_dialog.xml @@ -52,7 +52,7 @@ android:text="@string/default_admin_support_msg" android:maxLength="200" android:autoLink="email|phone|web" - android:textColor="?android:attr/textColorSecondary"/> + android:textColor="@color/color_default_secondary_text"/> diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml index fa98d88e2fc..fb145949b2d 100644 --- a/res/layout/apn_preference_layout.xml +++ b/res/layout/apn_preference_layout.xml @@ -47,7 +47,7 @@ android:layout_below="@android:id/title" android:layout_alignStart="@android:id/title" android:textAppearance="?android:attr/textAppearanceListItemSecondary" - android:textColor="?android:attr/textColorSecondary" + android:textColor="@color/color_default_secondary_text" android:maxLines="2" /> diff --git a/res/layout/battery_active_view.xml b/res/layout/battery_active_view.xml index bdc03289636..c385e88217c 100644 --- a/res/layout/battery_active_view.xml +++ b/res/layout/battery_active_view.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:textAlignment="viewStart" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="@color/color_default_secondary_text" /> - android:textColor="?android:attr/textColorPrimary"/> + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" + android:textColor="@color/color_default_primary_text"/> diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml index ff838019682..6f42576b90a 100644 --- a/res/layout/battery_history_detail.xml +++ b/res/layout/battery_history_detail.xml @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:textSize="36sp" - android:textColor="?android:attr/colorAccent"/> + android:textColor="@color/color_default_accent"/> + android:textColor="@color/color_default_secondary_text"/> + settings:textColor="@color/color_default_secondary_text"/> + android:textColor="@color/color_default_accent" /> + settings:textColor="@color/color_default_secondary_text" /> + android:textColor="@color/color_default_secondary_text"/> + android:textColor="@color/color_default_secondary_text"/> + android:textColor="@color/color_default_secondary_text"/> diff --git a/res/layout/bugreport_options_dialog.xml b/res/layout/bugreport_options_dialog.xml index fd00bc646f2..26d5ba73941 100644 --- a/res/layout/bugreport_options_dialog.xml +++ b/res/layout/bugreport_options_dialog.xml @@ -49,7 +49,7 @@ android:paddingEnd="?android:attr/dialogPreferredPadding" android:text="@*android:string/bugreport_option_interactive_summary" android:textAppearance="?android:attr/textAppearanceListItemSecondary" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="@color/color_default_secondary_text" /> + android:textColor="@color/color_default_secondary_text" /> diff --git a/res/layout/conditional_card_full_tile.xml b/res/layout/conditional_card_full_tile.xml index 81889fb3efc..9f62659e5b0 100644 --- a/res/layout/conditional_card_full_tile.xml +++ b/res/layout/conditional_card_full_tile.xml @@ -42,7 +42,7 @@ android:id="@android:id/icon" android:layout_width="@dimen/contextual_card_icon_size" android:layout_height="@dimen/contextual_card_icon_size" - android:tint="?android:attr/colorAccent"/> + android:tint="@color/color_default_accent"/> + android:tint="@color/color_default_accent"/> \ No newline at end of file + android:tint="@color/color_default_accent"/> \ No newline at end of file diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml index ed25e747174..5d167c823a3 100644 --- a/res/layout/confirm_lock_password_base.xml +++ b/res/layout/confirm_lock_password_base.xml @@ -38,7 +38,7 @@ android:layout_marginTop="?attr/confirmDeviceCredentialsTopMargin" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?android:attr/colorAccent"/> + android:textColor="@color/color_default_accent"/> + android:textColor="@color/color_default_accent"/> @@ -88,14 +88,14 @@ android:ellipsize="marquee" android:text="@string/data_usage_label_background" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" - android:textColor="?android:attr/textColorSecondary" + android:textColor="@color/color_default_secondary_text" android:textAlignment="viewStart" /> diff --git a/res/layout/data_usage_graph.xml b/res/layout/data_usage_graph.xml index ef16341b7c1..4d41317ce91 100644 --- a/res/layout/data_usage_graph.xml +++ b/res/layout/data_usage_graph.xml @@ -27,8 +27,8 @@ android:layout_width="match_parent" android:layout_height="@dimen/data_usage_chart_height" settings:sideLabels="@array/battery_labels" - android:colorAccent="?android:attr/colorAccent" + android:colorAccent="@color/color_default_accent" android:gravity="end" - settings:textColor="?android:attr/textColorSecondary" /> + settings:textColor="@color/color_default_secondary_text" /> diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml index 0369908c0a3..a91bad81f7e 100644 --- a/res/layout/data_usage_summary_preference.xml +++ b/res/layout/data_usage_summary_preference.xml @@ -31,7 +31,7 @@ android:id="@+id/usage_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?android:attr/textColorPrimary" + android:textColor="@color/color_default_primary_text" android:text="@string/data_usage_title" /> + android:textColor="@color/color_default_accent" /> + android:textColor="@color/color_default_secondary_text" /> + android:textColor="@color/color_default_secondary_text" /> @@ -106,7 +106,7 @@ android:id="@+id/data_limits" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="@color/color_default_secondary_text" /> \ No newline at end of file diff --git a/res/layout/dialog_mobile_network_color_picker_item.xml b/res/layout/dialog_mobile_network_color_picker_item.xml index b6f40929ef4..2ac348e8985 100644 --- a/res/layout/dialog_mobile_network_color_picker_item.xml +++ b/res/layout/dialog_mobile_network_color_picker_item.xml @@ -36,6 +36,6 @@ android:paddingTop="@dimen/sim_label_padding" android:paddingBottom="@dimen/sim_label_padding" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" - android:textColor="?android:attr/textColorPrimary"/> + android:textColor="@color/color_default_primary_text"/> \ No newline at end of file diff --git a/res/layout/dialog_mobile_network_rename.xml b/res/layout/dialog_mobile_network_rename.xml index 921ab8602e5..c54f4a6c45f 100644 --- a/res/layout/dialog_mobile_network_rename.xml +++ b/res/layout/dialog_mobile_network_rename.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/sim_label_padding" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" - android:textColor="?android:attr/textColorPrimary" + android:textColor="@color/color_default_primary_text" android:text="@string/mobile_network_sim_name_label"/> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/sim_label_padding" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" - android:textColor="?android:attr/textColorPrimary" + android:textColor="@color/color_default_primary_text" android:text="@string/status_operator"/> + android:textColor="@color/color_default_secondary_text" />