summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2021-05-26 14:38:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-05-26 14:38:31 +0000
commitb35c0291f5bf0b8d075ddde52652784939f56b4f (patch)
tree9458a59f5767bfa889b78ae1a77a6f371826aae1
parentc97307a0ec4ea32a8ae2d9566ae07498fa41134d (diff)
parent29745f73d4167d6f25d6990a3bb5db4bb76af970 (diff)
Merge "Use opaque enter animation for freezing without rotation change" into sc-dev
-rw-r--r--services/core/java/com/android/server/wm/ScreenRotationAnimation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index 50749a961b27..9d8b8f76ad40 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -372,7 +372,7 @@ class ScreenRotationAnimation {
mRotateExitAnimation = AnimationUtils.loadAnimation(mContext,
R.anim.screen_rotate_0_exit);
mRotateEnterAnimation = AnimationUtils.loadAnimation(mContext,
- R.anim.screen_rotate_0_enter);
+ R.anim.rotation_animation_enter);
break;
case Surface.ROTATION_90:
mRotateExitAnimation = AnimationUtils.loadAnimation(mContext,