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

Commit f555e712 authored by Tom Natan's avatar Tom Natan Committed by Automerger Merge Worker
Browse files

Merge "Add the min aspect ratio to ActivityRecordProto and populate it" into... 

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

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

Change-Id: Ic8bee737638ecbabfe6df7dbd64991511097375a
parents 61c9ccc5 aeb4f22e

core/proto/android/server/windowmanagerservice.proto

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,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 */

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

+2 −0
Original line number Diff line number Diff line
@@ -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.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;
@@ -8993,6 +8994,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