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

Commit 6b558647 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by android-build-merger
Browse files

Merge "Update material circular progress spinner (indeterminate)" into nyc-dev 

am: 6a00ad2c

* commit '6a00ad2c':
  Update material circular progress spinner (indeterminate)
parents a903fd76 6a00ad2c

core/res/res/anim/progress_indeterminate_rotation_material.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 
-->

-->





<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"

<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"

    android:duration="6665"

    android:duration="4444"

    android:interpolator="@android:anim/linear_interpolator"

    android:interpolator="@android:anim/linear_interpolator"

    android:propertyName="rotation"

    android:propertyName="rotation"

    android:repeatCount="-1"

    android:repeatCount="-1"

core/res/res/drawable/vector_drawable_progress_bar_large.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -16,22 +16,22 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:height="76dp"

        android:height="76dp"

        android:width="76dp"

        android:width="76dp"

        android:viewportHeight="48"

        android:viewportHeight="76"

        android:viewportWidth="48"

        android:viewportWidth="76"

        android:tint="?attr/colorControlActivated">

        android:tint="?attr/colorControlActivated">





    <group

    <group

        android:name="root"

        android:name="root"

        android:translateX="24.0"

        android:translateX="38.0"

        android:translateY="24.0" >

        android:translateY="38.0" >

        <path

        <path

            android:name="progressBar"

            android:name="progressBar"

            android:fillColor="#00000000"

            android:fillColor="#00000000"

            android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"

            android:pathData="M0, 0 m 0, -29 a 29,29 0 1,1 0,58 a 29,29 0 1,1 0,-58"

            android:strokeColor="@color/white"

            android:strokeColor="@color/white"

            android:strokeLineCap="square"

            android:strokeLineCap="square"

            android:strokeLineJoin="miter"

            android:strokeLineJoin="miter"

            android:strokeWidth="4"

            android:strokeWidth="6"

            android:trimPathEnd="0"

            android:trimPathEnd="0"

            android:trimPathOffset="0"

            android:trimPathOffset="0"

            android:trimPathStart="0" />

            android:trimPathStart="0" />

core/res/res/drawable/vector_drawable_progress_bar_medium.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
        <path

        <path

            android:name="progressBar"

            android:name="progressBar"

            android:fillColor="#00000000"

            android:fillColor="#00000000"

            android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"

            android:pathData="M0, 0 m 0, -18 a 18,18 0 1,1 0,36 a 18,18 0 1,1 0,-36"

            android:strokeColor="@color/white"

            android:strokeColor="@color/white"

            android:strokeLineCap="square"

            android:strokeLineCap="square"

            android:strokeLineJoin="miter"

            android:strokeLineJoin="miter"

core/res/res/drawable/vector_drawable_progress_bar_small.xml

+6 −6
Original line number Original line Diff line number Diff line
@@ -16,22 +16,22 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:height="16dp"

        android:height="16dp"

        android:width="16dp"

        android:width="16dp"

        android:viewportHeight="48"

        android:viewportHeight="16"

        android:viewportWidth="48"

        android:viewportWidth="16"

        android:tint="?attr/colorControlActivated">

        android:tint="?attr/colorControlActivated">





    <group

    <group

        android:name="root"

        android:name="root"

        android:translateX="24.0"

        android:translateX="8.0"

        android:translateY="24.0" >

        android:translateY="8.0" >

        <path

        <path

            android:name="progressBar"

            android:name="progressBar"

            android:fillColor="#00000000"

            android:fillColor="#00000000"

            android:pathData="M0, 0 m 0, -19 a 19,19 0 1,1 0,38 a 19,19 0 1,1 0,-38"

            android:pathData="M0, 0 m 0, -5.9375 a 5.9375,5.9375 0 1,1 0,11.875 a 5.9375,5.9375 0 1,1 0,-11.875"

            android:strokeColor="@color/white"

            android:strokeColor="@color/white"

            android:strokeLineCap="square"

            android:strokeLineCap="square"

            android:strokeLineJoin="miter"

            android:strokeLineJoin="miter"

            android:strokeWidth="4"

            android:strokeWidth="2.125"

            android:trimPathEnd="0"

            android:trimPathEnd="0"

            android:trimPathOffset="0"

            android:trimPathOffset="0"

            android:trimPathStart="0" />

            android:trimPathStart="0" />