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

Commit 59f7f332 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Add the min aspect ratio to ActivityRecordProto and populate it" am: 99da93a0 am: 60a7d759 am: fd6db31d

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

Change-Id: I28b450991ca2f84ba800612c7b5dc12659a43fa7
parents 7ceb94a2 fd6db31d

core/proto/android/server/windowmanagerservice.proto

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

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

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