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

Commit 3486b95f authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "Update progress bar UI" into sc-dev

parents 4a4e2bae 5383f11e
Loading
Loading
Loading
Loading
+38 −0
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>
+6 −0
Original line number Diff line number Diff line
@@ -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"/>

+1 −0
Original line number Diff line number Diff line
@@ -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>