PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-06-10 12:56:21 +00:00
committed by Android (Google) Code Review
parent 394211dd75 a0a7ff6d76
commit aeb2c1d8fa
3 changed files with 0 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
res/drawable/progress_horizontal.xml
View File

@@ -1,38 +0,0 @@
<?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>

6
res/values/styles.xml
View File

@@ -405,12 +405,6 @@
<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">
<item name="android:theme">@style/RoundedCornerThemeOverlay</item>
</style>

1
res/values/themes.xml
View File

@@ -32,7 +32,6 @@
<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>