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

Add default minimal size to WMS proto

Browse Source 
This change allows aspect ratio tests to determine
whether the minimal size restrictions are influcing
the aspect ratio requests.

Bug: 194520339
Test: builds
Change-Id: I873c567790c53e6442d0859f7fc5f9d6beb0f3fd
This commit is contained in:
jorgegil@google.com
2021-08-31 13:41:56 -07:00
parent 55290e4d16
commit 9894b25007
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.
optional bool is_home_recents_component = 6;
repeated IdentifierProto pending_activities = 7 [deprecated=true];
optional int32 default_min_size_resizable_task = 8;
}
message BarControllerProto {

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

@@ -72,6 +72,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;
@@ -1253,6 +1254,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;
@@ -1299,7 +1305,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);
}

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

@@ -6331,6 +6331,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);