PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Revert "Update fourcolor progress bar"" into pi-dev

Browse source
This commit is contained in:
Maurice Lam 2018-03-23 21:12:59 +00:00 committed by Android (Google) Code Review
parent 3514ad526a fe2343b05e
commit 95d8b7ea74
4 changed files with 27 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/gingerbread/res/values/styles.xml
View file

@ -277,7 +277,6 @@
<style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" /> <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.ProgressBar.Large" />
<style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> <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:layout_gravity">center</item>
<item name="android:indeterminate">true</item> <item name="android:indeterminate">true</item>
</style> </style>

61
library/main/res/drawable-v21/suw_fourcolor_progress_bar.xml
View file

@ -26,44 +26,37 @@
<aapt:attr name="android:drawable"> <aapt:attr name="android:drawable">
<vector android:width="823dp" android:height="823dp" android:viewportHeight="823" <vector android:width="823dp" android:height="823dp" android:viewportHeight="823"
android:viewportWidth="823"> android:viewportWidth="823">
<group android:name="red" android:translateX="411.5" android:translateY="411.5"> <group android:name="blue1" android:translateX="411.5" android:translateY="411.5">
<path android:name="red_path" <path android:name="blue1_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: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="#ea4335" android:strokeAlpha="1" android:strokeColor="#4688f1"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeLineCap="round" android:strokeLineJoin="round"
android:strokeWidth="27" /> android:strokeWidth="27" />
</group> </group>
<group android:name="yellow" android:translateX="411.5" android:translateY="411.5"> <group android:name="blue2" android:translateX="411.5" android:translateY="411.5">
<path android:name="yellow_path" <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: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:strokeAlpha="1" android:strokeColor="#7dacf4"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeLineCap="round" android:strokeLineJoin="round"
android:strokeWidth="28" /> android:strokeWidth="28" />
</group> </group>
<group android:name="green" android:translateX="411.5" android:translateY="411.5"> <group android:name="blue3" android:translateX="411.5" android:translateY="411.5">
<path android:name="green_path" <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: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:strokeAlpha="1" android:strokeColor="#c7dbfb"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeLineCap="round" android:strokeLineJoin="round"
android:strokeWidth="29" /> android:strokeWidth="29" />
</group> </group>
<group android:name="blue" android:translateX="411.5" android:translateY="411.5"> <group android:name="blue4" android:translateX="411.5" android:translateY="411.5">
<path android:name="blue_path" <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: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:strokeAlpha="1" android:strokeColor="#e8f0fd"
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:strokeLineCap="round" android:strokeLineJoin="round"
android:strokeWidth="30" /> android:strokeWidth="30" />
</group> </group>
</vector> </vector>
</aapt:attr> </aapt:attr>
<target android:name="red_path"> <target android:name="blue1_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathStart" <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -74,7 +67,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="red_path"> <target android:name="blue1_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathEnd" <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -85,7 +78,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="red"> <target android:name="blue1">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="rotation" <objectAnimator android:duration="1983" android:propertyName="rotation"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@ -96,7 +89,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="yellow_path"> <target android:name="blue2_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathStart" <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -107,7 +100,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="yellow_path"> <target android:name="blue2_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathEnd" <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -118,7 +111,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="yellow"> <target android:name="blue2">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="rotation" <objectAnimator android:duration="1983" android:propertyName="rotation"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"
@ -129,7 +122,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="green_path"> <target android:name="blue3_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathStart" <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -140,7 +133,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="green_path"> <target android:name="blue3_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathEnd" <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -151,7 +144,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="green"> <target android:name="blue3">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator android:duration="1983" android:propertyName="rotation" <objectAnimator android:duration="1983" android:propertyName="rotation"
@ -165,7 +158,7 @@
</set> </set>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="blue_path"> <target android:name="blue4_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathStart" <objectAnimator android:duration="1983" android:propertyName="trimPathStart"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -176,7 +169,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="blue_path"> <target android:name="blue4_path">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="trimPathEnd" <objectAnimator android:duration="1983" android:propertyName="trimPathEnd"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="1"
@ -187,7 +180,7 @@
</objectAnimator> </objectAnimator>
</aapt:attr> </aapt:attr>
</target> </target>
<target android:name="blue"> <target android:name="blue4">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<objectAnimator android:duration="1983" android:propertyName="rotation" <objectAnimator android:duration="1983" android:propertyName="rotation"
android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355" android:repeatCount="infinite" android:valueFrom="0" android:valueTo="355"

1
library/main/res/values-v21/styles.xml
View file

@ -45,7 +45,6 @@
<style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" /> <style name="SuwBase.ProgressBarLarge" parent="@android:style/Widget.Material.ProgressBar.Large" />
<style name="SuwFourColorIndeterminateProgressBar" parent="SuwBase.ProgressBarLarge"> <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:layout_gravity">center</item>
<item name="android:indeterminate">true</item> <item name="android:indeterminate">true</item>
<item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item> <item name="android:indeterminateDrawable">@drawable/suw_fourcolor_progress_bar</item>

1
library/main/res/values/dimens.xml
View file

@ -139,7 +139,6 @@
<!-- The margin to compensate for the padding built-in to the widget itself --> <!-- 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_progress_bar_margin_vertical">-7dp</dimen>
<dimen name="suw_glif_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 --> <!-- Edit Text dimensions -->
<dimen name="suw_edit_text_min_height">56dp</dimen> <dimen name="suw_edit_text_min_height">56dp</dimen>