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

Commit 742545c8 authored by Chip Fukuhara's avatar Chip Fukuhara Committed by Android (Google) Code Review
Browse files

Merge "Update style resources for progress-spinner" into main

parents c4368be1 7988665c

core/res/res/drawable-round-watch/progress_indeterminate_horizontal_material.xml

0 → 100644
+944 −0

File added.

Preview size limit exceeded, changes collapsed.

core/res/res/drawable-watch/progress_horizontal_material.xml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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">

    <item android:id="@id/background"

          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle">

            <corners android:radius="?attr/progressBarCornerRadius" />

            <size android:height="@dimen/progress_bar_height_material" />

            <solid android:color="@color/material_grey_900" />

        </shape>

    </item>

    <item android:id="@id/secondaryProgress"

          android:gravity="center_vertical|fill_horizontal">

        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle">

                <corners android:radius="?attr/progressBarCornerRadius" />

                <size android:height="@dimen/progress_bar_height_material" />

                <solid android:color="@color/material_grey_900" />

            </shape>

        </scale>

    </item>

    <item android:id="@id/progress"

          android:gravity="center_vertical|fill_horizontal">

        <scale android:scaleWidth="100%">

            <shape android:shape="rectangle">

                <corners android:radius="?attr/progressBarCornerRadius" />

                <size android:height="@dimen/progress_bar_height_material" />

                <solid android:color="@color/white" />

            </shape>

        </scale>

    </item>

</layer-list>
 
 No newline at end of file

core/res/res/values-watch/dimens_material.xml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    <dimen name="progress_bar_size_small">16dip</dimen>

    <dimen name="progress_bar_size_medium">32dip</dimen>

    <dimen name="progress_bar_size_large">64dip</dimen>

    <dimen name="progress_bar_height">24dp</dimen>



    <!-- Progress bar message dimens -->

    <dimen name="message_progress_dialog_text_size">18sp</dimen>

core/res/res/values-watch/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
    <string name="global_action_emergency">Emergency SOS</string>



   <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->

    <string name="reboot_to_update_prepare">Preparing to update</string>

    <string name="reboot_to_update_title">Wear OS system update</string>



   <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->

core/res/res/values-watch/styles_material.xml

+10 −0
Original line number Diff line number Diff line
@@ -107,4 +107,14 @@ please see styles_device_defaults.xml. 
        <item name="paddingStart">@dimen/message_progress_dialog_start_padding</item>

        <item name="paddingTop">@dimen/message_progress_dialog_top_padding</item>

    </style>



    <!-- Material progress part (indeterminate/horizontal) for Wear -->

    <style name="Widget.Material.ProgressBar.Horizontal" parent="Widget.ProgressBar.Horizontal">

        <item name="progressDrawable">@drawable/progress_horizontal_material</item>

        <item name="indeterminateDrawable">

            @drawable/progress_indeterminate_horizontal_material

        </item>

        <item name="minHeight">@dimen/progress_bar_height</item>

        <item name="maxHeight">@dimen/progress_bar_height</item>

    </style>

</resources>