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

Merge "Vertically center SCM-eligible on warm launch" into sc-v2-dev am: cb3a43feaa

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

Change-Id: Icee0e2c49447ee85c6691bb0c5b7c089581fbd98
This commit is contained in:
Naomi Musgrave
2021-12-01 14:14:11 +00:00
committed by Automerger Merge Worker
parent 2c3c98982e cb3a43feaa
commit 1a6c8806cb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7930,9 +7930,17 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// Above coordinates are in "@" space, now place "*" and "#" to screen space.
final boolean fillContainer = resolvedBounds.equals(containingBounds);
final int screenPosX = fillContainer ? containerBounds.left : containerAppBounds.left;
final int screenPosY = mSizeCompatBounds == null
// If the activity is not in size compat mode, calculate vertical centering
// from the container and resolved bounds.
// If the activity is in size compat mode, calculate vertical centering
// from the container and size compat bounds.
// The container bounds contain the parent bounds offset in the display, for
// example when an activity is in the lower split of split screen.
final int screenPosY = (mSizeCompatBounds == null
? (containerBounds.height() - resolvedBounds.height()) / 2
: (containerBounds.height() - mSizeCompatBounds.height()) / 2;
: (containerBounds.height() - mSizeCompatBounds.height()) / 2)
+ containerBounds.top;
if (screenPosX != 0 || screenPosY != 0) {
if (mSizeCompatBounds != null) {
mSizeCompatBounds.offset(screenPosX, screenPosY);