diff options
author | Maurice Lam <yukl@google.com> | 2018-03-09 20:55:24 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2018-03-14 01:37:03 +0000 |
commit | b5a2d11440eab84ef1ae1f44fb29b0690038c8e5 (patch) | |
tree | cc7147bf88082c691cabfc105509f2dc68d5f1bd | |
parent | 15d9037e89d502c7deb9cbf81c0407d433a5706b (diff) | |
download | setupwizard-b5a2d11440eab84ef1ae1f44fb29b0690038c8e5.tar.gz |
Update fourcolor progress bar
Test: Manual. Existing tests pass
Bug: 63074068
Change-Id: I52a1704c39a9a54f9a4e79f42d174a20ee96c310
(cherry picked from commit 83817ea0336e6d9a217b4c4585b11dbaf3eb740a)
-rw-r--r-- | library/gingerbread/res/values/styles.xml | 1 | ||||
-rw-r--r-- | library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml | 61 | ||||
-rw-r--r-- | library/main/res/values-v21/styles.xml | 1 | ||||
-rw-r--r-- | library/main/res/values/dimens.xml | 1 |
4 files changed, 37 insertions, 27 deletions
diff --git a/library/gingerbread/res/values/styles.xml b/library/gingerbread/res/values/styles.xml index 241f037..130925d 100644 --- a/library/gingerbread/res/values/styles.xml +++ b/library/gingerbread/res/values/styles.xml @@ -277,6 +277,7 @@ <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" /> <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> + <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item> <item name="android:layout_gravity">center</item> <item name="android:indeterminate">true</item> </style> diff --git a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml index 2ac35ee..9d54141 100644 --- a/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml +++ b/library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml @@ -26,37 +26,44 @@ <aapt:attr name="android:drawable"> <vector android:width="823dp" android:height="823dp" android:viewportHeight="823" android:viewportWidth="823"> - <group android:name="blue1" android:translateX="411.5" android:translateY="411.5"> - <path android:name="blue1_path" + <group android:name="red" android:translateX="411.5" android:translateY="411.5"> + <path android:name="red_path" android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " - android:strokeAlpha="1" android:strokeColor="#4688f1" + android:strokeAlpha="1" android:strokeColor="#ea4335" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="27" /> </group> - <group android:name="blue2" android:translateX="411.5" android:translateY="411.5"> - <path android:name="blue2_path" - android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " - android:strokeAlpha="1" android:strokeColor="#7dacf4" + <group android:name="yellow" android:translateX="411.5" android:translateY="411.5"> + <path android:name="yellow_path" + android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " + android:strokeAlpha="1" android:strokeColor="#fbbc04" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="28" /> </group> - <group android:name="blue3" android:translateX="411.5" android:translateY="411.5"> - <path android:name="blue3_path" - android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " - android:strokeAlpha="1" android:strokeColor="#c7dbfb" + <group android:name="green" android:translateX="411.5" android:translateY="411.5"> + <path android:name="green_path" + android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " + android:strokeAlpha="1" android:strokeColor="#34a853" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="29" /> </group> - <group android:name="blue4" android:translateX="411.5" android:translateY="411.5"> - <path android:name="blue4_path" - android:pathData=" M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " - android:strokeAlpha="1" android:strokeColor="#e8f0fd" + <group android:name="blue" android:translateX="411.5" android:translateY="411.5"> + <path android:name="blue_path" + android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " + android:strokeAlpha="1" android:strokeColor="#4285f4" + android:strokeLineCap="round" android:strokeLineJoin="round" + android:strokeWidth="30" /> + </group> + <!-- gray --> + <group android:translateX="411.5" android:translateY="411.5"> + <path android:pathData="M0 -395 C218,-395 395,-218 395,0 C395,218 218,395 0,395 C-218,395 -395,218 -395,0 C-395,-218 -218,-395 0,-395c " + android:strokeAlpha="1" android:strokeColor="#1f9aa0a6" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="30" /> </group> </vector> </aapt:attr> - <target android:name="blue1_path"> + <target android:name="red_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathStart" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -67,7 +74,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue1_path"> + <target android:name="red_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathEnd" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -78,7 +85,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue1"> + <target android:name="red"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="rotation" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" @@ -89,7 +96,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue2_path"> + <target android:name="yellow_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathStart" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -100,7 +107,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue2_path"> + <target android:name="yellow_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathEnd" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -111,7 +118,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue2"> + <target android:name="yellow"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="rotation" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" @@ -122,7 +129,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue3_path"> + <target android:name="green_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathStart" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -133,7 +140,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue3_path"> + <target android:name="green_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathEnd" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -144,7 +151,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue3"> + <target android:name="green"> <aapt:attr name="android:animation"> <set android:ordering="together"> <objectAnimator android:duration="1983" android:propertyName="rotation" @@ -158,7 +165,7 @@ </set> </aapt:attr> </target> - <target android:name="blue4_path"> + <target android:name="blue_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathStart" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -169,7 +176,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue4_path"> + <target android:name="blue_path"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="trimPathEnd" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" @@ -180,7 +187,7 @@ </objectAnimator> </aapt:attr> </target> - <target android:name="blue4"> + <target android:name="blue"> <aapt:attr name="android:animation"> <objectAnimator android:duration="1983" android:propertyName="rotation" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" diff --git a/library/main/res/values-v21/styles.xml b/library/main/res/values-v21/styles.xml index a77c32c..450adab 100644 --- a/library/main/res/values-v21/styles.xml +++ b/library/main/res/values-v21/styles.xml @@ -45,6 +45,7 @@ <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" /> <style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> + <item name="android:padding">@dimen/suw_glif_fourcolor_progress_bar_padding</item> <item name="android:layout_gravity">center</item> <item name="android:indeterminate">true</item> <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item> diff --git a/library/main/res/values/dimens.xml b/library/main/res/values/dimens.xml index be6b248..8281013 100644 --- a/library/main/res/values/dimens.xml +++ b/library/main/res/values/dimens.xml @@ -139,6 +139,7 @@ <!-- The margin to compensate for the padding built-in to the widget itself --> <dimen name="suw_progress_bar_margin_vertical">-7dp</dimen> <dimen name="suw_glif_progress_bar_margin_vertical">7dp</dimen> + <dimen name="suw_glif_fourcolor_progress_bar_padding">26dp</dimen> <!-- Edit Text dimensions --> <dimen name="suw_edit_text_min_height">56dp</dimen> |