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

Browse Source
This commit is contained in:
Shawn Lin
2023-03-09 01:58:27 +00:00
committed by Android (Google) Code Review
parent 78266a8570 b42ed1c2d4
commit b8460066a0
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

@@ -247,6 +247,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);
} }
@@ -364,6 +369,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 -> {