8 files changed, 32 insertions, 10 deletions
diff --git a/core/res/res/anim/screen_rotate_180_enter.xml b/core/res/res/anim/screen_rotate_180_enter.xml
index 3b6b4072dbcd..268775be9956 100644
--- a/core/res/res/anim/screen_rotate_180_enter.xml
+++ b/core/res/res/anim/screen_rotate_180_enter.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_180" />
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
         android:fillEnabled="true"
diff --git a/core/res/res/anim/screen_rotate_180_exit.xml b/core/res/res/anim/screen_rotate_180_exit.xml
index 26fb6d8df506..0adc93c93c2a 100644
--- a/core/res/res/anim/screen_rotate_180_exit.xml
+++ b/core/res/res/anim/screen_rotate_180_exit.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_180" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
         android:fillEnabled="true"
diff --git a/core/res/res/anim/screen_rotate_minus_90_enter.xml b/core/res/res/anim/screen_rotate_minus_90_enter.xml
index 87fd25ea4603..a7f19e4d488c 100644
--- a/core/res/res/anim/screen_rotate_minus_90_enter.xml
+++ b/core/res/res/anim/screen_rotate_minus_90_enter.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_90" />
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
         android:fillEnabled="true"
diff --git a/core/res/res/anim/screen_rotate_minus_90_exit.xml b/core/res/res/anim/screen_rotate_minus_90_exit.xml
index c3aee14dc235..ecaf4d5d7ca8 100644
--- a/core/res/res/anim/screen_rotate_minus_90_exit.xml
+++ b/core/res/res/anim/screen_rotate_minus_90_exit.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_90" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
         android:fillEnabled="true"
diff --git a/core/res/res/anim/screen_rotate_plus_90_enter.xml b/core/res/res/anim/screen_rotate_plus_90_enter.xml
index 8849db421e75..7e66fecf6b56 100644
--- a/core/res/res/anim/screen_rotate_plus_90_enter.xml
+++ b/core/res/res/anim/screen_rotate_plus_90_enter.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_90" />
     <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
         android:fillEnabled="true"
diff --git a/core/res/res/anim/screen_rotate_plus_90_exit.xml b/core/res/res/anim/screen_rotate_plus_90_exit.xml
index de84c3bd08fc..2998e68af7fa 100644
--- a/core/res/res/anim/screen_rotate_plus_90_exit.xml
+++ b/core/res/res/anim/screen_rotate_plus_90_exit.xml
@@ -23,7 +23,7 @@
         android:pivotX="50%" android:pivotY="50%"
         android:fillEnabled="true"
         android:fillBefore="true" android:fillAfter="true"
-        android:interpolator="@interpolator/fast_out_slow_in"
+        android:interpolator="@interpolator/screen_rotation"
         android:duration="@android:integer/config_screen_rotation_total_90" />
     <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
         android:interpolator="@interpolator/screen_rotation_alpha_out"
diff --git a/core/res/res/interpolator/screen_rotation.xml b/core/res/res/interpolator/screen_rotation.xml
new file mode 100644
index 000000000000..bf61229e5f50
--- /dev/null
+++ b/core/res/res/interpolator/screen_rotation.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:controlX1="0.2"
+    android:controlY1="0"
+    android:controlX2="0"
+    android:controlY2="1"/>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 46a1258543f7..68cb29ab042b 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -157,16 +157,16 @@
     <integer name="config_screen_rotation_fade_out">116</integer>
 
     <!-- Fade in time for screen rotation -->
-    <integer name="config_screen_rotation_fade_in">233</integer>
+    <integer name="config_screen_rotation_fade_in">200</integer>
 
     <!-- Fade in delay time for screen rotation -->
-    <integer name="config_screen_rotation_fade_in_delay">100</integer>
+    <integer name="config_screen_rotation_fade_in_delay">83</integer>
 
     <!-- Total time for 90 degree screen rotation animations -->
-    <integer name="config_screen_rotation_total_90">333</integer>
+    <integer name="config_screen_rotation_total_90">283</integer>
 
     <!-- Total time for 180 degree screen rotation animation -->
-    <integer name="config_screen_rotation_total_180">433</integer>
+    <integer name="config_screen_rotation_total_180">383</integer>
 
     <!-- Total time for the rotation background color transition -->
     <integer name="config_screen_rotation_color_transition">200</integer>