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

Commit 94adc13f authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Add default minimal size to WMS proto" into sc-v2-dev

parents 05dde516 9894b250

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ message RootWindowContainerProto { 
    // know what activity types to check for when invoking splitscreen multi-window.

    optional bool is_home_recents_component = 6;

    repeated IdentifierProto pending_activities = 7 [deprecated=true];

    optional int32 default_min_size_resizable_task = 8;

}



message BarControllerProto {

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

+7 −1
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ import static com.android.server.wm.ActivityTaskSupervisor.PRESERVE_WINDOWS; 
import static com.android.server.wm.ActivityTaskSupervisor.dumpHistoryList;

import static com.android.server.wm.ActivityTaskSupervisor.printThisActivity;

import static com.android.server.wm.KeyguardController.KEYGUARD_SLEEP_TOKEN_TAG;

import static com.android.server.wm.RootWindowContainerProto.DEFAULT_MIN_SIZE_RESIZABLE_TASK;

import static com.android.server.wm.RootWindowContainerProto.IS_HOME_RECENTS_COMPONENT;

import static com.android.server.wm.RootWindowContainerProto.KEYGUARD_CONTROLLER;

import static com.android.server.wm.RootWindowContainerProto.WINDOW_CONTAINER;
@@ -1254,6 +1255,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        pw.println(mTopFocusedDisplayId);

    }



    void dumpDefaultMinSizeOfResizableTask(PrintWriter pw) {

        pw.print("  mDefaultMinSizeOfResizeableTaskDp=");

        pw.println(mDefaultMinSizeOfResizeableTaskDp);

    }



    void dumpLayoutNeededDisplayIds(PrintWriter pw) {

        if (!isLayoutNeeded()) {

            return;
@@ -1300,7 +1306,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        mTaskSupervisor.getKeyguardController().dumpDebug(proto, KEYGUARD_CONTROLLER);

        proto.write(IS_HOME_RECENTS_COMPONENT,

                mTaskSupervisor.mRecentTasks.isRecentsComponentHomeActivity(mCurrentUser));



        proto.write(DEFAULT_MIN_SIZE_RESIZABLE_TASK, mDefaultMinSizeOfResizeableTaskDp);

        proto.end(token);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -6418,6 +6418,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        pw.print("  mGlobalConfiguration="); pw.println(mRoot.getConfiguration());

        pw.print("  mHasPermanentDpad="); pw.println(mHasPermanentDpad);

        mRoot.dumpTopFocusedDisplayId(pw);

        mRoot.dumpDefaultMinSizeOfResizableTask(pw);

        mRoot.forAllDisplays(dc -> {

            final int displayId = dc.getDisplayId();

            final InsetsControlTarget imeLayeringTarget = dc.getImeTarget(IME_TARGET_LAYERING);