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

Merge "Check only task's override config for adjusting bounds" into oc-dev

Browse Source 
am: 1ad18abedb

Change-Id: I59cc12ece55b02a30dbd9f5f6ae741632dbbbccc
This commit is contained in:
Andrii Kulian
2017-04-27 01:06:51 +00:00
committed by android-build-merger
parent 71eaea2c76 1ad18abedb
commit bbd883eb88
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/Task.java
View File

@@ -382,9 +382,7 @@ class Task extends WindowContainer<AppWindowToken> implements DimLayer.DimLayerU
* the adjusted bounds's top.
*/
void alignToAdjustedBounds(Rect adjustedBounds, Rect tempInsetBounds, boolean alignBottom) {
// Task override config might be empty, while display or stack override config isn't, so
// we have to check merged override config here.
if (!isResizeable() || Configuration.EMPTY.equals(getMergedOverrideConfiguration())) {
if (!isResizeable() || Configuration.EMPTY.equals(getOverrideConfiguration())) {
return;
}