summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yunfan Chen <yunfanc@google.com> 2020-10-06 14:28:31 +0900
committer Tiger Huang <tigerhuang@google.com> 2020-10-17 10:57:25 +0000
commit34dd69fd4802cfee737ca4e149c7b0813f976c47 (patch)
tree4a75f10d4b1d5fa6b63a0c9b0b4f6f46f6bfb44e
parente1833c6cfd2b75b5c21b747b126ab110db10b395 (diff)
Remove FLAG_FULLSCREEN
The flag can be safely removed because the requested visibilities are now up-to-dated. Bug: 155413635 Test: DisplayPolicyLayoutTests DisplayPolicyTests Test: manuel test the camera app Change-Id: If0ea6e45c391f14a3ae3bd420a9e65a75b1c27b1
-rw-r--r--services/core/java/com/android/server/wm/DisplayPolicy.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index b2cf856b9228..0801f68681ab 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -2071,8 +2071,7 @@ public class DisplayPolicy {
// the cutout safe zone.
if (cutoutMode != LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS) {
final boolean attachedInParent = attached != null && !layoutInScreen;
- final boolean requestedFullscreen = (fl & FLAG_FULLSCREEN) != 0
- || !win.getRequestedVisibility(ITYPE_STATUS_BAR);
+ final boolean requestedFullscreen = !win.getRequestedVisibility(ITYPE_STATUS_BAR);
final boolean requestedHideNavigation =
!win.getRequestedVisibility(ITYPE_NAVIGATION_BAR);
@@ -2374,7 +2373,7 @@ public class DisplayPolicy {
topIsFullscreen = topAppHidesStatusBar;
// The subtle difference between the window for mTopFullscreenOpaqueWindowState
// and mTopIsFullscreen is that mTopIsFullscreen is set only if the window
- // has the FLAG_FULLSCREEN set. Not sure if there is another way that to be the
+ // requests to hide the status bar. Not sure if there is another way that to be the
// case though.
if (!topIsFullscreen || mDisplayContent.getDefaultTaskDisplayArea()
.isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)) {
@@ -2418,10 +2417,7 @@ public class DisplayPolicy {
if (mTopFullscreenOpaqueWindowState == null || mForceShowSystemBars) {
return false;
}
- final LayoutParams attrs = mTopFullscreenOpaqueWindowState.getAttrs();
- final int fl = attrs.flags;
- return (fl & LayoutParams.FLAG_FULLSCREEN) != 0
- || !mTopFullscreenOpaqueWindowState.getRequestedVisibility(ITYPE_STATUS_BAR);
+ return !mTopFullscreenOpaqueWindowState.getRequestedVisibility(ITYPE_STATUS_BAR);
}
/**