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

Merge "Add the min aspect ratio to ActivityRecordProto and populate it" into sc-v2-dev am: aeb4f22e3b

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

Change-Id: Ic8bee737638ecbabfe6df7dbd64991511097375a
This commit is contained in:
Tom Natan
2021-10-21 16:15:53 +00:00
committed by Automerger Merge Worker
parent 61c9ccc55c aeb4f22e3b
commit f555e71209
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,6 +364,7 @@ message ActivityRecordProto {
optional bool translucent = 30; optional bool translucent = 30;
optional bool pip_auto_enter_enabled = 31; optional bool pip_auto_enter_enabled = 31;
optional bool in_size_compat_mode = 32; optional bool in_size_compat_mode = 32;
optional float min_aspect_ratio = 33;
} }
/* represents WindowToken */ /* represents WindowToken */

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -154,6 +154,7 @@ import static com.android.server.wm.ActivityRecordProto.IS_ANIMATING;
import static com.android.server.wm.ActivityRecordProto.IS_WAITING_FOR_TRANSITION_START; import static com.android.server.wm.ActivityRecordProto.IS_WAITING_FOR_TRANSITION_START;
import static com.android.server.wm.ActivityRecordProto.LAST_ALL_DRAWN; import static com.android.server.wm.ActivityRecordProto.LAST_ALL_DRAWN;
import static com.android.server.wm.ActivityRecordProto.LAST_SURFACE_SHOWING; import static com.android.server.wm.ActivityRecordProto.LAST_SURFACE_SHOWING;
import static com.android.server.wm.ActivityRecordProto.MIN_ASPECT_RATIO;
import static com.android.server.wm.ActivityRecordProto.NAME; import static com.android.server.wm.ActivityRecordProto.NAME;
import static com.android.server.wm.ActivityRecordProto.NUM_DRAWN_WINDOWS; import static com.android.server.wm.ActivityRecordProto.NUM_DRAWN_WINDOWS;
import static com.android.server.wm.ActivityRecordProto.NUM_INTERESTING_WINDOWS; import static com.android.server.wm.ActivityRecordProto.NUM_INTERESTING_WINDOWS;
@@ -8993,6 +8994,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
} }
proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled()); proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled());
proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode()); proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());
proto.write(MIN_ASPECT_RATIO, info.getMinAspectRatio());
} }
@Override @Override