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

Commit dc3d9f12 authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge "Make sure the indeterminate progress bar rotate correctly."

parents a0de0e59 c8ffb0d3

core/res/res/anim/progress_indeterminate_rotation_material.xml

0 → 100644
+25 −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.

-->



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

    android:duration="6665"

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

    android:propertyName="rotation"

    android:repeatCount="-1"

    android:valueFrom="0"

    android:valueTo="720"

    android:valueType="floatType" />
 
 No newline at end of file

core/res/res/drawable/progress_large_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -21,4 +21,8 @@ 
        android:name="progressBar"

        android:animation="@anim/progress_indeterminate_material" />



    <target

        android:name="root"

        android:animation="@anim/progress_indeterminate_rotation_material" />



</animated-vector>

core/res/res/drawable/progress_medium_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -20,4 +20,8 @@ 
        android:name="progressBar"

        android:animation="@anim/progress_indeterminate_material" />



    <target

        android:name="root"

        android:animation="@anim/progress_indeterminate_rotation_material" />



</animated-vector>
 
 No newline at end of file

core/res/res/drawable/progress_small_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -21,4 +21,8 @@ 
        android:name="progressBar"

        android:animation="@anim/progress_indeterminate_material" />



    <target

        android:name="root"

        android:animation="@anim/progress_indeterminate_rotation_material" />



</animated-vector>

core/res/res/drawable/vector_drawable_progress_bar_large.xml

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


    <group

        android:name="root"

        android:scaleX="1.0"

        android:scaleY="1.0"

        android:translateX="24.0"

        android:translateY="24.0" >

        <path