Merge "Update Home task bounds when display size changed in kids mode" into tm-qpr-dev am: b8460066a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21601859 Change-Id: I786c06293fbfaf1bb5cf1625e853d491a9dbd893 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -247,6 +247,11 @@ public class KidsModeTaskOrganizer extends ShellTaskOrganizer {
|
||||
mLaunchRootTask = taskInfo;
|
||||
}
|
||||
|
||||
if (mHomeTask != null && mHomeTask.taskId == taskInfo.taskId
|
||||
&& !taskInfo.equals(mHomeTask)) {
|
||||
mHomeTask = taskInfo;
|
||||
}
|
||||
|
||||
super.onTaskInfoChanged(taskInfo);
|
||||
}
|
||||
|
||||
@@ -364,6 +369,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 -> {
|
||||
|
||||
Reference in New Issue
Block a user