From 7988665c380b3a627c031929318da9c08623869a Mon Sep 17 00:00:00 2001 From: Todd Lee Date: Thu, 2 Sep 2021 09:17:19 -0400 Subject: [PATCH] Update style resources for progress-spinner This change is split out from ag/22635078 so that the functionality and the material resources can be done separately. The relevant parts of the commit message from there are copied below for reference. - This change modifies the system progress spinner (indeterminate/horizontal) for use on w3. spec: https://docs.google.com/presentation/d/1YqqNzmgW6C6-zZJdhE3zTvxPe24BBn66FLYalpSgww0/edit#slide=id.gdea00a2fd1_0_169 video: https://drive.google.com/file/d/1hZzk-UBx7DOx5W7282_nB-5nDb5ppDxb/view?usp=sharing&resourcekey=0-eD2vvlCeyYhdF5sG2AwSmQ Note that UI makes use of system color attributes: - colorControlNormal (spinner) - colorProgressBackgroundNormal (track) Bug: 194441833 Bug: 192470870 Bug: 192470222 Test: manual check - Settings > System > Disconnect & Reset - Power > Shutdown - Power > Restart Change-Id: I489dce4a54505738654610b6c7c1666ecbc415fc Upstreaming Bug: 272532971 Also includes these changes: -------------------------------------------------------------------- [UX] Update ShutdownThread UI as per UX Spec Updates include: * addition of round-watch-specific layout for progressbar screen * progress bar colors changed from blue to material white and grey * progress bar text to smaller size * removed ellipses from string text Bug: b/257537152 Video: https://broadcast.corp.google.com/ui/player/75926391-22bd-4127-9f38-73dba5fdc0f6 Test: flashed locally and ran fake-ota script Upstreaming Bug: b/272534061 -------------------------------------------------------------------- Change-Id: I7b0a967606398d1cb91508888649ac03a69b29c8 --- ...ress_indeterminate_horizontal_material.xml | 944 ++++++++++++++++++ .../progress_horizontal_material.xml | 46 + core/res/res/values-watch/dimens_material.xml | 1 + core/res/res/values-watch/strings.xml | 1 + core/res/res/values-watch/styles_material.xml | 10 + 5 files changed, 1002 insertions(+) create mode 100644 core/res/res/drawable-round-watch/progress_indeterminate_horizontal_material.xml create mode 100644 core/res/res/drawable-watch/progress_horizontal_material.xml diff --git a/core/res/res/drawable-round-watch/progress_indeterminate_horizontal_material.xml b/core/res/res/drawable-round-watch/progress_indeterminate_horizontal_material.xml new file mode 100644 index 0000000000000..bd77e595af088 --- /dev/null +++ b/core/res/res/drawable-round-watch/progress_indeterminate_horizontal_material.xml @@ -0,0 +1,944 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/res/res/drawable-watch/progress_horizontal_material.xml b/core/res/res/drawable-watch/progress_horizontal_material.xml new file mode 100644 index 0000000000000..8c52a41c149d4 --- /dev/null +++ b/core/res/res/drawable-watch/progress_horizontal_material.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/res/res/values-watch/dimens_material.xml b/core/res/res/values-watch/dimens_material.xml index 51d401860f7f9..40673c1aa5849 100644 --- a/core/res/res/values-watch/dimens_material.xml +++ b/core/res/res/values-watch/dimens_material.xml @@ -44,6 +44,7 @@ 16dip 32dip 64dip + 24dp 18sp diff --git a/core/res/res/values-watch/strings.xml b/core/res/res/values-watch/strings.xml index 6d6cfc775fd3e..9fa4bef76d3a4 100644 --- a/core/res/res/values-watch/strings.xml +++ b/core/res/res/values-watch/strings.xml @@ -26,6 +26,7 @@ Emergency SOS + Preparing to update Wear OS system update diff --git a/core/res/res/values-watch/styles_material.xml b/core/res/res/values-watch/styles_material.xml index 12bc406fc9981..8698e86ba5f9d 100644 --- a/core/res/res/values-watch/styles_material.xml +++ b/core/res/res/values-watch/styles_material.xml @@ -107,4 +107,14 @@ please see styles_device_defaults.xml. @dimen/message_progress_dialog_start_padding @dimen/message_progress_dialog_top_padding + + +