Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fb12d29 authored by An An Yu's avatar An An Yu Committed by Automerger Merge Worker
Browse files

Merge "Update ActivityEmbedding default TaskFragment animations to crossfade."... 

Merge "Update ActivityEmbedding default TaskFragment animations to crossfade." into tm-dev am: ca2a3e01

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17756833



Change-Id: Ica54f254e90fe515ce21d14f202b86379d24dda1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f595435 ca2a3e01

core/res/res/anim-ldrtl/task_fragment_close_enter.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

     android:shareInterpolator="false">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="0"

        android:duration="200" />



    <translate

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="200" />

</set>
 
 No newline at end of file

core/res/res/anim-ldrtl/task_fragment_close_exit.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

     android:shareInterpolator="false">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="35"

        android:duration="83" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="-10%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="200" />

</set>
 
 No newline at end of file

core/res/res/anim-ldrtl/task_fragment_open_enter.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

/*

** Copyright 2022, 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

     android:shareInterpolator="false">



    <alpha

        android:fromAlpha="0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="50"

        android:duration="83" />



    <translate

        android:fromXDelta="-10%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="450" />

</set>
 
 No newline at end of file

core/res/res/anim-ldrtl/task_fragment_open_exit.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!--

/*

** Copyright 2022, 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.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android"

     android:shareInterpolator="false">



    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/standard_accelerate"

        android:startOffset="0"

        android:duration="450" />



    <translate

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="450" />

</set>
 
 No newline at end of file

core/res/res/anim/task_fragment_close_enter.xml

+13 −8
Original line number Diff line number Diff line
@@ -17,16 +17,21 @@ 


<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:shareInterpolator="false">

    <scale

        android:fromXScale="1.1"

        android:toXScale="1"

        android:fromYScale="1.1"

        android:toYScale="1"

        android:pivotX="50%"

        android:pivotY="50%"

    <alpha

        android:fromAlpha="1.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="0"

        android:duration="200" />



    <translate

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:duration="400"/>

        android:startOffset="0"

        android:duration="200" />

</set>
 
 No newline at end of file