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

Allow app to force orientation if dock minimized

Browse Source 
am: 409635b

* commit '409635b20bca7f13ad36ecb55c34efda5d523b1c':
  Allow app to force orientation if dock minimized

Change-Id: I80637d9b65c6efee4669ef038a7d6258fe887ac7
This commit is contained in:
Jorim Jaggi
2016-04-01 22:56:02 +00:00
committed by android-build-merger
parent ec500bfb41 409635b20b
commit 2a102dc69c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -884,6 +884,10 @@ public class TaskStack implements DimLayer.DimLayerUser,
}
}
boolean isAdjustedForMinimizedDock() {
return mMinimizeAmount != 0f;
}
private boolean adjustForIME(final WindowState imeWin) {
final int dockedSide = getDockSide();
final boolean dockedTopOrBottom = dockedSide == DOCKED_TOP || dockedSide == DOCKED_BOTTOM;

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3401,7 +3401,8 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
if (isStackVisibleLocked(DOCKED_STACK_ID)
if ((isStackVisibleLocked(DOCKED_STACK_ID)
&& !mStackIdToStack.get(DOCKED_STACK_ID).isAdjustedForMinimizedDock())
|| isStackVisibleLocked(FREEFORM_WORKSPACE_STACK_ID)) {
// We don't let app affect the system orientation when in freeform or docked mode since
// they don't occupy the entire display and their request can conflict with other apps.