Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tom Natan
2021-11-11 11:32:49 +00:00
parent 7b9c7427b0
commit d22dc839f9
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/proto/android/server/windowmanagerservice.proto
View File

@@ -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 */

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -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