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

Commit 5f2e5212 authored by Sunny Goyal's avatar Sunny Goyal Committed by Automerger Merge Worker
Browse files

Merge "Adding missing rotationChange in RemoteAnimationTarget" into tm-qpr-dev am: ff6a8b23 

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



Change-Id: I0d54589ee834e0522531c3f75a178f72f3ab328e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90cb5db5 ff6a8b23

core/java/android/view/RemoteAnimationTarget.java

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

    public boolean willShowImeOnTarget;



    public int rotationChange;



    public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,

            Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,

            Rect localBounds, Rect screenSpaceBounds,
@@ -302,6 +304,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        backgroundColor = in.readInt();

        showBackdrop = in.readBoolean();

        willShowImeOnTarget = in.readBoolean();

        rotationChange = in.readInt();

    }



    public void setShowBackdrop(boolean shouldShowBackdrop) {
@@ -316,6 +319,14 @@ public class RemoteAnimationTarget implements Parcelable { 
        return willShowImeOnTarget;

    }



    public void setRotationChange(int rotationChange) {

        this.rotationChange = rotationChange;

    }



    public int getRotationChange() {

        return rotationChange;

    }



    @Override

    public int describeContents() {

        return 0;
@@ -345,6 +356,7 @@ public class RemoteAnimationTarget implements Parcelable { 
        dest.writeInt(backgroundColor);

        dest.writeBoolean(showBackdrop);

        dest.writeBoolean(willShowImeOnTarget);

        dest.writeInt(rotationChange);

    }



    public void dump(PrintWriter pw, String prefix) {

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

+4 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class RemoteAnimationTargetCompat { 
    public static final int ACTIVITY_TYPE_ASSISTANT = WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

    public final int activityType;



    public int taskId;

    public final int taskId;

    public final SurfaceControl leash;

    public final boolean isTranslucent;

    public final Rect clipRect;
@@ -72,7 +72,7 @@ public class RemoteAnimationTargetCompat { 
    public final Rect startScreenSpaceBounds;

    public final boolean isNotInRecents;

    public final Rect contentInsets;

    public ActivityManager.RunningTaskInfo taskInfo;

    public final ActivityManager.RunningTaskInfo taskInfo;

    public final boolean allowEnterPip;

    public final int rotationChange;

    public final int windowType;
@@ -102,7 +102,7 @@ public class RemoteAnimationTargetCompat { 
        activityType = app.windowConfiguration.getActivityType();

        taskInfo = app.taskInfo;

        allowEnterPip = app.allowEnterPip;

        rotationChange = 0;

        rotationChange = app.rotationChange;



        mStartLeash = app.startLeash;

        windowType = app.windowType;
@@ -131,6 +131,7 @@ public class RemoteAnimationTargetCompat { 
                isNotInRecents, mStartLeash, startBounds, taskInfo, allowEnterPip, windowType

        );

        target.setWillShowImeOnTarget(willShowImeOnTarget);

        target.setRotationChange(rotationChange);

        return target;

    }