Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831f0434 authored by Shawn Lin's avatar Shawn Lin Committed by Automerger Merge Worker
Browse files

Merge "Update Home task bounds when display size changed in kids mode" into... 

Merge "Update Home task bounds when display size changed in kids mode" into tm-qpr-dev am: b8460066

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



Change-Id: I786c06293fbfaf1bb5cf1625e853d491a9dbd893
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 046afd7a b8460066

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

+6 −0
Original line number Diff line number Diff line
@@ -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 -> {