Merge "updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow" (62d3645d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHA
		import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;
		import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_COMPATIBLE_WINDOW;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
		import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;
		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
		@@ -1913,6 +1914,11 @@ public class WindowManagerService extends IWindowManager.Stub
		// No move or resize, but the controller checks for title changes as well
		mAccessibilityController.onSomeWindowResizedOrMovedLocked();
		}

		if ((flagChanges & PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) != 0) {
		updateNonSystemOverlayWindowsVisibilityIfNeeded(
		win, win.mWinAnimator.getShown());
		}
		}

		if (DEBUG_LAYOUT) Slog.v(TAG_WM, "Relayout " + win + ": viewVisibility=" + viewVisibility
		@@ -7397,7 +7403,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {
		if (!win.hideNonSystemOverlayWindowsWhenVisible()) {
		if (!win.hideNonSystemOverlayWindowsWhenVisible()
		&& !mHidingNonSystemOverlayWindows.contains(win)) {
		return;
		}
		final boolean systemAlertWindowsHidden = !mHidingNonSystemOverlayWindows.isEmpty();