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

Commit 0b81c263 authored by An An Yu's avatar An An Yu Committed by Automerger Merge Worker
Browse files

Merge "Setup T style clear top transition animation for ActivityEmbedding."... 

Merge "Setup T style clear top transition animation for ActivityEmbedding." into tm-qpr-dev am: 37b3f064

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



Change-Id: Id6d017d790b39df793a82d2bfbe2f87dec61602f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c783e9c 37b3f064

core/java/android/view/RemoteAnimationTarget.java

+13 −0
Original line number Diff line number Diff line
@@ -222,6 +222,12 @@ public class RemoteAnimationTarget implements Parcelable { 
     */

    public boolean hasAnimatingParent;



    /**

     * Whether an activity has enabled {@link android.R.styleable#Animation_showBackdrop} for

     * transition.

     */

    public boolean showBackdrop;



    /**

     * The background color of animation in case the task info is not available if the transition

     * is activity level.
@@ -287,6 +293,11 @@ public class RemoteAnimationTarget implements Parcelable { 
        windowType = in.readInt();

        hasAnimatingParent = in.readBoolean();

        backgroundColor = in.readInt();

        showBackdrop = in.readBoolean();

    }



    public void setShowBackdrop(boolean shouldShowBackdrop) {

        showBackdrop = shouldShowBackdrop;

    }



    @Override
@@ -316,6 +327,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        dest.writeInt(windowType);

        dest.writeBoolean(hasAnimatingParent);

        dest.writeInt(backgroundColor);

        dest.writeBoolean(showBackdrop);

    }



    public void dump(PrintWriter pw, String prefix) {
@@ -337,6 +349,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        pw.print(prefix); pw.print("windowType="); pw.print(windowType);

        pw.print(prefix); pw.print("hasAnimatingParent="); pw.print(hasAnimatingParent);

        pw.print(prefix); pw.print("backgroundColor="); pw.print(backgroundColor);

        pw.print(prefix); pw.print("showBackdrop="); pw.print(showBackdrop);

    }



    public void dumpDebug(ProtoOutputStream proto, long fieldId) {

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

0 → 100644
+39 −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"

     android:showBackdrop="true">

    <alpha

        android:fromAlpha="0.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="100"

        android:duration="350" />



    <translate

        android:fromXDelta="5%"

        android:toXDelta="0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />

</set>
 
 No newline at end of file

core/res/res/anim-ldrtl/task_fragment_clear_top_close_exit.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="0.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="0"

        android:duration="100" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="-25%"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/fast_out_extra_slow_in"

        android:startOffset="0"

        android:duration="450" />

</set>
 
 No newline at end of file

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

0 → 100644
+37 −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"

     android:showBackdrop="true">

    <alpha

        android:fromAlpha="0.0"

        android:toAlpha="1.0"

        android:fillEnabled="true"

        android:fillBefore="true"

        android:fillAfter="true"

        android:interpolator="@interpolator/linear"

        android:startOffset="100"

        android:duration="350" />



    <translate

        android:fromXDelta="-5%"

        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_clear_top_open_exit.xml

0 → 100644
+36 −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/standard_accelerate"

        android:startOffset="0"

        android:duration="100" />



    <translate

        android:fromXDelta="0"

        android:toXDelta="25%"

        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