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

Commit 60a7d759 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: 99da93a0 

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

Change-Id: Ifc8b9452d03723cb7739a0588b5e9697f3db9ec4
parents adcfd2f9 99da93a0

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;
@@ -8672,6 +8673,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