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

Commit d7cade36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Override the fillsParent() on TaskFragment" into sc-v2-dev am: d43efc90 

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

Change-Id: Ifab25254a13f688f60c3240ee43bb921de9fb0ff
parents 99d1ff6c d43efc90

services/core/java/com/android/server/wm/Task.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -3161,14 +3161,6 @@ class Task extends TaskFragment { 
                || activityType == ACTIVITY_TYPE_ASSISTANT;

                || activityType == ACTIVITY_TYPE_ASSISTANT;

    }

    }





    @Override

    boolean fillsParent() {

        // From the perspective of policy, we still want to report that this task fills parent

        // in fullscreen windowing mode even it doesn't match parent bounds because there will be

        // letterbox around its real content.

        return getWindowingMode() == WINDOWING_MODE_FULLSCREEN || matchParentBounds();

    }



    @Override

    @Override

    void forAllLeafTasks(Consumer<Task> callback, boolean traverseTopToBottom) {

    void forAllLeafTasks(Consumer<Task> callback, boolean traverseTopToBottom) {

        final int count = mChildren.size();

        final int count = mChildren.size();

services/core/java/com/android/server/wm/TaskFragment.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -2346,6 +2346,14 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        return true;

        return true;

    }

    }





    @Override

    boolean fillsParent() {

        // From the perspective of policy, we still want to report that this task fills parent

        // in fullscreen windowing mode even it doesn't match parent bounds because there will be

        // letterbox around its real content.

        return getWindowingMode() == WINDOWING_MODE_FULLSCREEN || matchParentBounds();

    }



    boolean dump(String prefix, FileDescriptor fd, PrintWriter pw, boolean dumpAll,

    boolean dump(String prefix, FileDescriptor fd, PrintWriter pw, boolean dumpAll,

            boolean dumpClient, String dumpPackage, final boolean needSep, Runnable header) {

            boolean dumpClient, String dumpPackage, final boolean needSep, Runnable header) {

        boolean printed = false;

        boolean printed = false;