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

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

Browse Source
This commit is contained in:
Sunny Goyal
2022-10-18 16:32:28 +00:00
committed by Android (Google) Code Review
parent 668aee06a1 b8761ced34
commit ff6a8b23df
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/RemoteAnimationTarget.java
View File

@@ -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) {

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

@@ -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;
}