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

Merge "Update Home task bounds when display size changed in kids mode" into tm-qpr-dev am: b8460066a0 am: 831f043463 am: 63e31d496a

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

Change-Id: Iff2cf8c36c6ef259b489485a794f70b2f5af73a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shawn Lin
2023-03-09 03:44:40 +00:00
committed by Automerger Merge Worker
parent efb37a6867 63e31d496a
commit 1b1e052e87
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/kidsmode/KidsModeTaskOrganizer.java
View File

@@ -267,6 +267,11 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
mLaunchRootTask = taskInfo; mLaunchRootTask = taskInfo;
} }
if (mHomeTask != null && mHomeTask.taskId == taskInfo.taskId
&& !taskInfo.equals(mHomeTask)) {
mHomeTask = taskInfo;
}
super.onTaskInfoChanged(taskInfo); super.onTaskInfoChanged(taskInfo);
} }
@@ -376,6 +381,7 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
final WindowContainerTransaction wct = getWindowContainerTransaction(); final WindowContainerTransaction wct = getWindowContainerTransaction();
final Rect taskBounds = calculateBounds(); final Rect taskBounds = calculateBounds();
wct.setBounds(mLaunchRootTask.token, taskBounds); wct.setBounds(mLaunchRootTask.token, taskBounds);
wct.setBounds(mHomeTask.token, new Rect(0, 0, mDisplayWidth, mDisplayHeight));
mSyncQueue.queue(wct); mSyncQueue.queue(wct);
final SurfaceControl finalLeash = mLaunchRootLeash; final SurfaceControl finalLeash = mLaunchRootLeash;
mSyncQueue.runInSync(t -> { mSyncQueue.runInSync(t -> {