Moving progressBarHorizontalStyle to SettingsLib
Bug: 190467533
Test: rebuild & manual
Change-Id: I5f7f493b7c100c06ff5328706906bf33bae34e56
diff --git a/res/drawable/progress_horizontal.xml b/res/drawable/progress_horizontal.xml
deleted file mode 100644
index f2a4cc4..0000000
--- a/res/drawable/progress_horizontal.xml
+++ /dev/null
@@ -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>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6021a7c..ae77cc23 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -404,12 +404,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>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index df7d433..4c5cdb7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -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>