Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bad84cf authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Moving progressBarHorizontalStyle to SettingsLib" into sc-dev am: aeb2c1d8

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

Change-Id: Ibfba04d2a75f814ed9bd5f8dd25562b1e615d408
parents d971cb22 aeb2c1d8
Loading
Loading
Loading
Loading
+0 −38
Original line number Diff line number Diff line
<?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>
+0 −6
Original line number Diff line number Diff line
@@ -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>
+0 −1
Original line number Diff line number Diff line
@@ -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>