Commit 9938c8d4 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Unity][Android] Add interpolators to sign-in header animation

This CL adds fast_out_slow_in_interpolator.xml and specifies it as
interpolator for objectAnimators in signin_header_animation.xml.
fast_out_slow_in interpolator from Android resources can't be used here
as it was added in API level 21.

Bug: 814728
Change-Id: If3a7fc8835628f2c0d373b0e0765531dafa8a993
Reviewed-on: https://chromium-review.googlesource.com/1047670Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557028}
parent 608546ee
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2018 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:controlX1="0.4"
android:controlY1="0"
android:controlX2="0.2"
android:controlY2="1"
tools:targetApi="21"/>
...@@ -135,17 +135,18 @@ ...@@ -135,17 +135,18 @@
</vector> </vector>
</aapt:attr> </aapt:attr>
<!-- Each animation here has a period of 10.45 seconds. Animation is restarted from the code. --> <!-- Each animation here has a period of 10.45 seconds. Animation is restarted from the code. -->
<!-- Light grey circle -->
<target android:name="cloud1_animation_group"> <target android:name="cloud1_animation_group">
<aapt:attr name="android:animation"> <aapt:attr name="android:animation">
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="3900" android:duration="3900"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-3.24"/> android:valueTo="-3.24"/>
<objectAnimator <objectAnimator
android:duration="6550" android:duration="6550"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="-3.24" android:valueFrom="-3.24"
android:valueTo="0"/> android:valueTo="0"/>
...@@ -157,11 +158,13 @@ ...@@ -157,11 +158,13 @@
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="4650" android:duration="4650"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-2.16"/> android:valueTo="-2.16"/>
<objectAnimator <objectAnimator
android:duration="5800" android:duration="5800"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="-2.16" android:valueFrom="-2.16"
android:valueTo="0"/> android:valueTo="0"/>
...@@ -173,11 +176,13 @@ ...@@ -173,11 +176,13 @@
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="6150" android:duration="6150"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-5.04"/> android:valueTo="-5.04"/>
<objectAnimator <objectAnimator
android:duration="4300" android:duration="4300"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="-5.04" android:valueFrom="-5.04"
android:valueTo="0"/> android:valueTo="0"/>
...@@ -189,11 +194,13 @@ ...@@ -189,11 +194,13 @@
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="5550" android:duration="5550"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="5.04"/> android:valueTo="5.04"/>
<objectAnimator <objectAnimator
android:duration="4900" android:duration="4900"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="translateX" android:propertyName="translateX"
android:valueFrom="5.04" android:valueFrom="5.04"
android:valueTo="0"/> android:valueTo="0"/>
...@@ -205,23 +212,27 @@ ...@@ -205,23 +212,27 @@
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-360"/> android:valueTo="-360"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:startOffset="1900" android:startOffset="1900"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-360"/> android:valueTo="-360"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:startOffset="1900" android:startOffset="1900"
android:valueFrom="0" android:valueFrom="0"
android:valueTo="-360"/> android:valueTo="-360"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:startOffset="1900" android:startOffset="1900"
android:valueFrom="0" android:valueFrom="0"
...@@ -234,6 +245,7 @@ ...@@ -234,6 +245,7 @@
<set android:ordering="sequentially"> <set android:ordering="sequentially">
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:valueFrom="-120" android:valueFrom="-120"
android:valueTo="120"/> android:valueTo="120"/>
...@@ -244,6 +256,7 @@ ...@@ -244,6 +256,7 @@
android:valueTo="120"/> android:valueTo="120"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:valueFrom="120" android:valueFrom="120"
android:valueTo="-120"/> android:valueTo="-120"/>
...@@ -254,6 +267,7 @@ ...@@ -254,6 +267,7 @@
android:valueTo="-120"/> android:valueTo="-120"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:valueFrom="-120" android:valueFrom="-120"
android:valueTo="120"/> android:valueTo="120"/>
...@@ -264,6 +278,7 @@ ...@@ -264,6 +278,7 @@
android:valueTo="120"/> android:valueTo="120"/>
<objectAnimator <objectAnimator
android:duration="700" android:duration="700"
android:interpolator="@anim/fast_out_slow_in_interpolator"
android:propertyName="rotation" android:propertyName="rotation"
android:valueFrom="120" android:valueFrom="120"
android:valueTo="-120"/> android:valueTo="-120"/>
......
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