Merge "Update progress bar UI" into sc-dev am: 3486b95fd7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14235149

Change-Id: I7e3f5582415be347cc7dae0670a2d28bccc8ebf1
This commit is contained in:
Arc Wang
2021-04-21 09:16:54 +00:00
committed by Automerger Merge Worker
3 changed files with 45 additions and 0 deletions

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -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>