From 5383f11ec9a936bc62a640273ed62234e7bf992c Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Tue, 20 Apr 2021 20:31:30 +0800
Subject: [PATCH] Update progress bar UI

Apply android:progressDrawable to Settings theme,
the drawable shows round corners and different colors.

Bug: 174964885
Test: manual visual
Change-Id: I0447231200d12953f4527866d537ee605009f8a4
---
 res/drawable/progress_horizontal.xml | 38 ++++++++++++++++++++++++++++
 res/values/styles.xml                |  6 +++++
 res/values/themes.xml                |  1 +
 3 files changed, 45 insertions(+)
 create mode 100644 res/drawable/progress_horizontal.xml

diff --git a/res/drawable/progress_horizontal.xml b/res/drawable/progress_horizontal.xml
new file mode 100644
index 00000000000..f2a4cc4ce49
--- /dev/null
+++ b/res/drawable/progress_horizontal.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+
+    <item
+        android:id="@android:id/background">
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="?androidprv:attr/colorSurfaceVariant" />
+        </shape>
+    </item>
+
+    <item
+        android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="8dp" />
+                <solid android:color="?android:attr/textColorPrimary" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 31f44dd609a..be453340518 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -409,6 +409,12 @@
         <item name="android:progressDrawable">@drawable/ring_progress</item>
     </style>
 
+    <style name="HorizontalProgressBarStyle"
+           parent="android:style/Widget.Material.ProgressBar.Horizontal">
+        <item name="android:progressDrawable">@drawable/progress_horizontal</item>
+        <item name="android:scaleY">0.5</item>
+    </style>
+
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
     <style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d5376ec1357..8224f03f11b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -31,6 +31,7 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
+        <item name="android:progressBarStyleHorizontal">@style/HorizontalProgressBarStyle</item>
 
         <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
         <item name="face_layout_theme">@style/FaceLayoutTheme</item>