From 5275407ca0d7cce957939fea8a974d47094d75cf Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 9 Sep 2021 22:23:28 +0600 Subject: [PATCH] 3270-Q-UI_revamp issue: https://gitlab.e.foundation/e/backlog/-/issues/3270 --- AndroidManifest.xml | 18 +- ...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/drawable/color_bar_progress.xml | 2 +- res/drawable/conversation_message_icon.xml | 2 +- res/drawable/dark_theme.xml | 5 +- res/drawable/data_sweep_limit.xml | 2 +- res/drawable/data_sweep_warning.xml | 2 +- res/drawable/drag_handle.xml | 5 +- 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_add_24dp.xml | 5 +- res/drawable/ic_android.xml | 5 +- res/drawable/ic_arrow_back.xml | 5 +- res/drawable/ic_arrow_circle_down.xml | 10 + res/drawable/ic_arrow_circle_up.xml | 10 + res/drawable/ic_arrow_down_24dp.xml | 3 +- res/drawable/ic_attach_money_black_24dp.xml | 5 +- res/drawable/ic_audio_alarm.xml | 9 + res/drawable/ic_audio_alarm_mute.xml | 10 + res/drawable/ic_auto_wifi.xml | 9 +- res/drawable/ic_battery_circle.xml | 5 +- res/drawable/ic_bt_headphones_a2dp.xml | 11 + res/drawable/ic_cancel.xml | 4 +- res/drawable/ic_cancel_cross.xml | 24 ++ res/drawable/ic_cast_24dp.xml | 2 +- res/drawable/ic_cellular_1_bar.xml | 7 +- res/drawable/ic_check_circle_green.xml | 2 +- res/drawable/ic_chevron_right_24dp.xml | 5 +- res/drawable/ic_corp_badge.xml | 13 ++ res/drawable/ic_data_saver.xml | 9 +- res/drawable/ic_delete.xml | 9 +- res/drawable/ic_devices_other.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_white.xml | 2 +- res/drawable/ic_expand.xml | 2 +- res/drawable/ic_expand_less.xml | 5 +- res/drawable/ic_expand_more_inverse.xml | 5 +- .../ic_face_enroll_introduction_detail.xml | 5 +- .../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 | 5 +- res/drawable/ic_feedback_24dp.xml | 20 +- res/drawable/ic_find_in_page_24px.xml | 5 +- 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 | 2 +- res/drawable/ic_folder_vd_theme_24.xml | 6 +- 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 | 3 +- 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 | 5 +- res/drawable/ic_help.xml | 12 +- 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 | 5 +- res/drawable/ic_homepage_system_dashboard.xml | 2 +- res/drawable/ic_hotspot.xml | 14 +- res/drawable/ic_info.xml | 10 + res/drawable/ic_info_outline_24dp.xml | 9 +- res/drawable/ic_keyboard.xml | 26 +++ res/drawable/ic_label.xml | 2 +- res/drawable/ic_lightbulb_outline_24.xml | 5 +- res/drawable/ic_local_phone_24_lib.xml | 12 +- res/drawable/ic_lock_lock.xml | 26 +++ res/drawable/ic_media_stream_off.xml | 4 +- 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 +- res/drawable/ic_nfc.xml | 5 +- res/drawable/ic_notification_alert.xml | 2 +- res/drawable/ic_notification_silence.xml | 2 +- res/drawable/ic_notifications_alert.xml | 2 +- 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_ota_update_available.xml | 2 +- res/drawable/ic_ota_update_current.xml | 2 +- res/drawable/ic_ota_update_none.xml | 2 +- res/drawable/ic_ota_update_stale.xml | 2 +- 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 | 10 + res/drawable/ic_print_error.xml | 10 + res/drawable/ic_privacy_shield_24dp.xml | 7 +- res/drawable/ic_private_dns.xml | 2 +- res/drawable/ic_qrcode_24dp.xml | 5 +- .../ic_radio_button_checked_black_24dp.xml | 12 +- .../ic_radio_button_unchecked_black_24dp.xml | 12 +- res/drawable/ic_remove_24dp.xml | 5 +- res/drawable/ic_restore.xml | 2 +- res/drawable/ic_scan_24dp.xml | 5 +- res/drawable/ic_sd_card.xml | 2 +- res/drawable/ic_security_lock_24dp.xml | 5 +- res/drawable/ic_settings_24dp.xml | 6 +- res/drawable/ic_settings_accent.xml | 7 +- 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 | 9 +- res/drawable/ic_settings_backup.xml | 5 +- res/drawable/ic_settings_backup_restore.xml | 5 +- res/drawable/ic_settings_battery.xml | 14 +- res/drawable/ic_settings_battery_white.xml | 2 +- res/drawable/ic_settings_bluetooth.xml | 13 +- res/drawable/ic_settings_camera.xml | 5 +- res/drawable/ic_settings_close.xml | 2 +- res/drawable/ic_settings_data_usage.xml | 8 +- res/drawable/ic_settings_delete.xml | 6 +- res/drawable/ic_settings_disable.xml | 5 +- res/drawable/ic_settings_display.xml | 2 +- res/drawable/ic_settings_display_white.xml | 12 +- res/drawable/ic_settings_enable.xml | 5 +- res/drawable/ic_settings_force_stop.xml | 6 +- res/drawable/ic_settings_gestures.xml | 6 +- res/drawable/ic_settings_home.xml | 5 +- 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 | 3 +- res/drawable/ic_settings_open.xml | 2 +- res/drawable/ic_settings_personal.xml | 4 +- res/drawable/ic_settings_phone_idle.xml | 5 +- 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 | 16 +- res/drawable/ic_settings_sign_in.xml | 12 +- res/drawable/ic_settings_storage.xml | 2 +- res/drawable/ic_settings_sync.xml | 5 +- .../ic_settings_system_dashboard_white.xml | 20 +- res/drawable/ic_settings_voice_calls.xml | 5 +- 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 | 13 ++ res/drawable/ic_signal_strength_4g.xml | 7 +- res/drawable/ic_signal_workmode_enable.xml | 12 +- res/drawable/ic_sim_alert.xml | 12 +- res/drawable/ic_sim_sd.xml | 5 +- res/drawable/ic_skip.xml | 2 +- res/drawable/ic_storage.xml | 5 +- res/drawable/ic_storage_white.xml | 12 +- 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 | 5 +- res/drawable/ic_suggestion_dnd.xml | 7 +- res/drawable/ic_suggestion_fingerprint.xml | 11 +- res/drawable/ic_suggestion_night_display.xml | 3 +- res/drawable/ic_suggestion_security.xml | 7 +- res/drawable/ic_suggestion_wireless.xml | 5 +- res/drawable/ic_supervisor.xml | 10 + res/drawable/ic_support_24dp.xml | 5 +- res/drawable/ic_swap_horiz.xml | 12 +- res/drawable/ic_sync.xml | 7 +- res/drawable/ic_sync_problem_24dp.xml | 5 +- res/drawable/ic_theme.xml | 5 +- 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 | 20 +- res/drawable/ic_wallpaper.xml | 5 +- res/drawable/ic_warning_24dp.xml | 6 +- res/drawable/ic_wifi_privacy_24dp.xml | 9 +- 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 | 7 +- res/drawable/signal_strength_3g.xml | 7 +- res/drawable/signal_strength_g.xml | 5 +- res/drawable/signal_strength_lte.xml | 9 +- res/drawable/tile_icon_animation_speed.xml | 5 +- res/drawable/tile_icon_force_rtl.xml | 29 ++- res/drawable/tile_icon_graphics.xml | 21 +- res/drawable/tile_icon_sensors_off.xml | 8 +- res/drawable/tile_icon_show_layout.xml | 64 +++--- res/drawable/tile_icon_winscope_trace.xml | 7 +- res/drawable/wifi_dpp_success.xml | 2 +- res/layout/advanced_bt_entity_header.xml | 1 + res/layout/battery_header.xml | 3 +- res/layout/conditional_card_header.xml | 2 +- .../crypt_keeper_switch_input_method.xml | 2 +- res/layout/data_usage_summary_preference.xml | 3 +- res/layout/empty_print_state.xml | 3 +- .../empty_printers_list_service_enabled.xml | 3 +- res/layout/lockscreen_remote_input.xml | 2 +- res/layout/master_clear_confirm.xml | 2 +- .../mobile_network_settings_container.xml | 1 + .../mobile_network_settings_container_v2.xml | 1 + res/layout/printer_dropdown_item.xml | 4 +- res/layout/restricted_dialog_singlechoice.xml | 2 +- res/layout/restricted_popup_menu_item.xml | 2 +- res/layout/restricted_radio_with_summary.xml | 2 +- res/layout/settings_base_layout.xml | 1 + .../spinner_dropdown_restricted_item.xml | 2 +- res/layout/switch_bar.xml | 5 +- res/layout/user_credential_preference.xml | 3 +- res/layout/wifi_dpp_fragment_header.xml | 1 + res/menu/time_zone_base_search_menu.xml | 2 +- res/values-night-v27/themes.xml | 58 +++++ res/values-night/bools.xml | 19 ++ res/values-night/colors.xml | 32 --- res/values-night/styles.xml | 2 +- res/values-night/themes.xml | 28 +-- res/values-v27/themes.xml | 58 +++++ res/values/bools.xml | 4 + res/values/colors.xml | 174 ++++++++------- res/values/lineage_styles.xml | 2 +- res/values/styles.xml | 17 +- res/values/themes.xml | 211 +++++++++++++----- res/values/themes_suw.xml | 137 +++++++++--- res/xml/connected_devices_advanced.xml | 4 +- res/xml/sound_settings.xml | 2 +- .../android/settings/SettingsActivity.java | 2 + .../accounts/AccountSyncSettings.java | 2 +- .../settings/applications/RunningState.java | 2 +- .../applications/UsageAccessDetails.java | 2 +- .../deviceadmin/DeviceAdminAdd.java | 4 +- .../BluetoothDeviceDetailsFragment.java | 2 +- .../bluetooth/BluetoothSliceBuilder.java | 2 +- .../profileselector/UserAdapter.java | 2 +- .../deviceinfo/StorageWizardBase.java | 2 +- .../ActionDisabledByAdminDialogHelper.java | 2 +- .../settings/fuelgauge/BatteryEntry.java | 2 +- .../settings/fuelgauge/PowerUsageSummary.java | 2 +- .../slices/BluetoothDevicesSlice.java | 4 +- .../settings/location/LocationSlice.java | 2 +- .../media/MediaOutputIndicatorSlice.java | 2 +- .../settings/media/MediaOutputSlice.java | 2 +- .../telephony/MobileNetworkSettings.java | 2 +- .../AlarmVolumePreferenceController.java | 2 +- .../ZenRuleButtonsPreferenceController.java | 2 +- .../settings/password/ChooseLockPattern.java | 147 ++++++------ .../print/PrintJobPreferenceController.java | 4 +- .../settings/print/PrintSettingsFragment.java | 5 +- .../actionbar/SearchMenuController.java | 2 +- .../widget/EntityHeaderController.java | 9 +- .../wifi/ConnectedAccessPointPreference.java | 1 + .../wifi/LongPressAccessPointPreference.java | 13 ++ .../wifi/NetworkRequestDialogFragment.java | 2 +- .../WifiDetailPreferenceController.java | 12 +- .../details/WifiNetworkDetailsFragment.java | 2 +- 278 files changed, 1502 insertions(+), 1026 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_audio_alarm.xml create mode 100644 res/drawable/ic_audio_alarm_mute.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-v27/themes.xml create mode 100644 res/values-night/bools.xml delete mode 100644 res/values-night/colors.xml create mode 100644 res/values-v27/themes.xml create mode 100644 res/values/bools.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dab3a7db9ae..a2772debaa8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1609,7 +1609,7 @@ @@ -2014,7 +2014,7 @@ + android:theme="@style/Theme.Dialog" /> @@ -2097,7 +2097,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"> @@ -2444,7 +2444,7 @@ + android:theme="@style/Theme.AlertDialog"> @@ -2676,7 +2676,7 @@ + android:theme="@style/Theme.AlertDialog" /> @@ -2720,7 +2720,7 @@ @@ -3031,7 +3031,7 @@ @@ -3272,10 +3272,10 @@ + android:theme="@style/Theme.AlertDialog" /> + android:theme="@style/Theme.AlertDialog" /> diff --git a/res/anim/enrollment_fingerprint_background_2_path_animation.xml b/res/anim/enrollment_fingerprint_background_2_path_animation.xml index aed30c027aa..76235c452d5 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="#4285F4" + android:valueTo="@color/color_default_accent" 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 aed30c027aa..76235c452d5 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="#4285F4" + android:valueTo="@color/color_default_accent" 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 aed30c027aa..76235c452d5 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="#4285F4" + android:valueTo="@color/color_default_accent" 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 aed30c027aa..76235c452d5 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="#4285F4" + android:valueTo="@color/color_default_accent" android:valueType="intType" android:interpolator="@android:interpolator/linear_out_slow_in" /> 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"/> + android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/data_sweep_limit.xml b/res/drawable/data_sweep_limit.xml index b0f5fda569f..c05b98792a7 100644 --- a/res/drawable/data_sweep_limit.xml +++ b/res/drawable/data_sweep_limit.xml @@ -20,6 +20,6 @@ android:viewportWidth="2" android:viewportHeight="56"> 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 1e3efeb3d45..0704f710e64 100644 --- a/res/drawable/drag_handle.xml +++ b/res/drawable/drag_handle.xml @@ -18,10 +18,9 @@ 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/face_enroll_introduction.xml b/res/drawable/face_enroll_introduction.xml index 217b13c2ff2..818536a79ea 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 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 925e6bc544f..479caee69e5 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 9781c54000f..089b61f8d84 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_add_24dp.xml b/res/drawable/ic_add_24dp.xml index 71969814df6..1387bf40bcf 100644 --- a/res/drawable/ic_add_24dp.xml +++ b/res/drawable/ic_add_24dp.xml @@ -17,10 +17,9 @@ 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..71f3fed80b0 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/color_default_accent"/> diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml index b6a80cfd9d8..1f6a921f147 100644 --- a/res/drawable/ic_arrow_back.xml +++ b/res/drawable/ic_arrow_back.xml @@ -18,9 +18,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:autoMirrored="true" - android:tint="?android:attr/colorControlNormal"> + android:autoMirrored="true"> diff --git a/res/drawable/ic_arrow_circle_down.xml b/res/drawable/ic_arrow_circle_down.xml new file mode 100644 index 00000000000..4193466b846 --- /dev/null +++ b/res/drawable/ic_arrow_circle_down.xml @@ -0,0 +1,10 @@ + + + + diff --git a/res/drawable/ic_arrow_circle_up.xml b/res/drawable/ic_arrow_circle_up.xml new file mode 100644 index 00000000000..a739f368048 --- /dev/null +++ b/res/drawable/ic_arrow_circle_up.xml @@ -0,0 +1,10 @@ + + + + diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml index f2efb4cded8..9efd9d8cf8a 100644 --- a/res/drawable/ic_arrow_down_24dp.xml +++ b/res/drawable/ic_arrow_down_24dp.xml @@ -16,10 +16,9 @@ diff --git a/res/drawable/ic_attach_money_black_24dp.xml b/res/drawable/ic_attach_money_black_24dp.xml index 12605fd9c66..aef0995fea7 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 new file mode 100644 index 00000000000..3bd484336c3 --- /dev/null +++ b/res/drawable/ic_audio_alarm.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_audio_alarm_mute.xml b/res/drawable/ic_audio_alarm_mute.xml new file mode 100644 index 00000000000..83fc2edca21 --- /dev/null +++ b/res/drawable/ic_audio_alarm_mute.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/res/drawable/ic_auto_wifi.xml b/res/drawable/ic_auto_wifi.xml index 82e42f09e12..441b761c9c4 100644 --- a/res/drawable/ic_auto_wifi.xml +++ b/res/drawable/ic_auto_wifi.xml @@ -17,19 +17,18 @@ 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/color_default_accent" /> \ No newline at end of file diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml index 5c736fdf4ed..bb913e86a96 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_bt_headphones_a2dp.xml b/res/drawable/ic_bt_headphones_a2dp.xml new file mode 100644 index 00000000000..a91283164b5 --- /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_cancel.xml b/res/drawable/ic_cancel.xml index c84f18ede05..2b700a3dd46 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..a51a484ee98 --- /dev/null +++ b/res/drawable/ic_cancel_cross.xml @@ -0,0 +1,24 @@ + + + + diff --git a/res/drawable/ic_cast_24dp.xml b/res/drawable/ic_cast_24dp.xml index 2ac48ef5be5..5b442585bab 100644 --- a/res/drawable/ic_cast_24dp.xml +++ b/res/drawable/ic_cast_24dp.xml @@ -7,7 +7,7 @@ + android:viewportHeight="24"> \ No newline at end of file diff --git a/res/drawable/ic_check_circle_green.xml b/res/drawable/ic_check_circle_green.xml index 214d2cffc30..ef3428e03b9 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 17e2b92a2d8..10160e76f69 100644 --- a/res/drawable/ic_chevron_right_24dp.xml +++ b/res/drawable/ic_chevron_right_24dp.xml @@ -20,8 +20,7 @@ android:height="24dp" android:width="24dp" android:viewportHeight="24.0" - android:viewportWidth="24.0" - android:tint="?android:attr/colorControlNormal"> - + diff --git a/res/drawable/ic_corp_badge.xml b/res/drawable/ic_corp_badge.xml new file mode 100644 index 00000000000..028e61b3b8a --- /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 aefcd849421..feb407cfd89 100644 --- a/res/drawable/ic_data_saver.xml +++ b/res/drawable/ic_data_saver.xml @@ -18,16 +18,15 @@ android:height="24dp" android:autoMirrored="true" android:viewportHeight="24" - android:viewportWidth="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportWidth="24"> diff --git a/res/drawable/ic_delete.xml b/res/drawable/ic_delete.xml index d1290c50a02..e08bbf70647 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..1d5fb2ff863 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_default_accent"/> + + + \ 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..e799afc9e0b 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..1a6ab14b156 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_white.xml b/res/drawable/ic_event_white.xml index d80429b7ec0..54e01067c94 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.xml b/res/drawable/ic_expand.xml index f5b3f66981e..af180db7096 100644 --- a/res/drawable/ic_expand.xml +++ b/res/drawable/ic_expand.xml @@ -19,6 +19,6 @@ - + diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml index 7ccc0809172..fbae47236d3 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_inverse.xml b/res/drawable/ic_expand_more_inverse.xml index c39e3f97f0b..b148d2f2231 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_face_enroll_introduction_detail.xml b/res/drawable/ic_face_enroll_introduction_detail.xml index 386f8c7e1e7..901a8a2cb4c 100644 --- a/res/drawable/ic_face_enroll_introduction_detail.xml +++ b/res/drawable/ic_face_enroll_introduction_detail.xml @@ -17,7 +17,6 @@ @@ -26,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 b452efe14fd..4f5074d6138 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_default_accent"> + android:tint="@color/color_default_accent"> + android:tint="@color/color_default_accent"> - - diff --git a/res/drawable/ic_face_header.xml b/res/drawable/ic_face_header.xml index 15ea7aeb968..77244120963 100644 --- a/res/drawable/ic_face_header.xml +++ b/res/drawable/ic_face_header.xml @@ -17,15 +17,14 @@ \ No newline at end of file diff --git a/res/drawable/ic_feedback_24dp.xml b/res/drawable/ic_feedback_24dp.xml index a65f4443d8f..7fa4a6278be 100644 --- a/res/drawable/ic_feedback_24dp.xml +++ b/res/drawable/ic_feedback_24dp.xml @@ -14,17 +14,17 @@ ~ limitations under the License --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/color_default_accent" + android:pathData="M20,2H4C2.9,2 2.01,2.9 2.01,4L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6H5.17l-0.59,0.59L4,17.17V4h16V16z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M11,12h2v2h-2z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M11,6h2v4h-2z" /> diff --git a/res/drawable/ic_find_in_page_24px.xml b/res/drawable/ic_find_in_page_24px.xml index 18895e49a1c..54438275b42 100644 --- a/res/drawable/ic_find_in_page_24px.xml +++ b/res/drawable/ic_find_in_page_24px.xml @@ -19,9 +19,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_fingerprint.xml b/res/drawable/ic_fingerprint.xml index 048826b88d9..2d24a4d7b8e 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 2f635bc2358..d235609d6eb 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 2f635bc2358..646e9807aa1 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 e800fae86dc..14a585c4aca 100644 --- a/res/drawable/ic_fingerprint_success.xml +++ b/res/drawable/ic_fingerprint_success.xml @@ -25,5 +25,5 @@ android:fillColor="?android:attr/colorAccent"/> + android:fillColor="@color/color_default_view_on_accent"/> diff --git a/res/drawable/ic_folder_vd_theme_24.xml b/res/drawable/ic_folder_vd_theme_24.xml index 5e3b55fbc06..faa67fbe383 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 dd8cab887fe..751fef7138f 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..071429ae1c5 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 716a98a1205..2e14d0f6d1d 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="?android:attr/colorControlNormal"> + android:height="24dp"> + android:fillColor="@color/color_default_accent" /> diff --git a/res/drawable/ic_friction_lock_closed.xml b/res/drawable/ic_friction_lock_closed.xml index 2c34060ccd6..a35dc9a735d 100644 --- a/res/drawable/ic_friction_lock_closed.xml +++ b/res/drawable/ic_friction_lock_closed.xml @@ -17,10 +17,9 @@ diff --git a/res/drawable/ic_friction_money.xml b/res/drawable/ic_friction_money.xml index fb1904aa82c..fff25d00f7f 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 3fda134ade7..815b0752ab7 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 23210d05a04..35f5be2832d 100644 --- a/res/drawable/ic_headset_24dp.xml +++ b/res/drawable/ic_headset_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"> diff --git a/res/drawable/ic_help.xml b/res/drawable/ic_help.xml index f8bac71e877..ea676944412 100644 --- a/res/drawable/ic_help.xml +++ b/res/drawable/ic_help.xml @@ -14,11 +14,11 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M11,18h2v-2h-2V18zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8S16.41,20 12,20zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5C16,7.79 14.21,6 12,6z" /> diff --git a/res/drawable/ic_homepage_accessibility.xml b/res/drawable/ic_homepage_accessibility.xml index fe2e3dc9ed3..db52edffb72 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 6ae67bd2e30..1bbdd28e185 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 be8c00af901..7fc10c360bf 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"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_homepage_system_dashboard.xml b/res/drawable/ic_homepage_system_dashboard.xml index 17da9bae45f..d0e02b5e495 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 new file mode 100644 index 00000000000..e53b5588f9b --- /dev/null +++ b/res/drawable/ic_info.xml @@ -0,0 +1,10 @@ + + + + \ 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 634d797c7f2..8f97ce93e6e 100644 --- a/res/drawable/ic_info_outline_24dp.xml +++ b/res/drawable/ic_info_outline_24dp.xml @@ -18,15 +18,14 @@ android:width="24dp" android:height="24dp" android:viewportHeight="24" - android:viewportWidth="24" - android:tint="?android:attr/textColorSecondary"> + android:viewportWidth="24"> diff --git a/res/drawable/ic_keyboard.xml b/res/drawable/ic_keyboard.xml new file mode 100644 index 00000000000..d2ce7c5b98d --- /dev/null +++ b/res/drawable/ic_keyboard.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml index b1ed068abec..d1810a120c0 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..e079b4b5e06 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_lock_lock.xml b/res/drawable/ic_lock_lock.xml new file mode 100644 index 00000000000..9b09bc28981 --- /dev/null +++ b/res/drawable/ic_lock_lock.xml @@ -0,0 +1,26 @@ + + + + + + diff --git a/res/drawable/ic_media_stream_off.xml b/res/drawable/ic_media_stream_off.xml index 4398527d7dd..76e8ee1a791 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 new file mode 100644 index 00000000000..c38cba709d5 --- /dev/null +++ b/res/drawable/ic_mode_edit.xml @@ -0,0 +1,10 @@ + + + + diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml new file mode 100644 index 00000000000..5def0c25af8 --- /dev/null +++ b/res/drawable/ic_more_24.xml @@ -0,0 +1,10 @@ + + + + diff --git a/res/drawable/ic_network_cell.xml b/res/drawable/ic_network_cell.xml index 9f7f4fca468..764781c1b9c 100644 --- a/res/drawable/ic_network_cell.xml +++ b/res/drawable/ic_network_cell.xml @@ -7,7 +7,7 @@ + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/ic_notification_alert.xml b/res/drawable/ic_notification_alert.xml index 927f7ccfc3c..1fccfaec0b3 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 9da56dd0bbf..be1b73da81f 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 5a25459e353..3dfa3bbe438 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_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/color_default_accent"/> diff --git a/res/drawable/ic_open_wifi_notifications.xml b/res/drawable/ic_open_wifi_notifications.xml index 5435bdb476a..55fbe16b3f1 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/color_default_accent" /> + android:fillColor="@color/color_default_accent" /> + android:fillColor="@color/color_default_accent" /> + android:fillColor="@color/color_default_accent" /> + android:fillColor="@color/color_default_accent" /> diff --git a/res/drawable/ic_ota_update_available.xml b/res/drawable/ic_ota_update_available.xml index b03f9d741aa..fec0f05a46d 100644 --- a/res/drawable/ic_ota_update_available.xml +++ b/res/drawable/ic_ota_update_available.xml @@ -20,6 +20,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_ota_update_current.xml b/res/drawable/ic_ota_update_current.xml index c38a0838d57..e06697f0dd3 100644 --- a/res/drawable/ic_ota_update_current.xml +++ b/res/drawable/ic_ota_update_current.xml @@ -20,6 +20,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_ota_update_none.xml b/res/drawable/ic_ota_update_none.xml index b49b4247646..6ef346e7562 100644 --- a/res/drawable/ic_ota_update_none.xml +++ b/res/drawable/ic_ota_update_none.xml @@ -20,6 +20,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_ota_update_stale.xml b/res/drawable/ic_ota_update_stale.xml index b49b4247646..6ef346e7562 100644 --- a/res/drawable/ic_ota_update_stale.xml +++ b/res/drawable/ic_ota_update_stale.xml @@ -20,6 +20,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_pan_tool_18dp.xml b/res/drawable/ic_pan_tool_18dp.xml index 3ebfc9ce2c6..a12560ea29d 100644 --- a/res/drawable/ic_pan_tool_18dp.xml +++ b/res/drawable/ic_pan_tool_18dp.xml @@ -7,6 +7,6 @@ + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/ic_password.xml b/res/drawable/ic_password.xml index 7d5f47190e9..67983218713 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 b41129fb7c1..fee4b013416 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 7aee3e86ebc..ada4d9f6fb6 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..6217067f9cf 100644 --- a/res/drawable/ic_photo_library.xml +++ b/res/drawable/ic_photo_library.xml @@ -7,7 +7,7 @@ + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/ic_print.xml b/res/drawable/ic_print.xml new file mode 100644 index 00000000000..01e345625fd --- /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..ef4745cdce3 --- /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_privacy_shield_24dp.xml b/res/drawable/ic_privacy_shield_24dp.xml index a051e88ef58..02a1c637477 100644 --- a/res/drawable/ic_privacy_shield_24dp.xml +++ b/res/drawable/ic_privacy_shield_24dp.xml @@ -18,12 +18,11 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/textColorSecondary">> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_private_dns.xml b/res/drawable/ic_private_dns.xml index a94fd380f8e..88e25913a87 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_24dp.xml b/res/drawable/ic_qrcode_24dp.xml index 57aec5776cf..3691db74831 100644 --- a/res/drawable/ic_qrcode_24dp.xml +++ b/res/drawable/ic_qrcode_24dp.xml @@ -2,9 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorAccent"> + 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 3be6f9962e3..27b7c61dc51 100644 --- a/res/drawable/ic_radio_button_checked_black_24dp.xml +++ b/res/drawable/ic_radio_button_checked_black_24dp.xml @@ -14,11 +14,11 @@ ~ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" /> diff --git a/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/res/drawable/ic_radio_button_unchecked_black_24dp.xml index a864f7b07b4..fd289428bbe 100644 --- a/res/drawable/ic_radio_button_unchecked_black_24dp.xml +++ b/res/drawable/ic_radio_button_unchecked_black_24dp.xml @@ -14,11 +14,11 @@ ~ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" /> diff --git a/res/drawable/ic_remove_24dp.xml b/res/drawable/ic_remove_24dp.xml index 923362360a5..82443fe5022 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..e79c406c7d1 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 692bfe8569a..3739e1e5da4 100644 --- a/res/drawable/ic_scan_24dp.xml +++ b/res/drawable/ic_scan_24dp.xml @@ -2,9 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_sd_card.xml b/res/drawable/ic_sd_card.xml index 5ddeed3b0ba..0f4c18c5c71 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_security_lock_24dp.xml b/res/drawable/ic_security_lock_24dp.xml index 40b510962c8..e30c161bd44 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="?android:attr/colorControlNormal"> + android:height="24dp"> + android:fillColor="@color/color_default_accent" /> diff --git a/res/drawable/ic_settings_24dp.xml b/res/drawable/ic_settings_24dp.xml index 44a4c2ed746..e0dbb26846a 100644 --- a/res/drawable/ic_settings_24dp.xml +++ b/res/drawable/ic_settings_24dp.xml @@ -7,15 +7,15 @@ + android:fillColor="@color/color_default_accent"/> + android:fillColor="@color/color_default_view_on_accent"/> + android:fillColor="@color/color_default_view_on_accent"/> diff --git a/res/drawable/ic_settings_accent.xml b/res/drawable/ic_settings_accent.xml index 7d871bc9591..a3d917d6912 100644 --- a/res/drawable/ic_settings_accent.xml +++ b/res/drawable/ic_settings_accent.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_settings_accessibility.xml b/res/drawable/ic_settings_accessibility.xml index 11a9d50084a..1bdd6a44eb3 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/color_default_accent"/> diff --git a/res/drawable/ic_settings_aod.xml b/res/drawable/ic_settings_aod.xml index b238e3a3201..35c60033ad1 100644 --- a/res/drawable/ic_settings_aod.xml +++ b/res/drawable/ic_settings_aod.xml @@ -18,17 +18,16 @@ 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_settings_backup.xml b/res/drawable/ic_settings_backup.xml index 715a2e84c28..8eaf64f00ce 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..d69149f20df 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/color_default_accent"/> diff --git a/res/drawable/ic_settings_battery.xml b/res/drawable/ic_settings_battery.xml index 550649cb69f..a19de30c812 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 255b75e7d9e..621f37dc1d4 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 f93ab968077..80fb602a8e1 100644 --- a/res/drawable/ic_settings_bluetooth.xml +++ b/res/drawable/ic_settings_bluetooth.xml @@ -2,14 +2,9 @@ - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> - + android:fillColor="@color/color_default_accent" + android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/> \ No newline at end of file diff --git a/res/drawable/ic_settings_camera.xml b/res/drawable/ic_settings_camera.xml index 3c855323183..d8900554734 100644 --- a/res/drawable/ic_settings_camera.xml +++ b/res/drawable/ic_settings_camera.xml @@ -20,10 +20,9 @@ android:height="24dp" android:viewportWidth="48" android:viewportHeight="48" - android:autoMirrored="true" - android:tint="?android:attr/colorControlNormal"> + android:autoMirrored="true"> - diff --git a/res/drawable/ic_settings_data_usage.xml b/res/drawable/ic_settings_data_usage.xml index 3127640b0cc..fd550ee87a9 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 10125acd498..8d5a5ff019c 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 e7a8f4116cb..f5ed2ca86f6 100644 --- a/res/drawable/ic_settings_disable.xml +++ b/res/drawable/ic_settings_disable.xml @@ -18,9 +18,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_settings_display.xml b/res/drawable/ic_settings_display.xml index 75c6e5e088b..267021a74dd 100644 --- a/res/drawable/ic_settings_display.xml +++ b/res/drawable/ic_settings_display.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M20,8.69V4h-4.69L12,0.69L8.69,4H4v4.69L0.69,12L4,15.31V20h4.69L12,23.31L15.31,20H20v-4.69L23.31,12L20,8.69zM18,14.48V18h-3.52L12,20.48L9.52,18H6v-3.52L3.52,12L6,9.52V6h3.52L12,3.52L14.48,6H18v3.52L20.48,12L18,14.48zM12,17c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5V17z" /> diff --git a/res/drawable/ic_settings_enable.xml b/res/drawable/ic_settings_enable.xml index 673471d874e..ea698e864dd 100644 --- a/res/drawable/ic_settings_enable.xml +++ b/res/drawable/ic_settings_enable.xml @@ -18,9 +18,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_settings_force_stop.xml b/res/drawable/ic_settings_force_stop.xml index eda6079c48f..2fc9b5eced0 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 5023a13ffa1..753dfd44a75 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 3de5f14ce90..60b2ebd6fa2 100644 --- a/res/drawable/ic_settings_home.xml +++ b/res/drawable/ic_settings_home.xml @@ -17,8 +17,7 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> - + diff --git a/res/drawable/ic_settings_install.xml b/res/drawable/ic_settings_install.xml index 5bd5e300eae..c96449b94ff 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 962bfe0a9d5..690c1639eed 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 03ee95e0bc3..799e371112a 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 c3f6657589f..949491ef80d 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 555a6b4f1d2..92b8b99c630 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 4cd1347602f..f730a07ba9b 100644 --- a/res/drawable/ic_settings_night_display.xml +++ b/res/drawable/ic_settings_night_display.xml @@ -16,10 +16,9 @@ diff --git a/res/drawable/ic_settings_open.xml b/res/drawable/ic_settings_open.xml index ea7771028b1..e7198de9b43 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 5139405fb2b..d092ffa4f41 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 7bb6c3192be..9a1e8e095c7 100644 --- a/res/drawable/ic_settings_phone_idle.xml +++ b/res/drawable/ic_settings_phone_idle.xml @@ -17,9 +17,8 @@ android:width="48dp" android:height="48dp" android:viewportWidth="48" - android:viewportHeight="48" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="48"> + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/ic_settings_print.xml b/res/drawable/ic_settings_print.xml index 308d09fb72f..3551e6210aa 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 4e2b1ee8124..05b1c6596ef 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -14,14 +14,14 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/color_default_accent" + android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" /> + android:fillColor="@color/color_default_accent" + android:pathData="M18.5,1C16.01,1 14,3.01 14,5.5V8H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2h-2V5.5C16,4.12 17.12,3 18.5,3C19.88,3 21,4.12 21,5.5V6h2V5.5C23,3.01 20.99,1 18.5,1zM18,10v10H6V10H18z" /> \ 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 e2fa5d82d1c..1d3312433ce 100644 --- a/res/drawable/ic_settings_sign_in.xml +++ b/res/drawable/ic_settings_sign_in.xml @@ -14,11 +14,11 @@ limitations under the License. --> + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z" /> diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml index 5ea2754f12a..f7aba8f8aeb 100644 --- a/res/drawable/ic_settings_storage.xml +++ b/res/drawable/ic_settings_storage.xml @@ -21,7 +21,7 @@ android:viewportHeight="32"> + android:viewportHeight="24.0"> diff --git a/res/drawable/ic_settings_system_dashboard_white.xml b/res/drawable/ic_settings_system_dashboard_white.xml index 5a697d4ab21..17a2417878a 100644 --- a/res/drawable/ic_settings_system_dashboard_white.xml +++ b/res/drawable/ic_settings_system_dashboard_white.xml @@ -14,17 +14,17 @@ limitations under the License. --> + android:width="24.0dp" + android:height="24.0dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M11,7h2v2h-2z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M11,11h2v6h-2z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z" /> diff --git a/res/drawable/ic_settings_voice_calls.xml b/res/drawable/ic_settings_voice_calls.xml index b455f0ab3d8..d13100fa78b 100644 --- a/res/drawable/ic_settings_voice_calls.xml +++ b/res/drawable/ic_settings_voice_calls.xml @@ -17,9 +17,8 @@ android:width="48dp" android:height="48dp" android:viewportWidth="48" - android:viewportHeight="48" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="48"> + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml index 0cc986b48ac..5cabb3e73b2 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..878b262dec3 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..70822e89409 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 e63595300d5..833c5229d4f 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 new file mode 100644 index 00000000000..903152b4db9 --- /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_strength_4g.xml b/res/drawable/ic_signal_strength_4g.xml index 90620965752..837ae3d2870 100644 --- a/res/drawable/ic_signal_strength_4g.xml +++ b/res/drawable/ic_signal_strength_4g.xml @@ -17,12 +17,11 @@ Copyright (C) 2014 The Android Open Source Project android:width="9.208dp" android:height="17dp" android:viewportWidth="13.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_signal_workmode_enable.xml b/res/drawable/ic_signal_workmode_enable.xml index f7e8c806b1b..0fa3b37d07d 100644 --- a/res/drawable/ic_signal_workmode_enable.xml +++ b/res/drawable/ic_signal_workmode_enable.xml @@ -1,9 +1,9 @@ + android:width="42dp" + android:height="42dp" + android:viewportWidth="42.0" + android:viewportHeight="42.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M40.25,38.04l-2.56,-2.56L12.62,10.41L5.69,3.48l-2.2,2.2l4.73,4.72H7.09c-1.94,0 -3.48,1.56 -3.48,3.5L3.59,33.16c0,1.94 1.56,3.5 3.5,3.5h27.37l3.59,3.59L40.25,38.04zM38.5,13.91c0.09,-1.94 -1.47,-3.5 -3.41,-3.41h-7V6.91c0,-1.94 -1.56,-3.5 -3.5,-3.41h-7c-1.94,-0.09 -3.5,1.47 -3.5,3.41v0.56l24.41,24.5V13.91zM24.59,10.5H17.5V6.91h7.09V10.5z" /> diff --git a/res/drawable/ic_sim_alert.xml b/res/drawable/ic_sim_alert.xml index ed9aa437b80..627fe5584e1 100644 --- a/res/drawable/ic_sim_alert.xml +++ b/res/drawable/ic_sim_alert.xml @@ -15,13 +15,13 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:strokeWidth="0.12533334" /> diff --git a/res/drawable/ic_sim_sd.xml b/res/drawable/ic_sim_sd.xml index d7e31a24809..e7e33778888 100644 --- a/res/drawable/ic_sim_sd.xml +++ b/res/drawable/ic_sim_sd.xml @@ -17,11 +17,10 @@ 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_skip.xml b/res/drawable/ic_skip.xml index 9d8ae2bb0f5..df9881d3f52 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..616b45c2a47 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_white.xml b/res/drawable/ic_storage_white.xml index eed91406ec1..2ac7c3953ab 100644 --- a/res/drawable/ic_storage_white.xml +++ b/res/drawable/ic_storage_white.xml @@ -14,11 +14,11 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M3,20h18v-4H3V20zM5,17h2v2H5V17zM3,4v4h18V4H3zM7,7H5V5h2V7zM3,14h18v-4H3V14zM5,11h2v2H5V11z" /> diff --git a/res/drawable/ic_storage_wizard_external.xml b/res/drawable/ic_storage_wizard_external.xml index 99e2698633d..301297cd339 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="#FFFFFF" + android:fillColor="@color/color_default_view_on_accent" android:strokeWidth="1"/> diff --git a/res/drawable/ic_suggestion_close_button.xml b/res/drawable/ic_suggestion_close_button.xml index 8b1f0f8122a..5662c7c6438 100644 --- a/res/drawable/ic_suggestion_close_button.xml +++ b/res/drawable/ic_suggestion_close_button.xml @@ -18,10 +18,9 @@ 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_suggestion_dnd.xml b/res/drawable/ic_suggestion_dnd.xml index 816b148c406..50113539711 100644 --- a/res/drawable/ic_suggestion_dnd.xml +++ b/res/drawable/ic_suggestion_dnd.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_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml index bf5ee2effe7..0947f76472e 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_suggestion_night_display.xml b/res/drawable/ic_suggestion_night_display.xml index 16cb04ef90b..43162058dd1 100644 --- a/res/drawable/ic_suggestion_night_display.xml +++ b/res/drawable/ic_suggestion_night_display.xml @@ -16,10 +16,9 @@ diff --git a/res/drawable/ic_suggestion_security.xml b/res/drawable/ic_suggestion_security.xml index e2d3a90e962..720519381c6 100644 --- a/res/drawable/ic_suggestion_security.xml +++ b/res/drawable/ic_suggestion_security.xml @@ -17,12 +17,11 @@ android:width="24dp" android:height="24dp" android:viewportHeight="24" - android:viewportWidth="24" - android:tint="?android:attr/colorControlNormal"> + 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 74b4cee4cdf..18ee359f442 100644 --- a/res/drawable/ic_suggestion_wireless.xml +++ b/res/drawable/ic_suggestion_wireless.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_supervisor.xml b/res/drawable/ic_supervisor.xml new file mode 100644 index 00000000000..24a0ccbf8b9 --- /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..4e1235e3e56 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:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M6.99,11L3,15l3.99,4v-3H14v-2H6.99v-3zM21,9l-3.99,-4v3H10v2h7.01v3L21,9z" /> diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml index ed16b03df57..6f7771aa988 100644 --- a/res/drawable/ic_sync.xml +++ b/res/drawable/ic_sync.xml @@ -17,12 +17,11 @@ 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_sync_problem_24dp.xml b/res/drawable/ic_sync_problem_24dp.xml index 200a1b0ebbf..900fe404eb5 100644 --- a/res/drawable/ic_sync_problem_24dp.xml +++ b/res/drawable/ic_sync_problem_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/ic_theme.xml b/res/drawable/ic_theme.xml index 4764ff1b9c1..8e97607e2dc 100644 --- a/res/drawable/ic_theme.xml +++ b/res/drawable/ic_theme.xml @@ -18,9 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorAccent"> + android:viewportHeight="24"> diff --git a/res/drawable/ic_timelapse_white.xml b/res/drawable/ic_timelapse_white.xml index f287747d2bc..f4cb2b00799 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 962bfe0a9d5..690c1639eed 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/color_default_accent"/> diff --git a/res/drawable/ic_volume_ringer_vibrate.xml b/res/drawable/ic_volume_ringer_vibrate.xml index 13fcd6a4ebb..4256c3ffb15 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 8c68c0070f9..7f6dcaa958d 100644 --- a/res/drawable/ic_volume_up_24dp.xml +++ b/res/drawable/ic_volume_up_24dp.xml @@ -15,17 +15,17 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M3,9v6h4l5,5V4L7,9H3zM10,8.83v6.34L7.83,13H5v-2h2.83L10,8.83z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05C15.48,15.29 16.5,13.77 16.5,12z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M14,3.23v2.06c2.89,0.86 5,3.54 5,6.71c0,3.17 -2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77C21,7.72 18.01,4.14 14,3.23z" /> diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml index d0fc6becdd8..e08f8544754 100644 --- a/res/drawable/ic_wallpaper.xml +++ b/res/drawable/ic_wallpaper.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_warning_24dp.xml b/res/drawable/ic_warning_24dp.xml index 2ca48e0fb06..94efde512c0 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 c23fbc164df..deb91342816 100644 --- a/res/drawable/ic_wifi_privacy_24dp.xml +++ b/res/drawable/ic_wifi_privacy_24dp.xml @@ -18,15 +18,14 @@ android:viewportWidth="24" android:viewportHeight="24" android:width="24dp" - android:height="24dp" - android:tint="?android:attr/colorControlNormal"> + android:height="24dp"> diff --git a/res/drawable/ic_wifi_signal_0.xml b/res/drawable/ic_wifi_signal_0.xml index 8e6dbbb858c..a0c2eb503a0 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 9c0a9845d93..430139904a0 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..a375e5c44a5 100644 --- a/res/drawable/ic_wifi_tethering.xml +++ b/res/drawable/ic_wifi_tethering.xml @@ -6,13 +6,13 @@ android:viewportHeight="32"> + android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/signal_strength_3g.xml b/res/drawable/signal_strength_3g.xml index 9b5e4a65717..7a951f7e55b 100644 --- a/res/drawable/signal_strength_3g.xml +++ b/res/drawable/signal_strength_3g.xml @@ -18,12 +18,11 @@ android:width="9.208dp" android:height="17dp" android:viewportWidth="13.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/signal_strength_g.xml b/res/drawable/signal_strength_g.xml index 6f6e21b2524..ebff17f208e 100644 --- a/res/drawable/signal_strength_g.xml +++ b/res/drawable/signal_strength_g.xml @@ -18,9 +18,8 @@ android:width="4.958dp" android:height="17dp" android:viewportWidth="7.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/signal_strength_lte.xml b/res/drawable/signal_strength_lte.xml index 998999f4782..e056709a851 100644 --- a/res/drawable/signal_strength_lte.xml +++ b/res/drawable/signal_strength_lte.xml @@ -18,15 +18,14 @@ android:width="9.208dp" android:height="17dp" android:viewportWidth="13.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_animation_speed.xml b/res/drawable/tile_icon_animation_speed.xml index 4a7c708fb45..d0c2aa45c42 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..907db9efb79 100644 --- a/res/drawable/tile_icon_force_rtl.xml +++ b/res/drawable/tile_icon_force_rtl.xml @@ -17,45 +17,44 @@ 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..b0521e431a6 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_sensors_off.xml b/res/drawable/tile_icon_sensors_off.xml index 890fa839717..accb1670d10 100644 --- a/res/drawable/tile_icon_sensors_off.xml +++ b/res/drawable/tile_icon_sensors_off.xml @@ -22,16 +22,16 @@ diff --git a/res/drawable/tile_icon_show_layout.xml b/res/drawable/tile_icon_show_layout.xml index e23b24cd945..70fe35f4b95 100644 --- a/res/drawable/tile_icon_show_layout.xml +++ b/res/drawable/tile_icon_show_layout.xml @@ -14,48 +14,50 @@ Copyright (C) 2015 The Android Open Source Project limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="@color/color_default_accent" + android:pathData="M12,7.2c-3.2,0 -5.9,2 -7,4.8c1.1,2.8 3.8,4.8 7,4.8s5.9,-2 7,-4.8C17.9,9.2 15.2,7.2 12,7.2zM12,15.2c-1.8,0 -3.2,-1.4 -3.2,-3.2s1.4,-3.2 3.2,-3.2s3.2,1.4 3.2,3.2S13.8,15.2 12,15.2zM12,10.1c-1.1,0 -1.9,0.9 -1.9,1.9s0.9,1.9 1.9,1.9s1.9,-0.9 1.9,-1.9S13.1,10.1 12,10.1z" /> + android:fillAlpha="0.7" + android:fillColor="@color/color_default_accent" + android:pathData="M0.0,6.0h1.0v12.0h-1.0z" /> + android:fillColor="@color/color_default_gray1" + android:pathData="M6.0,0.0h12.0v1.0h-12.0z" /> + android:fillColor="@color/color_default_gray1" + android:pathData="M23.0,6.0h1.0v12.0h-1.0z" /> + android:fillColor="@color/color_default_gray1" + android:pathData="M6.0,23.0h12.0v1.0h-12.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M1.0,23.0l0.0,-5.0l-1.0,0.0l0.0,6.0l6.0,0.0l0.0,-1.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M1.0,1.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l1.0,0.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M18.0,0.0l0.0,1.0l5.0,0.0l0.0,5.0l1.0,0.0l0.0,-6.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M23.0,23.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l-1.0,0.0z" /> + android:fillAlpha="0.7" + android:fillColor="@color/color_default_accent" + android:pathData="M9.5,6.0h5.0v1.0h-5.0z" /> + android:fillAlpha="0.7" + android:fillColor="@color/color_default_accent" + android:pathData="M9.5,17.0h5.0v1.0h-5.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M4.5,7.0l5.0,0.0l0.0,-1.0l-6.0,0.0l0.0,6.0l0.0,6.0l6.0,0.0l0.0,-1.0l-5.0,0.0l0.0,-5.0z" /> + android:fillColor="@color/color_default_accent" + android:pathData="M14.5,6.0l0.0,1.0l5.0,0.0l0.0,5.0l0.0,5.0l-5.0,0.0l0.0,1.0l6.0,0.0l0.0,-6.0l0.0,-6.0z" /> \ 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..d97d31a5eeb 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/color_default_accent"/> + android:fillColor="@color/color_default_accent"/> diff --git a/res/drawable/wifi_dpp_success.xml b/res/drawable/wifi_dpp_success.xml index 5ef3d1f68a7..d8ed51407ef 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_default_accent"/> diff --git a/res/layout/advanced_bt_entity_header.xml b/res/layout/advanced_bt_entity_header.xml index 4aadad1fc34..7c4a6db46f9 100644 --- a/res/layout/advanced_bt_entity_header.xml +++ b/res/layout/advanced_bt_entity_header.xml @@ -19,6 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/entity_header" style="@style/EntityHeader" + android:background="@color/color_default_primary_dark" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml index dca0972a79f..26a38b91225 100644 --- a/res/layout/battery_header.xml +++ b/res/layout/battery_header.xml @@ -22,7 +22,8 @@ android:layout_height="match_parent" android:layout_gravity="center" android:orientation="horizontal" - style="@style/EntityHeader"> + style="@style/EntityHeader" + android:background="@color/color_default_primary_dark"> + android:tint="@color/color_default_accent"/> diff --git a/res/layout/crypt_keeper_switch_input_method.xml b/res/layout/crypt_keeper_switch_input_method.xml index 3fae593bbf6..3086ab6c24c 100644 --- a/res/layout/crypt_keeper_switch_input_method.xml +++ b/res/layout/crypt_keeper_switch_input_method.xml @@ -22,7 +22,7 @@ android:id="@+id/switch_ime_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@*android:drawable/ic_lockscreen_ime" + android:src="@drawable/ic_keyboard" android:clickable="true" android:contentDescription="@string/crypt_keeper_switch_input_method" android:padding="@dimen/crypt_keeper_edit_text_ime_padding" diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml index 6617ac9cacf..0369908c0a3 100644 --- a/res/layout/data_usage_summary_preference.xml +++ b/res/layout/data_usage_summary_preference.xml @@ -24,7 +24,8 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:orientation="vertical" android:selectable="false" - style="@style/EntityHeader"> + style="@style/EntityHeader" + android:background="@color/color_default_primary_dark"> diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml index a236cd381e3..4266139848a 100644 --- a/res/layout/master_clear_confirm.xml +++ b/res/layout/master_clear_confirm.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:theme="@style/SudThemeGlifV3.DayNight" + android:theme="@style/Theme.Settings" android:id="@+id/setup_wizard_layout" android:icon="@drawable/ic_delete_accent" app:sucHeaderText="@string/master_clear_confirm_title"> diff --git a/res/layout/mobile_network_settings_container.xml b/res/layout/mobile_network_settings_container.xml index c88b512f443..e7abc27c304 100644 --- a/res/layout/mobile_network_settings_container.xml +++ b/res/layout/mobile_network_settings_container.xml @@ -27,6 +27,7 @@ style="?android:attr/actionBarStyle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/color_default_primary_dark" android:navigationContentDescription="@*android:string/action_bar_up_description" android:theme="?android:attr/actionBarTheme"/> diff --git a/res/layout/mobile_network_settings_container_v2.xml b/res/layout/mobile_network_settings_container_v2.xml index ed7296b39ae..01c43cc06ce 100644 --- a/res/layout/mobile_network_settings_container_v2.xml +++ b/res/layout/mobile_network_settings_container_v2.xml @@ -27,6 +27,7 @@ style="?android:attr/actionBarStyle" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/color_default_primary_dark" android:navigationContentDescription="@*android:string/action_bar_up_description" android:theme="?android:attr/actionBarTheme"/> diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml index fd581bbdcc0..2e793b3cdb4 100644 --- a/res/layout/printer_dropdown_item.xml +++ b/res/layout/printer_dropdown_item.xml @@ -77,8 +77,8 @@ android:layout_gravity="center_vertical" android:paddingLeft="16dip" android:contentDescription="@string/printer_info_desc" - android:src="@*android:drawable/ic_info" - android:tint="?android:attr/colorControlNormal" + android:src="@drawable/ic_info" + android:tint="@color/color_default_accent" android:tintMode="src_in" /> diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml index a9984a84fc3..c378a5d1df4 100644 --- a/res/layout/restricted_dialog_singlechoice.xml +++ b/res/layout/restricted_dialog_singlechoice.xml @@ -40,7 +40,7 @@ android:layout_width="@*android:dimen/config_restrictedIconSize" android:layout_height="@*android:dimen/config_restrictedIconSize" android:tint="?android:attr/colorAccent" - android:src="@*android:drawable/ic_info" + android:src="@drawable/ic_info" android:layout_marginLeft="@dimen/restricted_icon_padding" android:baselineAlignBottom="true" android:scaleType="centerInside" diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml index 636e3f91847..2c700f7d692 100644 --- a/res/layout/restricted_popup_menu_item.xml +++ b/res/layout/restricted_popup_menu_item.xml @@ -38,7 +38,7 @@ android:layout_height="@*android:dimen/config_restrictedIconSize" android:scaleType="centerInside" android:tint="?android:attr/colorAccent" - android:src="@*android:drawable/ic_info" + android:src="@drawable/ic_info" android:layout_alignParentRight="true" android:visibility="gone" /> diff --git a/res/layout/restricted_radio_with_summary.xml b/res/layout/restricted_radio_with_summary.xml index 5e7fcd82fe6..283331bbe3b 100644 --- a/res/layout/restricted_radio_with_summary.xml +++ b/res/layout/restricted_radio_with_summary.xml @@ -45,7 +45,7 @@ android:layout_height="match_parent" android:scaleType="centerInside" android:tint="?android:attr/colorAccent" - android:src="@*android:drawable/ic_info" + android:src="@drawable/ic_info" android:layout_marginLeft="@dimen/restricted_icon_padding" android:visibility="gone" /> diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml index f94d25d4841..ec72a0c58cf 100644 --- a/res/layout/settings_base_layout.xml +++ b/res/layout/settings_base_layout.xml @@ -27,6 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="?android:attr/actionBarTheme" + android:background="@color/color_default_primary_dark" android:navigationContentDescription="@*android:string/action_bar_up_description" /> + 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/layout/wifi_dpp_fragment_header.xml b/res/layout/wifi_dpp_fragment_header.xml index 364f36041cb..341c0775225 100644 --- a/res/layout/wifi_dpp_fragment_header.xml +++ b/res/layout/wifi_dpp_fragment_header.xml @@ -18,6 +18,7 @@ diff --git a/res/values-night-v27/themes.xml b/res/values-night-v27/themes.xml new file mode 100644 index 00000000000..194e7975a7e --- /dev/null +++ b/res/values-night-v27/themes.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values-night/bools.xml b/res/values-night/bools.xml new file mode 100644 index 00000000000..29312e7389e --- /dev/null +++ b/res/values-night/bools.xml @@ -0,0 +1,19 @@ + + + + + false + \ No newline at end of file diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index b1f9dfbd675..00000000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - #82000000 - @android:color/black - #783BE5 - #3F5FBD - @*android:color/material_grey_900 - @*android:color/material_grey_900 - @*android:color/material_grey_800 - - @*android:color/material_grey_800 - @*android:color/material_grey_800 - #AECBFA - #5F6368 - ?android:attr/colorAccent - - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml index 87159b8b76f..62cebfeb3cd 100644 --- a/res/values-night/styles.xml +++ b/res/values-night/styles.xml @@ -18,7 +18,7 @@ \ No newline at end of file diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml index ec0978b3391..9ba92a11de9 100644 --- a/res/values-night/themes.xml +++ b/res/values-night/themes.xml @@ -1,6 +1,5 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml new file mode 100644 index 00000000000..8aebb213795 --- /dev/null +++ b/res/values-v27/themes.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/bools.xml b/res/values/bools.xml new file mode 100644 index 00000000000..973f8503320 --- /dev/null +++ b/res/values/bools.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 7114bb15152..fdf28c18ecb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,99 +16,117 @@ - #ff9a9a9a - #ff666666 - #ff9a9a9a - #70606060 - - #20ffffff - @android:color/holo_blue_light + @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 + + @color/color_default_background + @color/color_default_foreground + @color/color_default_background + @color/color_default_foreground + + @color/color_default_divider + @color/color_default_accent @color/lock_pattern_view_regular_color - #ff84ffff - @color/sud_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 - @*android:color/accent_device_default_light + @color/color_default_accent #60000000 - #ffabffec + @color/color_default_accent - #4285F4 - #3367D6 - #f5f5f5 - #ffffff - - #ffffffff - #ff323232 - #99323232 - #99ffffff - #689f38 - #ffffffff - #689f38 - #ffffffff - #4285f4 - #ffffffff - - #B0BEC5 + @color/color_default_blue1 + @color/color_default_blue2 + @color/color_default_gray1 + @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_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 - #fff5f5f5 + @color/color_default_background - #89000000 + @color/color_default_accent - #2196F3 - #72B70F - #FF7E0F - #258982 - #FFA727 - #01B1AF - #C14CE6 - #0F9D58 - #F15B8D - #5011C1 - #9E9E9E - #26459C - #1A73E8 - #2EC7DC - #6F86DA - #5E97F6 + @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_background + @color/color_default_background + @color/color_default_background + @color/color_default_background #1f000000 - @*android:color/material_grey_100 - @*android:color/background_device_default_light + @color/color_default_gray1 + @color/color_default_background - @*android:color/material_grey_600 - #BFFFFFFF - @android:color/white + @color/color_default_blue2 + @color/color_default_green1 + @color/color_default_view_on_accent - @*android:color/material_red_A700 + @color/color_default_red1 #43a047 #ef6c00 @@ -125,27 +143,27 @@ #ff9e9e9e - #ffff0000 - #FF32c1de - #FFF87B2B - #DADCE0 - #1967D2 - #FFFFFF + @color/color_default_red1 + @color/color_default_accent + @color/color_default_orange1 + @color/color_default_secondary_text + @color/color_default_accent + @color/color_default_background - @*android:color/accent_device_default_light + @color/color_default_accent - #ffdadce0 - #ff1a73e8 - #b3ffffff + @color/color_default_foreground + @color/color_default_accent + @color/color_default_background - @android:color/white + @color/color_default_primary_dark - @*android:color/background_device_default_light + @color/color_default_foreground - #ffdadce0 + @color/color_default_accent \ No newline at end of file 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 d3d3199f62b..c7d214e4f4a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,8 +16,17 @@ + + - - + + + + - - + + @@ -141,6 +181,32 @@ @*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog + + + + + + + + - + + - + + + + @@ -222,34 +315,38 @@ regardless of whether system theme changed to dark or light theme. WARNING: your settings activity shows in setupwizard flow, but doesn't use setupwizard theme. This theme must be set to ensure settings activity always shows light theme in setupwizard flow. --> - + + - + + diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml index f7f1d16bb8b..762fa2e436d 100644 --- a/res/values/themes_suw.xml +++ b/res/values/themes_suw.xml @@ -20,120 +20,162 @@ - - - - - diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index ab8967d5d6b..2ceceb384f0 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -24,7 +24,7 @@ android:fragment="com.android.settings.connecteddevice.BluetoothDashboardFragment" android:key="bluetooth_settings" android:title="@string/bluetooth_settings_title" - android:icon="@*android:drawable/ic_settings_bluetooth" + android:icon="@drawable/ic_settings_bluetooth" android:order="-9" settings:searchable="false"/> @@ -56,7 +56,7 @@ android:key="connected_device_printing" android:title="@string/print_settings" android:summary="@string/summary_placeholder" - android:icon="@*android:drawable/ic_settings_print" + android:icon="@drawable/ic_settings_print" android:fragment="com.android.settings.print.PrintSettingsFragment" android:order="-3" settings:searchable="false"/> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index 8fc50e8806a..310eac836d1 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -75,7 +75,7 @@ diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 977c2728ef8..7eebb7aaccb 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -29,6 +29,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources.Theme; +import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; @@ -276,6 +277,7 @@ public class SettingsActivity extends SettingsBaseActivity actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned); actionBar.setHomeButtonEnabled(deviceProvisioned); actionBar.setDisplayShowTitleEnabled(true); + 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 ec74cd842b4..4dda0e166fe 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -191,7 +191,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 58dff7c2e02..378393511c0 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -90,7 +90,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/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java index 786efd1ef4c..ec14a869e9f 100644 --- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java +++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java @@ -734,8 +734,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/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index c31b13ecb0f..8556f26693a 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -143,7 +143,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { MenuItem item = menu.add(0, EDIT_DEVICE_NAME_ITEM_ID, 0, R.string.bluetooth_rename_button); - item.setIcon(com.android.internal.R.drawable.ic_mode_edit); + item.setIcon(R.drawable.ic_mode_edit); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); super.onCreateOptionsMenu(menu, inflater); } diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 5a4ee1fe029..cbc338eda0e 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -73,7 +73,7 @@ public class BluetoothSliceBuilder { final boolean isBluetoothEnabled = isBluetoothEnabled(); final CharSequence title = context.getText(R.string.bluetooth_settings); final IconCompat icon = IconCompat.createWithResource(context, - com.android.internal.R.drawable.ic_settings_bluetooth); + R.drawable.ic_settings_bluetooth); @ColorInt final int color = com.android.settings.Utils.getColorAccent( context).getDefaultColor(); final PendingIntent toggleAction = getBroadcastIntent(context); diff --git a/src/com/android/settings/dashboard/profileselector/UserAdapter.java b/src/com/android/settings/dashboard/profileselector/UserAdapter.java index 46c87a16002..b5087df529e 100644 --- a/src/com/android/settings/dashboard/profileselector/UserAdapter.java +++ b/src/com/android/settings/dashboard/profileselector/UserAdapter.java @@ -56,7 +56,7 @@ public class UserAdapter implements SpinnerAdapter, ListAdapter { if (userInfo.isManagedProfile()) { mName = context.getString(R.string.managed_user_title); icon = context.getDrawable( - com.android.internal.R.drawable.ic_corp_badge); + R.drawable.ic_corp_badge); } else { mName = userInfo.name; final int userId = userInfo.id; diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index 92afa56cc0a..4326a46d0f5 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -115,7 +115,7 @@ public abstract class StorageWizardBase extends FragmentActivity { mBack = mFooterBarMixin.getSecondaryButton(); mNext = mFooterBarMixin.getPrimaryButton(); - setIcon(com.android.internal.R.drawable.ic_sd_card_48dp); + setIcon(R.drawable.ic_menu_sd_card); } @Override diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 5599a94a212..21f7a80ea6b 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -125,7 +125,7 @@ public class ActionDisabledByAdminDialogHelper { admin = null; supportIconView.setImageDrawable( - mActivity.getDrawable(com.android.internal.R.drawable.ic_info)); + mActivity.getDrawable(R.drawable.ic_info)); TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent}); supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0))); diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java index 38ae2b2df76..9491bde9602 100644 --- a/src/com/android/settings/fuelgauge/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/BatteryEntry.java @@ -157,7 +157,7 @@ public class BatteryEntry { break; case BLUETOOTH: name = context.getResources().getString(R.string.power_bluetooth); - iconId = com.android.internal.R.drawable.ic_settings_bluetooth; + iconId = R.drawable.ic_settings_bluetooth; break; case SCREEN: name = context.getResources().getString(R.string.power_screen); diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index d25c2d491ae..c341d7b392a 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -268,7 +268,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/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java index aa4d53b7f59..7cc6efe97dc 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java @@ -91,7 +91,7 @@ public class BluetoothDevicesSlice implements CustomSliceable { mContext.getTheme().applyStyle(R.style.Theme_Settings_Home, true /* force */); final IconCompat icon = IconCompat.createWithResource(mContext, - com.android.internal.R.drawable.ic_settings_bluetooth); + R.drawable.ic_settings_bluetooth); final CharSequence title = mContext.getText(R.string.bluetooth_devices); final CharSequence titleNoBluetoothDevices = mContext.getText( R.string.no_bluetooth_devices); @@ -215,7 +215,7 @@ public class BluetoothDevicesSlice implements CustomSliceable { // Use default bluetooth icon if can't get icon. if (drawable == null) { return IconCompat.createWithResource(mContext, - com.android.internal.R.drawable.ic_settings_bluetooth); + R.drawable.ic_settings_bluetooth); } return Utils.createIconWithDrawable(drawable); diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index 275969046ad..e2078e3a13b 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -55,7 +55,7 @@ public class LocationSlice implements CustomSliceable { @Override public Slice getSlice() { final IconCompat icon = IconCompat.createWithResource(mContext, - com.android.internal.R.drawable.ic_signal_location); + R.drawable.ic_signal_location); final CharSequence title = mContext.getText(R.string.location_settings_title); @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext); final PendingIntent primaryAction = getPrimaryAction(); diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java index 0ffa9ff2006..852f86f9b88 100644 --- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java +++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java @@ -69,7 +69,7 @@ public class MediaOutputIndicatorSlice implements CustomSliceable { return null; } final IconCompat icon = IconCompat.createWithResource(mContext, - com.android.internal.R.drawable.ic_settings_bluetooth); + R.drawable.ic_settings_bluetooth); final CharSequence title = mContext.getText(R.string.media_output_title); final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext, 0 /* requestCode */, getMediaOutputSliceIntent(), 0 /* flags */); diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java index 734c31e5b4a..5463320547f 100644 --- a/src/com/android/settings/media/MediaOutputSlice.java +++ b/src/com/android/settings/media/MediaOutputSlice.java @@ -122,7 +122,7 @@ public class MediaOutputSlice implements CustomSliceable { if (drawable == null) { Log.d(TAG, "getDeviceIconCompat() device : " + device.getName() + ", drawable is null"); // Use default Bluetooth device icon to handle getIcon() is null case. - drawable = mContext.getDrawable(com.android.internal.R.drawable.ic_bt_headphones_a2dp); + drawable = mContext.getDrawable(R.drawable.ic_bt_headphones_a2dp); } return Utils.createIconWithDrawable(drawable); diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 8d83ef2a3f9..9bf700b40b7 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -248,7 +248,7 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { final MenuItem item = menu.add(Menu.NONE, R.id.edit_sim_name, Menu.NONE, R.string.mobile_network_sim_name); - item.setIcon(com.android.internal.R.drawable.ic_mode_edit); + item.setIcon(R.drawable.ic_mode_edit); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } super.onCreateOptionsMenu(menu, inflater); diff --git a/src/com/android/settings/notification/AlarmVolumePreferenceController.java b/src/com/android/settings/notification/AlarmVolumePreferenceController.java index d6a4110dcdd..50721d15b47 100644 --- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java +++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java @@ -58,6 +58,6 @@ public class AlarmVolumePreferenceController extends VolumeSeekBarPreferenceCont @Override public int getMuteIcon() { - return com.android.internal.R.drawable.ic_audio_alarm_mute; + return R.drawable.ic_audio_alarm_mute; } } diff --git a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java index a014ec90683..a773908607e 100644 --- a/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java +++ b/src/com/android/settings/notification/ZenRuleButtonsPreferenceController.java @@ -62,7 +62,7 @@ public class ZenRuleButtonsPreferenceController extends AbstractZenModePreferenc if (isAvailable()) { mButtonsPref = ((ActionButtonsPreference) screen.findPreference(KEY)) .setButton1Text(R.string.zen_mode_rule_name_edit) - .setButton1Icon(com.android.internal.R.drawable.ic_mode_edit) + .setButton1Icon(R.drawable.ic_mode_edit) .setButton1OnClickListener(new EditRuleNameClickListener()) .setButton2Text(R.string.zen_mode_delete_rule_button) .setButton2Icon(R.drawable.ic_settings_delete) diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java index b102f4101c8..b9a04a068ac 100644 --- a/src/com/android/settings/password/ChooseLockPattern.java +++ b/src/com/android/settings/password/ChooseLockPattern.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; import android.content.res.Resources.Theme; +import android.graphics.Color; import android.os.Bundle; import android.util.Log; import android.util.Pair; @@ -30,6 +31,7 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; @@ -62,7 +64,7 @@ import java.util.List; /** * If the user has a lock pattern set already, makes them confirm the existing one. - * + *

