Skip to content

GitLab

T
tangled
Commit e23dd072 authored by Yue Zhang's avatar Yue Zhang Committed by Commit Bot
Browse files
Options

Fix a strict mode violation when initializing IPH animation 

Bug: 1016045
Change-Id: I001e8fde3058b318f81af9061f3747e10f5e39f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1870050Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: Yue Zhang <yuezhanggg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707887}
parent 58be06c7
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 125 deletions
chrome/android/features/tab_ui/java/res/anim/iph_hovered_card_animation.xml
View file @ e23dd072
...@@ -6,74 +6,70 @@ ...@@ -6,74 +6,70 @@
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="2350" android:duration="2350"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="0" /> android:valueTo="0"/>
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:interpolator="@anim/fast_out_slow_in_interpolator" android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="300" android:duration="300"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="0.7f" android:valueTo="0.7"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:interpolator="@anim/fast_out_slow_in_interpolator" android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="300" android:duration="300"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="0.7f" android:valueTo="0.7"/>
android:valueType="floatType" />
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="1000" android:duration="1000"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="0" /> android:valueTo="0"/>
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="300" android:duration="300"
android:valueFrom="0.7f" android:valueFrom="0.7"
android:valueTo="0.4f" android:valueTo="0.4"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="300" android:duration="300"
android:valueFrom="0.7f" android:valueFrom="0.7"
android:valueTo="0.4f" android:valueTo="0.4"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-55" /> android:valueTo="-55"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-60" /> android:valueTo="-60"/>
</set> </set>
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_selected_card_animation.xml
View file @ e23dd072
...@@ -6,43 +6,43 @@ ...@@ -6,43 +6,43 @@
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="1000" android:duration="1000"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="0" /> android:valueTo="0"/>
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:interpolator="@anim/fast_out_slow_in_interpolator" android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="300" android:duration="300"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="0.7f" /> android:valueTo="0.7"/>
<objectAnimator <objectAnimator
android:interpolator="@anim/fast_out_slow_in_interpolator" android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="300" android:duration="300"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="0.7f" /> android:valueTo="0.7"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
...@@ -55,41 +55,39 @@ ...@@ -55,41 +55,39 @@
android:propertyName="translateX" android:propertyName="translateX"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-230" /> android:valueTo="-230"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="70" /> android:valueTo="70"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="1050" android:duration="1050"
android:valueFrom="-230" android:valueFrom="-230"
android:valueTo="-230" /> android:valueTo="-230"/>
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="300" android:duration="300"
android:valueFrom="0.7f" android:valueFrom="0.7"
android:valueTo="0.4f" android:valueTo="0.4"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="300" android:duration="300"
android:valueFrom="0.7f" android:valueFrom="0.7"
android:valueTo="0.4f" android:valueTo="0.4"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="300" android:duration="300"
android:valueFrom="-230" android:valueFrom="-230"
android:valueTo="-245" /> android:valueTo="-245"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="300" android:duration="300"
android:valueFrom="70" android:valueFrom="70"
android:valueTo="-60" /> android:valueTo="-60"/>
</set> </set>
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_selected_card_color_change_animation.xml
View file @ e23dd072
...@@ -7,24 +7,20 @@ ...@@ -7,24 +7,20 @@
android:propertyName="fillColor" android:propertyName="fillColor"
android:duration="1000" android:duration="1000"
android:valueFrom="@color/default_icon_color_white" android:valueFrom="@color/default_icon_color_white"
android:valueTo="@color/default_icon_color_white" android:valueTo="@color/default_icon_color_white"/>
android:valueType="intType" />
<objectAnimator <objectAnimator
android:propertyName="fillColor" android:propertyName="fillColor"
android:duration="300" android:duration="300"
android:valueFrom="@color/google_blue_50" android:valueFrom="@color/google_blue_50"
android:valueTo="@color/google_blue_50" android:valueTo="@color/google_blue_50"/>
android:valueType="intType" />
<objectAnimator <objectAnimator
android:propertyName="fillColor" android:propertyName="fillColor"
android:duration="2350" android:duration="2350"
android:valueFrom="@color/google_blue_50" android:valueFrom="@color/google_blue_50"
android:valueTo="@color/google_blue_50" android:valueTo="@color/google_blue_50"/>
android:valueType="intType" />
<objectAnimator <objectAnimator
android:propertyName="fillColor" android:propertyName="fillColor"
android:duration="300" android:duration="300"
android:valueFrom="@color/default_icon_color_white" android:valueFrom="@color/default_icon_color_white"
android:valueTo="@color/default_icon_color_white" android:valueTo="@color/default_icon_color_white"/>
android:valueType="intType" />
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_touch_point_alpha_animation.xml
View file @ e23dd072
...@@ -5,26 +5,22 @@ ...@@ -5,26 +5,22 @@
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="700" android:duration="700"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="300" android:duration="300"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0.8f" android:valueTo="0.8"/>
android:valueType="floatType" />
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="2650" android:duration="2650"
android:valueFrom="0.8f" android:valueFrom="0.8"
android:valueTo="0.8f" android:valueTo="0.8"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="300" android:duration="300"
android:valueFrom="0.8f" android:valueFrom="0.8"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_touch_point_animation.xml
View file @ e23dd072
...@@ -6,63 +6,59 @@ ...@@ -6,63 +6,59 @@
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="700" android:duration="700"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"
android:valueType="floatType" /> android:valueType="floatType"/>
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="300" android:duration="300"
android:valueFrom="0.75f" android:valueFrom="0.75"
android:valueTo="1f" android:valueTo="1"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="300" android:duration="300"
android:valueFrom="0.75f" android:valueFrom="0.75"
android:valueTo="1f" android:valueTo="1"/>
android:valueType="floatType" />
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="1300" android:duration="1300"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-230" /> android:valueTo="-230"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="70" /> android:valueTo="70"/>
</set> </set>
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_touch_point_background_alpha_animation.xml
View file @ e23dd072
...@@ -4,26 +4,22 @@ ...@@ -4,26 +4,22 @@
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="900" android:duration="900"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="400" android:duration="400"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0.5f" android:valueTo="0.5"/>
android:valueType="floatType" />
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="2350" android:duration="2350"
android:valueFrom="0.5f" android:valueFrom="0.5"
android:valueTo="0.5f" android:valueTo="0.5"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="fillAlpha" android:propertyName="fillAlpha"
android:duration="300" android:duration="300"
android:valueFrom="0.5f" android:valueFrom="0.5"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
</set> </set>
chrome/android/features/tab_ui/java/res/anim/iph_touch_point_background_animation.xml
View file @ e23dd072
...@@ -6,62 +6,58 @@ ...@@ -6,62 +6,58 @@
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="0" android:duration="0"
android:valueFrom="1f" android:valueFrom="1"
android:valueTo="1f" /> android:valueTo="1"/>
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="0" android:duration="0"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" /> android:valueTo="0"/>
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="900" android:duration="900"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="scaleX" android:propertyName="scaleX"
android:duration="400" android:duration="400"
android:valueFrom="0.75f" android:valueFrom="0.75"
android:valueTo="1f" android:valueTo="1"/>
android:valueType="floatType" />
<objectAnimator <objectAnimator
android:propertyName="scaleY" android:propertyName="scaleY"
android:duration="400" android:duration="400"
android:valueFrom="0.75f" android:valueFrom="0.75"
android:valueTo="1f" android:valueTo="1"/>
android:valueType="floatType" />
</set> </set>
<!--Dummy animation to work as start offset.--> <!--Dummy animation to work as start offset.-->
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="1000" android:duration="1000"
android:valueFrom="0f" android:valueFrom="0"
android:valueTo="0f" android:valueTo="0"/>
android:valueType="floatType" />
<set android:ordering="together"> <set android:ordering="together">
<objectAnimator <objectAnimator
android:propertyName="translateX" android:propertyName="translateX"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-230" /> android:valueTo="-230"/>
<objectAnimator <objectAnimator
android:propertyName="translateY" android:propertyName="translateY"
android:duration="300" android:duration="300"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="70" /> android:valueTo="70"/>
</set> </set>
</set> </set>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment