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

Reduce screen layout in task override configuration from

Browse Source 
its parent config

This prevented scheduling unexpected screen layout size
changes to client when entering PIP.

Bug: 110808291
Test: atest ActivityManagerPinnedStackTests
Test: go/wm-smoke
Change-Id: I6ff55bedad29df2ae3d00cdd18a748c052fae750
This commit is contained in:
Louis Chang
2018-06-26 17:58:29 +08:00
parent 43dcdf898c
commit 8b58016d85
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1841,7 +1841,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
final int compatScreenHeightDp = (int) (mTmpNonDecorBounds.height() / density);
// We're only overriding LONG, SIZE and COMPAT parts of screenLayout, so we start override
// calculation with partial default.
final int sl = Configuration.SCREENLAYOUT_LONG_YES | Configuration.SCREENLAYOUT_SIZE_XLARGE;
// Reducing the screen layout starting from its parent config.
final int sl = parentConfig.screenLayout &
(Configuration.SCREENLAYOUT_LONG_MASK | Configuration.SCREENLAYOUT_SIZE_MASK);
final int longSize = Math.max(compatScreenHeightDp, compatScreenWidthDp);
final int shortSize = Math.min(compatScreenHeightDp, compatScreenWidthDp);
config.screenLayout = Configuration.reduceScreenLayout(sl, longSize, shortSize);