Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add default minimal size to WMS proto" into sc-v2-dev am: 94adc13f37

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

Change-Id: I9327878ef109689bf3fdea26e7d047cead7b787c
This commit is contained in:
Jorge Gil
2021-10-15 17:45:19 +00:00
committed by Automerger Merge Worker
parent 727909a718 94adc13f37
commit f7eb197e0e
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/proto/android/server/windowmanagerservice.proto
View File

@@ -69,6 +69,7 @@ message RootWindowContainerProto {
// know what activity types to check for when invoking splitscreen multi-window. // know what activity types to check for when invoking splitscreen multi-window.
optional bool is_home_recents_component = 6; optional bool is_home_recents_component = 6;
repeated IdentifierProto pending_activities = 7 [deprecated=true]; repeated IdentifierProto pending_activities = 7 [deprecated=true];
optional int32 default_min_size_resizable_task = 8;
} }
message BarControllerProto { message BarControllerProto {

8
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -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.dumpHistoryList;
import static com.android.server.wm.ActivityTaskSupervisor.printThisActivity; 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.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.IS_HOME_RECENTS_COMPONENT;
import static com.android.server.wm.RootWindowContainerProto.KEYGUARD_CONTROLLER; import static com.android.server.wm.RootWindowContainerProto.KEYGUARD_CONTROLLER;
import static com.android.server.wm.RootWindowContainerProto.WINDOW_CONTAINER; import static com.android.server.wm.RootWindowContainerProto.WINDOW_CONTAINER;
@@ -1254,6 +1255,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
pw.println(mTopFocusedDisplayId); pw.println(mTopFocusedDisplayId);
} }
void dumpDefaultMinSizeOfResizableTask(PrintWriter pw) {
pw.print(" mDefaultMinSizeOfResizeableTaskDp=");
pw.println(mDefaultMinSizeOfResizeableTaskDp);
}
void dumpLayoutNeededDisplayIds(PrintWriter pw) { void dumpLayoutNeededDisplayIds(PrintWriter pw) {
if (!isLayoutNeeded()) { if (!isLayoutNeeded()) {
return; return;
@@ -1300,7 +1306,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
mTaskSupervisor.getKeyguardController().dumpDebug(proto, KEYGUARD_CONTROLLER); mTaskSupervisor.getKeyguardController().dumpDebug(proto, KEYGUARD_CONTROLLER);
proto.write(IS_HOME_RECENTS_COMPONENT, proto.write(IS_HOME_RECENTS_COMPONENT,
mTaskSupervisor.mRecentTasks.isRecentsComponentHomeActivity(mCurrentUser)); mTaskSupervisor.mRecentTasks.isRecentsComponentHomeActivity(mCurrentUser));
proto.write(DEFAULT_MIN_SIZE_RESIZABLE_TASK, mDefaultMinSizeOfResizeableTaskDp);
proto.end(token); proto.end(token);
} }

1
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6418,6 +6418,7 @@ public class WindowManagerService extends IWindowManager.Stub
pw.print(" mGlobalConfiguration="); pw.println(mRoot.getConfiguration()); pw.print(" mGlobalConfiguration="); pw.println(mRoot.getConfiguration());
pw.print(" mHasPermanentDpad="); pw.println(mHasPermanentDpad); pw.print(" mHasPermanentDpad="); pw.println(mHasPermanentDpad);
mRoot.dumpTopFocusedDisplayId(pw); mRoot.dumpTopFocusedDisplayId(pw);
mRoot.dumpDefaultMinSizeOfResizableTask(pw);
mRoot.forAllDisplays(dc -> { mRoot.forAllDisplays(dc -> {
final int displayId = dc.getDisplayId(); final int displayId = dc.getDisplayId();
final InsetsControlTarget imeLayeringTarget = dc.getImeTarget(IME_TARGET_LAYERING); final InsetsControlTarget imeLayeringTarget = dc.getImeTarget(IME_TARGET_LAYERING);