Skip to content

Commit 3ef8dd2

Browse files
brnndnnAndroid (Google) Code Review
authored andcommitted
Merge "For 720dp devices, less motion during task-to-task transition." into jb-dev
2 parents dfaadf9 + bb2a6db commit 3ef8dd2

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

core/res/res/anim-sw720dp/task_close_enter.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
<alpha android:fromAlpha="0" android:toAlpha="1.0"
2424
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
2525
android:interpolator="@interpolator/decelerate_quad"
26-
android:startOffset="300"
26+
android:startOffset="500"
2727
android:duration="400"/>
2828

29-
<translate android:fromYDelta="-120%" android:toYDelta="0"
29+
<translate android:fromYDelta="-50%" android:toYDelta="0"
3030
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3131
android:interpolator="@interpolator/decelerate_quint"
32-
android:startOffset="300"
32+
android:startOffset="500"
3333
android:duration="400" />
3434

35-
<scale android:fromXScale=".5" android:toXScale="1.0"
36-
android:fromYScale=".5" android:toYScale="1.0"
35+
<scale android:fromXScale=".8" android:toXScale="1.0"
36+
android:fromYScale=".8" android:toYScale="1.0"
3737
android:pivotX="50%p" android:pivotY="0%p"
3838
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3939
android:interpolator="@interpolator/decelerate_quad"
40-
android:startOffset="300"
40+
android:startOffset="500"
4141
android:duration="400" />
4242
</set>

core/res/res/anim-sw720dp/task_close_exit.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
<alpha android:fromAlpha="1.0" android:toAlpha="0"
2424
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
2525
android:interpolator="@interpolator/accelerate_quad"
26-
android:duration="300"/>
26+
android:duration="350"/>
2727

28-
<translate android:fromYDelta="0" android:toYDelta="120%"
28+
<translate android:fromYDelta="0" android:toYDelta="50%"
2929
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3030
android:interpolator="@interpolator/accelerate_cubic"
31-
android:duration="300"/>
31+
android:duration="350"/>
3232

33-
<scale android:fromXScale="1.0" android:toXScale="0.5"
34-
android:fromYScale="1.0" android:toYScale="0.5"
33+
<scale android:fromXScale="1.0" android:toXScale="0.8"
34+
android:fromYScale="1.0" android:toYScale="0.8"
3535
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3636
android:pivotX="50%p" android:pivotY="100%p"
3737
android:interpolator="@interpolator/accelerate_quad"
38-
android:duration="300" />
38+
android:duration="350" />
3939

40-
<!-- This is needed to keep the animation running while task_open_enter completes -->
40+
<!-- This is needed to keep the animation running while task_close_enter completes -->
4141
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
42-
android:duration="700" />
42+
android:duration="900" />
4343
</set>

core/res/res/anim-sw720dp/task_open_enter.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
<alpha android:fromAlpha="0" android:toAlpha="1.0"
2424
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
2525
android:interpolator="@interpolator/decelerate_quad"
26-
android:startOffset="300"
26+
android:startOffset="500"
2727
android:duration="400"/>
2828

29-
<translate android:fromYDelta="120%" android:toYDelta="0"
29+
<translate android:fromYDelta="50%" android:toYDelta="0"
3030
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3131
android:interpolator="@interpolator/decelerate_quint"
32-
android:startOffset="300"
32+
android:startOffset="500"
3333
android:duration="400" />
3434

35-
<scale android:fromXScale=".5" android:toXScale="1.0"
36-
android:fromYScale=".5" android:toYScale="1.0"
35+
<scale android:fromXScale=".8" android:toXScale="1.0"
36+
android:fromYScale=".8" android:toYScale="1.0"
3737
android:pivotX="50%p" android:pivotY="100%p"
3838
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3939
android:interpolator="@interpolator/decelerate_quad"
40-
android:startOffset="300"
40+
android:startOffset="500"
4141
android:duration="400" />
4242
</set>

core/res/res/anim-sw720dp/task_open_exit.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
<alpha android:fromAlpha="1.0" android:toAlpha="0"
2424
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
2525
android:interpolator="@interpolator/accelerate_quad"
26-
android:duration="300"/>
26+
android:duration="350"/>
2727

28-
<translate android:fromYDelta="0" android:toYDelta="-120%"
28+
<translate android:fromYDelta="0" android:toYDelta="-50%"
2929
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3030
android:interpolator="@interpolator/accelerate_cubic"
31-
android:duration="300"/>
31+
android:duration="350"/>
3232

33-
<scale android:fromXScale="1.0" android:toXScale="0.5"
34-
android:fromYScale="1.0" android:toYScale="0.5"
33+
<scale android:fromXScale="1.0" android:toXScale="0.8"
34+
android:fromYScale="1.0" android:toYScale="0.8"
3535
android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
3636
android:pivotX="50%p" android:pivotY="0%p"
3737
android:interpolator="@interpolator/accelerate_quad"
38-
android:duration="300" />
38+
android:duration="350" />
3939

4040
<!-- This is needed to keep the animation running while task_open_enter completes -->
4141
<alpha android:fromAlpha="1.0" android:toAlpha="1.0"
42-
android:duration="700" />
42+
android:duration="900" />
4343
</set>

0 commit comments

Comments
 (0)