diff options
| author | 2023-03-09 03:10:53 +0000 | |
|---|---|---|
| committer | 2023-03-09 03:10:53 +0000 | |
| commit | 63e31d496a59ac63969bc0ded765e6604a33501e (patch) | |
| tree | 32c80a018dbcad20611e8bcde2a691f3a539a099 | |
| parent | eac07ee4927745585d2b4e15da1332ebb4738016 (diff) | |
| parent | 831f043463c3d4b11870e87967b3273a91e6d8b8 (diff) | |
Merge "Update Home task bounds when display size changed in kids mode" into tm-qpr-dev am: b8460066a0 am: 831f043463
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21601859
Change-Id: Id236538ef89901ed8bd5041d3af9e3c77f5ea5a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java index 9796e4c29352..2d84d211e30a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java @@ -267,6 +267,11 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { mLaunchRootTask = taskInfo; } + if (mHomeTask != null && mHomeTask.taskId == taskInfo.taskId + && !taskInfo.equals(mHomeTask)) { + mHomeTask = taskInfo; + } + super.onTaskInfoChanged(taskInfo); } @@ -376,6 +381,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer { final WindowContainerTransaction wct = getWindowContainerTransaction(); final Rect taskBounds = calculateBounds(); wct.setBounds(mLaunchRootTask.token, taskBounds); + wct.setBounds(mHomeTask.token, new Rect(0, 0, mDisplayWidth, mDisplayHeight)); mSyncQueue.queue(wct); final SurfaceControl finalLeash = mLaunchRootLeash; mSyncQueue.runInSync(t -> { |