Add the min aspect ratio to ActivityRecordProto and populate it

This is needed for CompatChangeTests to verify that the min aspect ratio
is applied directly by checking the min aspect ratio.

Bug: 203541827
Test: N/A
Change-Id: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
Merged-In: I1736cd4a2c4a1c5857796fa9772def7b7d94ba33
This commit is contained in:
tomnatan
2021-10-19 13:16:47 +00:00
parent 305a417ea7
commit 7b9c7427b0
2 changed files with 3 additions and 0 deletions

View File

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

View File

@@ -140,6 +140,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.LAST_ALL_DRAWN;
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.NUM_DRAWN_WINDOWS;
import static com.android.server.wm.ActivityRecordProto.NUM_INTERESTING_WINDOWS;
@@ -8641,6 +8642,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
proto.write(PIP_AUTO_ENTER_ENABLED, pictureInPictureArgs.isAutoEnterEnabled());
proto.write(IN_SIZE_COMPAT_MODE, inSizeCompatMode());
proto.write(MIN_ASPECT_RATIO, info.getMinAspectRatio());
}
@Override