Merge "Clean up the server side immersive confirmation dialog" into main (7c580912) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -134,7 +134,6 @@ import static com.android.text.flags.Flags.disableHandwritingInitiatorForIme;
		import static com.android.window.flags.Flags.enableBufferTransformHintFromDisplay;
		import static com.android.window.flags.Flags.predictiveBackSwipeEdgeNoneApi;
		import static com.android.window.flags.Flags.setScPropertiesInClient;
		import static com.android.window.flags.Flags.systemUiImmersiveConfirmationDialog;

		import android.Manifest;
		import android.accessibilityservice.AccessibilityService;
		@@ -376,16 +375,6 @@ public final class ViewRootImpl implements ViewParent,
		public static final boolean CLIENT_TRANSIENT =
		SystemProperties.getBoolean("persist.wm.debug.client_transient", false);

		/**
		* Whether the client (system UI) is handling the immersive confirmation window. If
		* {@link CLIENT_TRANSIENT} is set to true, the immersive confirmation window will always be the
		* client instance and this flag will be ignored. Otherwise, the immersive confirmation window
		* can be switched freely by this flag.
		* @hide
		*/
		public static final boolean CLIENT_IMMERSIVE_CONFIRMATION =
		systemUiImmersiveConfirmationDialog();

		/**
		* Set this system property to true to force the view hierarchy to render
		* at 60 Hz. This can be used to measure the potential framerate.

core/java/android/window/flags/windowing_frontend.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -256,14 +256,6 @@ flag {
		}
		}

		flag {
		name: "system_ui_immersive_confirmation_dialog"
		namespace: "windowing_frontend"
		description: "Enable the implementation of the immersive confirmation dialog on system UI side by default"
		bug: "359713629"
		is_fixed_read_only: true
		}

		flag {
		name: "ensure_wallpaper_in_transitions"
		namespace: "windowing_frontend"

packages/SystemUI/src/com/android/systemui/statusbar/ImmersiveModeConfirmation.java

+42 −49

Original line number	Diff line number	Diff line
		@@ -22,8 +22,6 @@ import static android.app.StatusBarManager.DISABLE_BACK;
		import static android.app.StatusBarManager.DISABLE_HOME;
		import static android.app.StatusBarManager.DISABLE_RECENT;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.ViewRootImpl.CLIENT_IMMERSIVE_CONFIRMATION;
		import static android.view.ViewRootImpl.CLIENT_TRANSIENT;
		import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
		import static android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED;
		import static android.window.DisplayAreaOrganizer.KEY_ROOT_DISPLAY_AREA_ID;
		@@ -314,7 +312,6 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca

		@Override
		public void start() {
		if (CLIENT_TRANSIENT \|\| CLIENT_IMMERSIVE_CONFIRMATION) {
		mCommandQueue.addCallback(this);

		final Resources r = mSysUiContext.getResources();
		@@ -352,7 +349,6 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca
		loadSetting(UserHandle.USER_CURRENT);
		});
		}
		}

		private final IVrStateCallbacks mVrStateCallbacks = new IVrStateCallbacks.Stub() {
		@Override
		@@ -600,9 +596,6 @@ public class ImmersiveModeConfirmation implements CoreStartable, CommandQueue.Ca

		@Override
		public void handleMessage(Message msg) {
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		return;
		}
		switch (msg.what) {
		case SHOW:
		handleShow(msg.arg1);

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

+4 −62

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import static android.view.InsetsFrameProvider.SOURCE_ARBITRARY_RECTANGLE;
		import static android.view.InsetsFrameProvider.SOURCE_CONTAINER_BOUNDS;
		import static android.view.InsetsFrameProvider.SOURCE_DISPLAY;
		import static android.view.InsetsFrameProvider.SOURCE_FRAME;
		import static android.view.ViewRootImpl.CLIENT_IMMERSIVE_CONFIRMATION;
		import static android.view.ViewRootImpl.CLIENT_TRANSIENT;
		import static android.view.WindowInsetsController.APPEARANCE_FORCE_LIGHT_NAVIGATION_BARS;
		import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
		@@ -193,7 +192,6 @@ public class DisplayPolicy {
		private final boolean mCarDockEnablesAccelerometer;
		private final boolean mDeskDockEnablesAccelerometer;
		private final AccessibilityManager mAccessibilityManager;
		private final ImmersiveModeConfirmation mImmersiveModeConfirmation;
		private final ScreenshotHelper mScreenshotHelper;

		private final Object mServiceAcquireLock = new Object();
		@@ -634,12 +632,6 @@ public class DisplayPolicy {
		};
		displayContent.mAppTransition.registerListenerLocked(mAppTransitionListener);
		displayContent.mTransitionController.registerLegacyListener(mAppTransitionListener);
		if (CLIENT_TRANSIENT \|\| CLIENT_IMMERSIVE_CONFIRMATION) {
		mImmersiveModeConfirmation = null;
		} else {
		mImmersiveModeConfirmation = new ImmersiveModeConfirmation(mContext, looper,
		mService.mVrModeEnabled, mCanSystemBarsBeShownByUser);
		}

		// TODO: Make it can take screenshot on external display
		mScreenshotHelper = displayContent.isDefaultDisplay
		@@ -2294,11 +2286,7 @@ public class DisplayPolicy {
		}
		}
		}
		if (CLIENT_IMMERSIVE_CONFIRMATION \|\| CLIENT_TRANSIENT) {
		mStatusBarManagerInternal.confirmImmersivePrompt();
		} else {
		mImmersiveModeConfirmation.confirmCurrentPrompt();
		}
		}

		boolean isKeyguardShowing() {
		@@ -2523,17 +2511,10 @@ public class DisplayPolicy {
		// The immersive confirmation window should be attached to the immersive window root.
		final RootDisplayArea root = win.getRootDisplayArea();
		final int rootDisplayAreaId = root == null ? FEATURE_UNDEFINED : root.mFeatureId;
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		mImmersiveModeConfirmation.immersiveModeChangedLw(rootDisplayAreaId,
		isImmersiveMode,
		mService.mPolicy.isUserSetupComplete(),
		isNavBarEmpty(disableFlags));
		} else {
		// TODO(b/277290737): Move this to the client side, instead of using a proxy.
		callStatusBarSafely(statusBar -> statusBar.immersiveModeChanged(getDisplayId(),
		rootDisplayAreaId, isImmersiveMode));
		}
		}

		// Show transient bars for panic if needed.
		final boolean requestHideNavBar = !win.isRequestedVisible(Type.navigationBars());
		@@ -2745,15 +2726,8 @@ public class DisplayPolicy {
		void onPowerKeyDown(boolean isScreenOn) {
		// Detect user pressing the power button in panic when an application has
		// taken over the whole screen.
		boolean panic = false;
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		panic = mImmersiveModeConfirmation.onPowerKeyDown(isScreenOn,
		SystemClock.elapsedRealtime(), isImmersiveMode(mSystemUiControllingWindow),
		isNavBarEmpty(mLastDisableFlags));
		} else {
		panic = isPowerKeyDownPanic(isScreenOn, SystemClock.elapsedRealtime(),
		boolean panic = isPowerKeyDownPanic(isScreenOn, SystemClock.elapsedRealtime(),
		isImmersiveMode(mSystemUiControllingWindow), isNavBarEmpty(mLastDisableFlags));
		}
		if (panic) {
		mHandler.post(mHiddenNavPanic);
		}
		@@ -2774,27 +2748,6 @@ public class DisplayPolicy {
		return false;
		}

		void onVrStateChangedLw(boolean enabled) {
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		mImmersiveModeConfirmation.onVrStateChangedLw(enabled);
		}
		}

		/**
		* Called when the state of lock task mode changes. This should be used to disable immersive
		* mode confirmation.
		*
		* @param lockTaskState the new lock task mode state. One of
		* {@link ActivityManager#LOCK_TASK_MODE_NONE},
		* {@link ActivityManager#LOCK_TASK_MODE_LOCKED},
		* {@link ActivityManager#LOCK_TASK_MODE_PINNED}.
		*/
		public void onLockTaskStateChangedLw(int lockTaskState) {
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		mImmersiveModeConfirmation.onLockTaskModeChangedLw(lockTaskState);
		}
		}

		/** Called when a {@link android.os.PowerManager#USER_ACTIVITY_EVENT_TOUCH} is sent. */
		public void onUserActivityEventTouch() {
		// If there is keyguard, it may use INPUT_FEATURE_DISABLE_USER_ACTIVITY (InputDispatcher
		@@ -2808,14 +2761,6 @@ public class DisplayPolicy {
		mService.mAtmService.setProcessAnimatingWhileDozing(w != null ? w.getProcess() : null);
		}

		boolean onSystemUiSettingsChanged() {
		if (CLIENT_TRANSIENT \|\| CLIENT_IMMERSIVE_CONFIRMATION) {
		return false;
		} else {
		return mImmersiveModeConfirmation.onSettingChanged(mService.mCurrentUserId);
		}
		}

		/**
		* Request a screenshot be taken.
		*
		@@ -3025,9 +2970,6 @@ public class DisplayPolicy {
		mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener);
		mHandler.post(mGestureNavigationSettingsObserver::unregister);
		mHandler.post(mForceShowNavBarSettingsObserver::unregister);
		if (!CLIENT_TRANSIENT && !CLIENT_IMMERSIVE_CONFIRMATION) {
		mImmersiveModeConfirmation.release();
		}
		if (mService.mPointerLocationEnabled) {
		setPointerLocationEnabled(false);
		}

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

deleted100644 → 0

+0 −533

File deleted.

Preview size limit exceeded, changes collapsed.