Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tenghui Zhu
2016-03-18 16:36:05 +00:00
committed by Android (Google) Code Review
parent 2a4e495448 077b44912b
commit 6a00ad2c8b
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/anim/progress_indeterminate_rotation_material.xml
View File

@@ -16,7 +16,7 @@
-->
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="6665"
android:duration="4444"
android:interpolator="@android:anim/linear_interpolator"
android:propertyName="rotation"
android:repeatCount="-1"

12
core/res/res/drawable/vector_drawable_progress_bar_large.xml
View File

@@ -16,22 +16,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="76dp"
android:width="76dp"
android:viewportHeight="48"
android:viewportWidth="48"
android:viewportHeight="76"
android:viewportWidth="76"
android:tint="?attr/colorControlActivated">
<group
android:name="root"
android:translateX="24.0"
android:translateY="24.0" >
android:translateX="38.0"
android:translateY="38.0" >
<path
android:name="progressBar"
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:strokeLineCap="square"
android:strokeLineJoin="miter"
android:strokeWidth="4"
android:strokeWidth="6"
android:trimPathEnd="0"
android:trimPathOffset="0"
android:trimPathStart="0" />

2
core/res/res/drawable/vector_drawable_progress_bar_medium.xml
View File

@@ -27,7 +27,7 @@
<path
android:name="progressBar"
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:strokeLineCap="square"
android:strokeLineJoin="miter"

12
core/res/res/drawable/vector_drawable_progress_bar_small.xml
View File

@@ -16,22 +16,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="16dp"
android:width="16dp"
android:viewportHeight="48"
android:viewportWidth="48"
android:viewportHeight="16"
android:viewportWidth="16"
android:tint="?attr/colorControlActivated">
<group
android:name="root"
android:translateX="24.0"
android:translateY="24.0" >
android:translateX="8.0"
android:translateY="8.0" >
<path
android:name="progressBar"
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:strokeLineCap="square"
android:strokeLineJoin="miter"
android:strokeWidth="4"
android:strokeWidth="2.125"
android:trimPathEnd="0"
android:trimPathOffset="0"
android:trimPathStart="0" />