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

Merge "Add getAdjacentTaskFragment check for the split screen case" into tm-dev am: d60f5664be

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

Change-Id: I04331012baa6a54304ecfd4f866a1b3e9291e5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-13 15:02:05 +00:00
committed by Automerger Merge Worker
parent a3591ad83a d60f5664be
commit 4ce0717dfc
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,12 +654,14 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
}
// Apps and their containers are not allowed to specify an orientation of non floating
// visible tasks created by organizer. The organizer handles the orientation instead.
// visible tasks created by organizer and that has an adjacent task.
final Task nonFloatingTopTask =
getRootTask(t -> !t.getWindowConfiguration().tasksAreFloating());
if (nonFloatingTopTask != null && nonFloatingTopTask.mCreatedByOrganizer
&& nonFloatingTopTask.isVisible()) {
return SCREEN_ORIENTATION_UNSPECIFIED;
getTask(t -> !t.getWindowConfiguration().tasksAreFloating());
if (nonFloatingTopTask != null) {
final Task task = nonFloatingTopTask.getCreatedByOrganizerTask();
if (task != null && task.getAdjacentTaskFragment() != null && task.isVisible()) {
return SCREEN_ORIENTATION_UNSPECIFIED;
}
}
final int orientation = super.getOrientation(candidate);