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

Commit d22dc839 authored by Tom Natan's avatar Tom Natan
Browse files

Revert "Add the min aspect ratio to ActivityRecordProto and popu..." 

Revert submission 1876197-propagate_min_aspect_ratio

Reason for revert: can't cherry pick framework change to this branch
Reverted Changes:
I023989da5:Use the min aspect ratio from ActivityRecordProto ...
I1736cd4a2:Add the min aspect ratio to ActivityRecordProto an...

Change-Id: I5840267bd2cf71234597da4dad09f7a7dd8e7a2c
parent 7b9c7427

core/proto/android/server/windowmanagerservice.proto

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

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