Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reduce the duration of rotation animation" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-05-21 05:57:02 +00:00
committed by Android (Google) Code Review
parent 9c16cc5a3e f2cd6130db
commit 2daee2ecdb
8 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/anim/screen_rotate_180_enter.xml
View File

@@ -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"

2
core/res/res/anim/screen_rotate_180_exit.xml
View File

@@ -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"

2
core/res/res/anim/screen_rotate_minus_90_enter.xml
View File

@@ -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"

2
core/res/res/anim/screen_rotate_minus_90_exit.xml
View File

@@ -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"

2
core/res/res/anim/screen_rotate_plus_90_enter.xml
View File

@@ -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"

2
core/res/res/anim/screen_rotate_plus_90_exit.xml
View File

@@ -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"

22
core/res/res/interpolator/screen_rotation.xml Normal file
View File

@@ -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"/>

8
core/res/res/values/config.xml
View File

@@ -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>