diff options
| -rw-r--r-- | core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml | 48 | ||||
| -rw-r--r-- | core/res/res/anim-ldrtl/task_close_enter.xml | 51 | ||||
| -rw-r--r-- | core/res/res/anim-ldrtl/task_close_exit.xml | 35 | ||||
| -rw-r--r-- | core/res/res/anim-ldrtl/task_open_enter.xml | 53 | ||||
| -rw-r--r-- | core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml | 53 | ||||
| -rw-r--r-- | core/res/res/anim-ldrtl/task_open_exit.xml | 35 | ||||
| -rw-r--r-- | core/res/res/anim/cross_profile_apps_thumbnail_enter.xml | 46 | ||||
| -rw-r--r-- | core/res/res/anim/task_close_enter.xml | 51 | ||||
| -rw-r--r-- | core/res/res/anim/task_close_exit.xml | 35 | ||||
| -rw-r--r-- | core/res/res/anim/task_open_enter.xml | 55 | ||||
| -rw-r--r-- | core/res/res/anim/task_open_enter_cross_profile_apps.xml | 51 | ||||
| -rw-r--r-- | core/res/res/anim/task_open_exit.xml | 35 | ||||
| -rw-r--r-- | core/res/res/color/overview_background.xml | 19 | ||||
| -rw-r--r-- | core/res/res/color/overview_background_dark.xml | 19 | ||||
| -rw-r--r-- | core/res/res/values-night/colors.xml | 2 |
15 files changed, 121 insertions, 467 deletions
diff --git a/core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml b/core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml index 5add19bba51b..941df96cb941 100644 --- a/core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml +++ b/core/res/res/anim-ldrtl/cross_profile_apps_thumbnail_enter.xml @@ -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" diff --git a/core/res/res/anim-ldrtl/task_close_enter.xml b/core/res/res/anim-ldrtl/task_close_enter.xml index e00141a8c155..1994048fa3aa 100644 --- a/core/res/res/anim-ldrtl/task_close_enter.xml +++ b/core/res/res/anim-ldrtl/task_close_enter.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/anim-ldrtl/task_close_exit.xml b/core/res/res/anim-ldrtl/task_close_exit.xml index 71a44ae7d2fc..8c0aaa817430 100644 --- a/core/res/res/anim-ldrtl/task_close_exit.xml +++ b/core/res/res/anim-ldrtl/task_close_exit.xml @@ -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 diff --git a/core/res/res/anim-ldrtl/task_open_enter.xml b/core/res/res/anim-ldrtl/task_open_enter.xml index 7815f7d661d0..fb7741c8d398 100644 --- a/core/res/res/anim-ldrtl/task_open_enter.xml +++ b/core/res/res/anim-ldrtl/task_open_enter.xml @@ -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>
\ No newline at end of file + android:interpolator="@interpolator/fast_out_extra_slow_in" + android:startOffset="0" + android:duration="500"/> +</set> diff --git a/core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml b/core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml index 5fccd6df14a5..69631f6525e3 100644 --- a/core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml +++ b/core/res/res/anim-ldrtl/task_open_enter_cross_profile_apps.xml @@ -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>
\ No newline at end of file +</set> diff --git a/core/res/res/anim-ldrtl/task_open_exit.xml b/core/res/res/anim-ldrtl/task_open_exit.xml index 025e1bdc05c9..f455334ced78 100644 --- a/core/res/res/anim-ldrtl/task_open_exit.xml +++ b/core/res/res/anim-ldrtl/task_open_exit.xml @@ -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 diff --git a/core/res/res/anim/cross_profile_apps_thumbnail_enter.xml b/core/res/res/anim/cross_profile_apps_thumbnail_enter.xml index 2cfeecf4685d..a495aa1b47ab 100644 --- a/core/res/res/anim/cross_profile_apps_thumbnail_enter.xml +++ b/core/res/res/anim/cross_profile_apps_thumbnail_enter.xml @@ -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" diff --git a/core/res/res/anim/task_close_enter.xml b/core/res/res/anim/task_close_enter.xml index 487ff5c748d3..ec6e03b84e04 100644 --- a/core/res/res/anim/task_close_enter.xml +++ b/core/res/res/anim/task_close_enter.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/anim/task_close_exit.xml b/core/res/res/anim/task_close_exit.xml index afc3256cb617..4b1e89ca0e3a 100644 --- a/core/res/res/anim/task_close_exit.xml +++ b/core/res/res/anim/task_close_exit.xml @@ -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 diff --git a/core/res/res/anim/task_open_enter.xml b/core/res/res/anim/task_open_enter.xml index 0aafc1c0b91c..d5384463ffff 100644 --- a/core/res/res/anim/task_open_enter.xml +++ b/core/res/res/anim/task_open_enter.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/anim/task_open_enter_cross_profile_apps.xml b/core/res/res/anim/task_open_enter_cross_profile_apps.xml index 702f7ba162aa..dc316ff20f94 100644 --- a/core/res/res/anim/task_open_enter_cross_profile_apps.xml +++ b/core/res/res/anim/task_open_enter_cross_profile_apps.xml @@ -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 --> diff --git a/core/res/res/anim/task_open_exit.xml b/core/res/res/anim/task_open_exit.xml index 691317d2e6e0..f8ab65517d5a 100644 --- a/core/res/res/anim/task_open_exit.xml +++ b/core/res/res/anim/task_open_exit.xml @@ -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 diff --git a/core/res/res/color/overview_background.xml b/core/res/res/color/overview_background.xml new file mode 100644 index 000000000000..45c6c256d67a --- /dev/null +++ b/core/res/res/color/overview_background.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/color/overview_background_dark.xml b/core/res/res/color/overview_background_dark.xml new file mode 100644 index 000000000000..84f4fdff4e1a --- /dev/null +++ b/core/res/res/color/overview_background_dark.xml @@ -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>
\ No newline at end of file diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml index 2e4578c39430..783fabe20a6d 100644 --- a/core/res/res/values-night/colors.xml +++ b/core/res/res/values-night/colors.xml @@ -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> |