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

Update task transition animations

Browse Source 
Following designs from go/android-new-task-motion

Test: atest FlickerTests:TaskTransitionTest
Bug: 199507257
Change-Id: I037517d930e3425dc22ebab6f5df1968ebba5483
Merged-In: I037517d930e3425dc22ebab6f5df1968ebba5483
This commit is contained in:
Pablo Gamito
2021-09-15 18:43:51 +00:00
parent 43057f8d5c
commit b701576aa9
15 changed files with 121 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml
View File

@@ -18,19 +18,10 @@
-->
<!-- This should be kept in sync with task_open_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:hasRoundedCorners="true"
android:shareInterpolator="false"
android:zAdjustment="top">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="-105%"
@@ -38,36 +29,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- To keep the thumbnail around longer and fade out the thumbnail -->
<alpha android:fromAlpha="1.0" android:toAlpha="0"

51
core/res/res/anim-ldrtl/task_close_enter.xml
View File

@@ -14,20 +14,10 @@
~ limitations under the License
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="105%"
@@ -35,34 +25,7 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
</set>

35
core/res/res/anim-ldrtl/task_close_exit.xml
View File

@@ -15,19 +15,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1.0"
android:toAlpha="1"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="283"/>
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="0"
@@ -35,22 +25,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0"
android:toXScale="0.95"
android:fromYScale="1.0"
android:toYScale="0.95"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:pivotX="50%"
android:pivotY="50%"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha

53
core/res/res/anim-ldrtl/task_open_enter.xml
View File

@@ -16,20 +16,10 @@
<!-- This should in sync with task_open_enter_cross_profile_apps.xml -->
<!-- This should in sync with cross_profile_apps_thumbnail_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="-105%"
@@ -37,34 +27,7 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
</set>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
</set>

53
core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml
View File

@@ -16,20 +16,10 @@
-->
<!-- This should in sync with task_open_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="-105%"
@@ -37,36 +27,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- To keep the transition around longer for the thumbnail, should be kept in sync with
cross_profile_apps_thumbmail.xml -->
@@ -75,4 +38,4 @@
android:toAlpha="1.0"
android:startOffset="717"
android:duration="200"/>
</set>
</set>

35
core/res/res/anim-ldrtl/task_open_exit.xml
View File

@@ -15,19 +15,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1.0"
android:toAlpha="1"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="283"/>
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="0"
@@ -35,22 +25,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0"
android:toXScale="0.95"
android:fromYScale="1.0"
android:toYScale="0.95"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:pivotX="50%"
android:pivotY="50%"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha

46
core/res/res/anim/cross_profile_apps_thumbnail_enter.xml
View File

@@ -19,18 +19,9 @@
<!-- This should be kept in sync with task_open_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:zAdjustment="top">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:background="@color/overview_background">
<translate
android:fromXDelta="105%"
@@ -38,36 +29,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- To keep the thumbnail around longer and fade out the thumbnail -->
<alpha android:fromAlpha="1.0" android:toAlpha="0"

51
core/res/res/anim/task_close_enter.xml
View File

@@ -16,20 +16,10 @@
*/
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="-105%"
@@ -37,34 +27,7 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
</set>

35
core/res/res/anim/task_close_exit.xml
View File

@@ -17,19 +17,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1.0"
android:toAlpha="1"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="283"/>
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="0"
@@ -37,22 +27,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0"
android:toXScale="0.95"
android:fromYScale="1.0"
android:toYScale="0.95"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:pivotX="50%"
android:pivotY="50%"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha

55
core/res/res/anim/task_open_enter.xml
View File

@@ -15,23 +15,13 @@
** limitations under the License.
*/
-->
<!-- This should in sync with task_open_enter_cross_profile_apps.xml -->
<!-- This should in sync with cross_profile_apps_thumbnail_enter.xml -->
<!-- This should be kept in sync with task_open_enter_cross_profile_apps.xml -->
<!-- This should be kept in sync with cross_profile_apps_thumbnail_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="105%"
@@ -39,34 +29,7 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
</set>

51
core/res/res/anim/task_open_enter_cross_profile_apps.xml
View File

@@ -18,20 +18,10 @@
-->
<!-- This should in sync with task_open_enter.xml -->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1"
android:toAlpha="1.0"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="217"/>
android:shareInterpolator="false"
android:zAdjustment="top"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="105%"
@@ -39,36 +29,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0526"
android:toXScale="1"
android:fromYScale="1.0526"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
<scale
android:fromXScale="0.95"
android:toXScale="1"
android:fromYScale="0.95"
android:toYScale="1"
android:pivotX="50%"
android:pivotY="50%"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/fast_out_slow_in"
android:startOffset="283"
android:duration="317"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- To keep the transition around longer for the thumbnail, should be kept in sync with
cross_profile_apps_thumbmail.xml -->

35
core/res/res/anim/task_open_exit.xml
View File

@@ -17,19 +17,9 @@
-->
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:showWallpaper="true">
<alpha
android:fromAlpha="1.0"
android:toAlpha="1"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/linear"
android:startOffset="67"
android:duration="283"/>
android:shareInterpolator="false"
android:hasRoundedCorners="true"
android:background="@color/overview_background">
<translate
android:fromXDelta="0"
@@ -37,22 +27,9 @@
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:interpolator="@interpolator/aggressive_ease"
android:startOffset="50"
android:duration="383"/>
<scale
android:fromXScale="1.0"
android:toXScale="0.95"
android:fromYScale="1.0"
android:toYScale="0.95"
android:fillEnabled="true"
android:fillBefore="true"
android:fillAfter="true"
android:pivotX="50%"
android:pivotY="50%"
android:interpolator="@interpolator/fast_out_slow_in"
android:duration="283"/>
android:interpolator="@interpolator/fast_out_extra_slow_in"
android:startOffset="0"
android:duration="500"/>
<!-- This is needed to keep the animation running while task_open_enter completes -->
<alpha

19
core/res/res/color/overview_background.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_500" android:lStar="87" />
</selector>

19
core/res/res/color/overview_background_dark.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/system_neutral2_500" android:lStar="35" />
</selector>

2
core/res/res/values-night/colors.xml
View File

@@ -33,4 +33,6 @@
<color name="call_notification_answer_color">#5DBA80</color>
<color name="personal_apps_suspension_notification_color">#8AB4F8</color>
<color name="overview_background">@color/overview_background_dark</color>
</resources>