* Then, prompts the user to choose a lock pattern: * - prompts for initial pattern * - asks for confirmation / restart @@ -212,7 +214,7 @@ public class ChooseLockPattern extends SettingsActivity { @Override public void onActivityResult(int requestCode, int resultCode, - Intent data) { + Intent data) { super.onActivityResult(requestCode, resultCode, data); switch (requestCode) { case CONFIRM_EXISTING_REQUEST: @@ -244,64 +246,64 @@ public class ChooseLockPattern extends SettingsActivity { protected LockPatternView.OnPatternListener mChooseNewLockPatternListener = new LockPatternView.OnPatternListener() { - public void onPatternStart() { - mLockPatternView.removeCallbacks(mClearPatternRunnable); - patternInProgress(); - } + public void onPatternStart() { + mLockPatternView.removeCallbacks(mClearPatternRunnable); + patternInProgress(); + } - public void onPatternCleared() { - mLockPatternView.removeCallbacks(mClearPatternRunnable); - } + public void onPatternCleared() { + mLockPatternView.removeCallbacks(mClearPatternRunnable); + } - public void onPatternDetected(List pattern) { - if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) { - if (mChosenPattern == null) throw new IllegalStateException( - "null chosen pattern in stage 'need to confirm"); - final String chosenPatternStr = LockPatternUtils.patternToString( - mChosenPattern, mPatternSize); - final String potentialPatternStr = LockPatternUtils.patternToString( - pattern, mPatternSize); - - if (chosenPatternStr.equals(potentialPatternStr)) { - updateStage(Stage.ChoiceConfirmed); - } else { - updateStage(Stage.ConfirmWrong); - } - } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort){ - if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) { - updateStage(Stage.ChoiceTooShort); + public void onPatternDetected(List pattern) { + if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) { + if (mChosenPattern == null) throw new IllegalStateException( + "null chosen pattern in stage 'need to confirm"); + final String chosenPatternStr = LockPatternUtils.patternToString( + mChosenPattern, mPatternSize); + final String potentialPatternStr = LockPatternUtils.patternToString( + pattern, mPatternSize); + + if (chosenPatternStr.equals(potentialPatternStr)) { + updateStage(Stage.ChoiceConfirmed); + } else { + updateStage(Stage.ConfirmWrong); + } + } else if (mUiStage == Stage.Introduction || mUiStage == Stage.ChoiceTooShort) { + if (pattern.size() < LockPatternUtils.MIN_LOCK_PATTERN_SIZE) { + updateStage(Stage.ChoiceTooShort); + } else { + mChosenPattern = new ArrayList(pattern); + updateStage(Stage.FirstChoiceValid); + } } else { - mChosenPattern = new ArrayList(pattern); - updateStage(Stage.FirstChoiceValid); + throw new IllegalStateException("Unexpected stage " + mUiStage + " when " + + "entering the pattern."); } - } else { - throw new IllegalStateException("Unexpected stage " + mUiStage + " when " - + "entering the pattern."); } - } - public void onPatternCellAdded(List pattern) { + public void onPatternCellAdded(List pattern) { - } - - private void patternInProgress() { - mHeaderText.setText(R.string.lockpattern_recording_inprogress); - if (mDefaultHeaderColorList != null) { - mHeaderText.setTextColor(mDefaultHeaderColorList); } - mFooterText.setText(""); - mNextButton.setEnabled(false); - - if (mTitleHeaderScrollView != null) { - mTitleHeaderScrollView.post(new Runnable() { - @Override - public void run() { - mTitleHeaderScrollView.fullScroll(ScrollView.FOCUS_DOWN); - } - }); + + private void patternInProgress() { + mHeaderText.setText(R.string.lockpattern_recording_inprogress); + if (mDefaultHeaderColorList != null) { + mHeaderText.setTextColor(mDefaultHeaderColorList); + } + mFooterText.setText(""); + mNextButton.setEnabled(false); + + if (mTitleHeaderScrollView != null) { + mTitleHeaderScrollView.post(new Runnable() { + @Override + public void run() { + mTitleHeaderScrollView.fullScroll(ScrollView.FOCUS_DOWN); + } + }); + } } - } - }; + }; @Override public int getMetricsCategory() { @@ -319,7 +321,7 @@ public class ChooseLockPattern extends SettingsActivity { /** - * @param text The displayed text for this mode. + * @param text The displayed text for this mode. * @param enabled Whether the button should be enabled. */ LeftButtonMode(int text, boolean enabled) { @@ -342,7 +344,7 @@ public class ChooseLockPattern extends SettingsActivity { Ok(android.R.string.ok, true); /** - * @param text The displayed text for this mode. + * @param text The displayed text for this mode. * @param enabled Whether the button should be enabled. */ RightButtonMode(int text, boolean enabled) { @@ -394,18 +396,18 @@ public class ChooseLockPattern extends SettingsActivity { /** * @param messageForBiometrics The message displayed at the top, above header for - * fingerprint flow. - * @param message The message displayed at the top. - * @param headerMessage The message displayed at the top. - * @param leftMode The mode of the left button. - * @param rightMode The mode of the right button. - * @param footerMessage The footer message. - * @param patternEnabled Whether the pattern widget is enabled. + * fingerprint flow. + * @param message The message displayed at the top. + * @param headerMessage The message displayed at the top. + * @param leftMode The mode of the left button. + * @param rightMode The mode of the right button. + * @param footerMessage The footer message. + * @param patternEnabled Whether the pattern widget is enabled. */ Stage(int messageForBiometrics, int message, int headerMessage, - LeftButtonMode leftMode, - RightButtonMode rightMode, - int footerMessage, boolean patternEnabled) { + LeftButtonMode leftMode, + RightButtonMode rightMode, + int footerMessage, boolean patternEnabled) { this.headerMessage = headerMessage; this.messageForBiometrics = messageForBiometrics; this.message = message; @@ -474,7 +476,7 @@ public class ChooseLockPattern extends SettingsActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + Bundle savedInstanceState) { final GlifLayout layout = (GlifLayout) inflater.inflate( R.layout.choose_lock_pattern, container, false); layout.setHeaderText(getActivity().getTitle()); @@ -519,7 +521,7 @@ public class ChooseLockPattern extends SettingsActivity { LockPatternView.Cell.of(0, 1, mPatternSize), LockPatternView.Cell.of(1, 1, mPatternSize), LockPatternView.Cell.of(2, 1, mPatternSize) - )); + )); return layout; } @@ -566,10 +568,10 @@ public class ChooseLockPattern extends SettingsActivity { // know there isn't an existing password or the user confirms their password. updateStage(Stage.NeedToConfirm); boolean launchedConfirmationActivity = - mChooseLockSettingsHelper.launchConfirmationActivity( - CONFIRM_EXISTING_REQUEST, - getString(R.string.unlock_set_unlock_launch_picker_title), true, - mUserId); + mChooseLockSettingsHelper.launchConfirmationActivity( + CONFIRM_EXISTING_REQUEST, + getString(R.string.unlock_set_unlock_launch_picker_title), true, + mUserId); if (!launchedConfirmationActivity) { updateStage(Stage.Introduction); } @@ -694,6 +696,7 @@ public class ChooseLockPattern extends SettingsActivity { * Updates the messages and buttons appropriate to what stage the user * is at in choosing a view. This doesn't handle clearing out the pattern; * the pattern is expected to be in the right state. + * * @param stage */ protected void updateStage(Stage stage) { @@ -856,9 +859,9 @@ public class ChooseLockPattern extends SettingsActivity { private byte mPatternSize; public void start(LockPatternUtils utils, boolean credentialRequired, - boolean hasChallenge, long challenge, - List chosenPattern, byte[] currentPattern, - int userId, byte patternSize) { + boolean hasChallenge, long challenge, + List chosenPattern, byte[] currentPattern, + int userId, byte patternSize) { prepare(utils, credentialRequired, hasChallenge, challenge, userId); mCurrentPattern = currentPattern; diff --git a/src/com/android/settings/print/PrintJobPreferenceController.java b/src/com/android/settings/print/PrintJobPreferenceController.java index 0eff0d6d612..32375ec430c 100644 --- a/src/com/android/settings/print/PrintJobPreferenceController.java +++ b/src/com/android/settings/print/PrintJobPreferenceController.java @@ -96,7 +96,7 @@ public class PrintJobPreferenceController extends PrintJobPreferenceControllerBa switch (info.getState()) { case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { - Drawable icon = mContext.getDrawable(com.android.internal.R.drawable.ic_print); + Drawable icon = mContext.getDrawable(R.drawable.ic_print); icon.setTint(tintColor); mPreference.setIcon(icon); break; @@ -105,7 +105,7 @@ public class PrintJobPreferenceController extends PrintJobPreferenceControllerBa case PrintJobInfo.STATE_FAILED: case PrintJobInfo.STATE_BLOCKED: { Drawable icon = mContext.getDrawable( - com.android.internal.R.drawable.ic_print_error); + R.drawable.ic_print_error); icon.setTint(tintColor); mPreference.setIcon(icon); break; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index 09a0a279e44..e90b64f2c14 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -212,6 +212,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); } @@ -365,7 +366,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_STARTED: { Drawable icon = getActivity().getDrawable( - com.android.internal.R.drawable.ic_print); + R.drawable.ic_print); icon.setTint(tintColor); preference.setIcon(icon); break; @@ -374,7 +375,7 @@ 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); + R.drawable.ic_print_error); icon.setTint(tintColor); preference.setIcon(icon); break; diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index 25d0d3027d5..6f0a7ee8aec 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -79,7 +79,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM } final MenuItem searchItem = menu.add(Menu.NONE, Menu.NONE, 0 /* order */, R.string.search_menu); - searchItem.setIcon(R.drawable.ic_search_24dp); + searchItem.setIcon(R.drawable.ic_homepage_search); searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); searchItem.setOnMenuItemClickListener(target -> { diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 8e31290577e..7bd21c5598e 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -122,6 +122,10 @@ public class EntityHeaderController { mHeader = LayoutInflater.from(fragment.getContext()) .inflate(R.layout.settings_entity_header, null /* root */); } + View headerView = mHeader.findViewById(R.id.entity_header); + if(headerView != null) { + headerView.setBackgroundColor(mActivity.getColor(R.color.color_default_primary_dark)); + } } public EntityHeaderController setRecyclerView(RecyclerView recyclerView, Lifecycle lifecycle) { @@ -318,8 +322,7 @@ public class EntityHeaderController { return this; } actionBar.setBackgroundDrawable( - new ColorDrawable( - Utils.getColorAttrDefaultColor(activity, android.R.attr.colorPrimaryDark))); + new ColorDrawable(activity.getColor(R.color.color_default_primary_dark))); actionBar.setElevation(0); if (mRecyclerView != null && mLifecycle != null) { ActionBarShadowController.attachToView(mActivity, mLifecycle, mRecyclerView); @@ -345,7 +348,7 @@ public class EntityHeaderController { if (mEditOnClickListener == null) { button.setVisibility(View.GONE); } else { - button.setImageResource(com.android.internal.R.drawable.ic_mode_edit); + button.setImageResource(R.drawable.ic_mode_edit); button.setVisibility(View.VISIBLE); button.setOnClickListener(mEditOnClickListener); } diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index c7953c3f695..9fd8918d989 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -35,6 +35,7 @@ public class ConnectedAccessPointPreference extends LongPressAccessPointPreferen private OnGearClickListener mOnGearClickListener; private boolean mIsCaptivePortal; + public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context, UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks, Fragment fragment) { diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index c3c08f0c408..8390f1b16bd 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -16,21 +16,26 @@ package com.android.settings.wifi; import android.content.Context; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import androidx.fragment.app.Fragment; import androidx.preference.PreferenceViewHolder; +import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; 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, int iconResId, Fragment fragment) { super(accessPoint, context, cache, iconResId, forSavedNetworks); mFragment = fragment; + this.mContext = context; } @Override @@ -42,4 +47,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.color_default_accent), PorterDuff.Mode.SRC_IN); + } + super.setIcon(drawable); + } } diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java index ceda8a70a05..9c5db4b754f 100644 --- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java +++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java @@ -400,7 +400,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp final Drawable drawable = getContext().getDrawable( Utils.getWifiIconResource(level)); drawable.setTintList( - Utils.getColorAttr(getContext(), android.R.attr.colorControlNormal)); + Utils.getColorAttr(getContext(), R.color.color_default_accent)); imageView.setImageDrawable(drawable); } diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index afcf883fb68..24e99da9951 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -28,6 +28,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.graphics.Bitmap; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; @@ -585,7 +587,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController } Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate(); - wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal)); mSignalStrengthPref.setIcon(wifiIconDark); mSignalStrengthPref.setSummary(mSignalStr[mRssiSignalLevel]); @@ -603,9 +604,6 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController return original; } - // clear tint list to make sure can set 87% black after enlarge - original.setTintList(null); - // enlarge icon size final Bitmap bitmap = Utils.createBitmap(original, iconSize /*width*/, @@ -613,7 +611,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController Drawable newIcon = new BitmapDrawable(null /*resource*/, bitmap); // config color for 87% black after enlarge - newIcon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorPrimary)); + newIcon.setTintList(Utils.getColorAttr(mContext, R.color.color_default_accent)); return newIcon; } @@ -960,7 +958,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController } public Drawable getIcon(int level) { - return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate(); + Drawable icon = mContext.getDrawable(Utils.getWifiIconResource(level)); + icon.setTint(mContext.getColor(R.color.color_default_accent)); + return icon.mutate(); } } diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java index ee03e6e7074..c75b03d4c26 100644 --- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java +++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java @@ -133,7 +133,7 @@ public class WifiNetworkDetailsFragment extends RestrictedDashboardFragment impl public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { if (!mIsUiRestricted) { MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify); - item.setIcon(com.android.internal.R.drawable.ic_mode_edit); + item.setIcon(R.drawable.ic_mode_edit); item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } super.onCreateOptionsMenu(menu, inflater); -- GitLab