summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2020-04-03 11:29:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-04-03 11:29:05 +0000
commit25e19732fc31f809b39019439c124518bbdf72df (patch)
tree62418b67b88125f7bb943f8bc73009e895062882
parentdf544045877678bd5307c1e875bdfcb677ca5924 (diff)
parent40bf15c65186df84fd5184c87b2049056954d4be (diff)
Merge "Use correct bounds when calculating systemui visibility" into rvc-dev
-rw-r--r--services/core/java/com/android/server/policy/WindowManagerPolicy.java6
-rw-r--r--services/core/java/com/android/server/wm/DisplayPolicy.java11
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java1
3 files changed, 8 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/policy/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
index 7eb3f01798c5..d89605a9ddbd 100644
--- a/services/core/java/com/android/server/policy/WindowManagerPolicy.java
+++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java
@@ -542,12 +542,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
void unregisterPointerEventListener(PointerEventListener listener, int displayId);
/**
- * Retrieves the {@param outBounds} from the stack matching the {@param windowingMode} and
- * {@param activityType}.
- */
- void getStackBounds(int windowingMode, int activityType, Rect outBounds);
-
- /**
* @return The currently active input method window.
*/
WindowState getInputMethodWindowLw();
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 367151cf0f79..221258e94cb2 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3246,9 +3246,14 @@ public class DisplayPolicy {
mTopFullscreenOpaqueWindowState, mTopFullscreenOpaqueOrDimmingWindowState);
final int dockedAppearance = updateLightStatusBarAppearanceLw(0 /* vis */,
mTopDockedOpaqueWindowState, mTopDockedOpaqueOrDimmingWindowState);
- mService.getStackBounds(
- WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, mDockedStackBounds);
- final boolean inSplitScreen = !mDockedStackBounds.isEmpty();
+ final boolean inSplitScreen =
+ mService.mRoot.getDefaultDisplay().mTaskContainers.isSplitScreenModeActivated();
+ if (inSplitScreen) {
+ mService.getStackBounds(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD,
+ mDockedStackBounds);
+ } else {
+ mDockedStackBounds.setEmpty();
+ }
mService.getStackBounds(inSplitScreen ? WINDOWING_MODE_SPLIT_SCREEN_SECONDARY
: WINDOWING_MODE_FULLSCREEN,
ACTIVITY_TYPE_UNDEFINED, mNonDockedStackBounds);
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index ae668f19b162..dfaa0ec47155 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2780,7 +2780,6 @@ public class WindowManagerService extends IWindowManager.Stub
aspectRatio);
}
- @Override
public void getStackBounds(int windowingMode, int activityType, Rect bounds) {
synchronized (mGlobalLock) {
final ActivityStack stack = mRoot.getStack(windowingMode, activityType);