summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-30 03:50:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-30 03:50:56 +0000
commit1029f59f9a7efc18f49aacd078970a12a40de7a0 (patch)
tree58a61f3cc4915d66409e838effb0c54595f2d423
parent61f381d081ef2915ac625ada3529b6e31eabe2f8 (diff)
parentec46cc43261c652f5c29c30dce72dc73315f63d5 (diff)
Merge "Add alpha animation for 180 rotation" into rvc-dev am: 04e81462ce am: ec46cc4326
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12033206 Change-Id: Id796c0f55d0e170629323476261ab02d9484309b
-rw-r--r--core/res/res/anim/screen_rotate_180_enter.xml6
-rw-r--r--core/res/res/anim/screen_rotate_180_exit.xml7
2 files changed, 12 insertions, 1 deletions
diff --git a/core/res/res/anim/screen_rotate_180_enter.xml b/core/res/res/anim/screen_rotate_180_enter.xml
index 889a615e07f4..3b6b4072dbcd 100644
--- a/core/res/res/anim/screen_rotate_180_enter.xml
+++ b/core/res/res/anim/screen_rotate_180_enter.xml
@@ -25,4 +25,10 @@
android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="@android:integer/config_screen_rotation_total_180" />
+ <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:fillEnabled="true"
+ android:fillBefore="true" android:fillAfter="true"
+ android:interpolator="@interpolator/screen_rotation_alpha_in"
+ android:startOffset="@android:integer/config_screen_rotation_fade_in_delay"
+ android:duration="@android:integer/config_screen_rotation_fade_in" />
</set>
diff --git a/core/res/res/anim/screen_rotate_180_exit.xml b/core/res/res/anim/screen_rotate_180_exit.xml
index 766fcfae1f91..26fb6d8df506 100644
--- a/core/res/res/anim/screen_rotate_180_exit.xml
+++ b/core/res/res/anim/screen_rotate_180_exit.xml
@@ -25,4 +25,9 @@
android:fillBefore="true" android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="@android:integer/config_screen_rotation_total_180" />
-</set> \ No newline at end of file
+ <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:fillEnabled="true"
+ android:fillBefore="true" android:fillAfter="true"
+ android:interpolator="@interpolator/screen_rotation_alpha_out"
+ android:duration="@android:integer/config_screen_rotation_fade_out" />
+</set>