Merge "Bring ImmersiveModeConfirmation to the new insets mode" (db488a2e) · Commits · e / os / android_frameworks_base

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

+19 −5

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ import android.graphics.Rect;
		import android.graphics.Region;
		import android.hardware.input.InputManager;
		import android.hardware.power.V1_0.PowerHint;
		import android.os.Binder;
		import android.os.Handler;
		import android.os.Looper;
		import android.os.Message;
		@@ -304,6 +303,8 @@ public class DisplayPolicy {

		private boolean mIsFreeformWindowOverlappingWithNavBar;

		private boolean mLastImmersiveMode;

		private final StatusBarController mStatusBarController;

		private final BarController mNavigationBarController;
		@@ -3182,8 +3183,8 @@ public class DisplayPolicy {
		if (nb) mNavigationBarController.showTransient();
		updateSystemUiVisibilityLw();
		}
		mImmersiveModeConfirmation.confirmCurrentPrompt();
		}
		mImmersiveModeConfirmation.confirmCurrentPrompt();
		}
		}

		@@ -3210,7 +3211,7 @@ public class DisplayPolicy {
		updateSystemUiVisibilityLw();
		}

		private int updateSystemUiVisibilityLw() {
		int updateSystemUiVisibilityLw() {
		// If there is no window focused, there will be nobody to handle the events
		// anyway, so just hang on in whatever state we're in until things settle down.
		WindowState winCandidate = mFocusedWindow != null ? mFocusedWindow
		@@ -3566,9 +3567,11 @@ public class DisplayPolicy {
		vis = mStatusBarController.updateVisibilityLw(transientStatusBarAllowed, oldVis, vis);

		// update navigation bar
		boolean oldImmersiveMode = isImmersiveMode(oldVis);
		boolean newImmersiveMode = isImmersiveMode(vis);
		boolean newInsetsMode = ViewRootImpl.sNewInsetsMode == NEW_INSETS_MODE_FULL;
		boolean oldImmersiveMode = newInsetsMode ? mLastImmersiveMode : isImmersiveMode(oldVis);
		boolean newImmersiveMode = newInsetsMode ? isImmersiveMode(win) : isImmersiveMode(vis);
		if (oldImmersiveMode != newImmersiveMode) {
		mLastImmersiveMode = newImmersiveMode;
		final String pkg = win.getOwningPackage();
		mImmersiveModeConfirmation.immersiveModeChangedLw(pkg, newImmersiveMode,
		mService.mPolicy.isUserSetupComplete(),
		@@ -3673,6 +3676,7 @@ public class DisplayPolicy {
		}
		}

		// TODO(b/118118435): Remove this after migration
		private boolean isImmersiveMode(int vis) {
		final int flags = View.SYSTEM_UI_FLAG_IMMERSIVE \| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
		return mNavigationBar != null
		@@ -3681,6 +3685,16 @@ public class DisplayPolicy {
		&& canHideNavigationBar();
		}

		private boolean isImmersiveMode(WindowState win) {
		final int behavior = win.mAttrs.insetsFlags.behavior;
		return mNavigationBar != null
		&& canHideNavigationBar()
		&& (behavior == BEHAVIOR_SHOW_BARS_BY_SWIPE
		\|\| behavior == BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE)
		&& getInsetsPolicy().isHidden(ITYPE_NAVIGATION_BAR)
		&& win != getNotificationShade();
		}

		/**
		* @return whether the navigation bar can be hidden, e.g. the device has a navigation bar
		*/

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ class InsetsStateController {
		}
		if (changed) {
		notifyInsetsChanged();
		mDisplayContent.getDisplayPolicy().updateSystemUiVisibilityLw();
		}
		}