Merge "Add global actions to sysui state for handling with gesture nav" into rvc-dev am: 4b3634f78b (a77737aa) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@ public class QuickStepContract {
		// enabled (since it's used to navigate back within the bubbled app, or to collapse the bubble
		// stack.
		public static final int SYSUI_STATE_BUBBLES_EXPANDED = 1 << 14;
		// The global actions dialog is showing
		public static final int SYSUI_STATE_GLOBAL_ACTIONS_SHOWING = 1 << 15;

		@Retention(RetentionPolicy.SOURCE)
		@IntDef({SYSUI_STATE_SCREEN_PINNING,
		@@ -102,7 +104,8 @@ public class QuickStepContract {
		SYSUI_STATE_SEARCH_DISABLED,
		SYSUI_STATE_TRACING_ENABLED,
		SYSUI_STATE_ASSIST_GESTURE_CONSTRAINED,
		SYSUI_STATE_BUBBLES_EXPANDED
		SYSUI_STATE_BUBBLES_EXPANDED,
		SYSUI_STATE_GLOBAL_ACTIONS_SHOWING
		})
		public @interface SystemUiStateFlags {}

		@@ -119,6 +122,7 @@ public class QuickStepContract {
		str.add((flags & SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED) != 0
		? "keygrd_occluded" : "");
		str.add((flags & SYSUI_STATE_BOUNCER_SHOWING) != 0 ? "bouncer_visible" : "");
		str.add((flags & SYSUI_STATE_GLOBAL_ACTIONS_SHOWING) != 0 ? "global_actions" : "");
		str.add((flags & SYSUI_STATE_A11Y_BUTTON_CLICKABLE) != 0 ? "a11y_click" : "");
		str.add((flags & SYSUI_STATE_A11Y_BUTTON_LONG_CLICKABLE) != 0 ? "a11y_long_click" : "");
		str.add((flags & SYSUI_STATE_TRACING_ENABLED) != 0 ? "tracing" : "");
		@@ -192,8 +196,9 @@ public class QuickStepContract {
		* disabled.
		*/
		public static boolean isBackGestureDisabled(int sysuiStateFlags) {
		// Always allow when the bouncer is showing (even on top of the keyguard)
		if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0) {
		// Always allow when the bouncer/global actions is showing (even on top of the keyguard)
		if ((sysuiStateFlags & SYSUI_STATE_BOUNCER_SHOWING) != 0
		\|\| (sysuiStateFlags & SYSUI_STATE_GLOBAL_ACTIONS_SHOWING) != 0) {
		return false;
		}
		// Disable when in immersive, or the notifications are interactive

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import static android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;
		import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_GLOBAL_ACTIONS_SHOWING;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		@@ -124,9 +125,11 @@ import com.android.systemui.controls.management.ControlsListingController;
		import com.android.systemui.controls.ui.ControlsUiController;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.GlobalActions.GlobalActionsManager;
		import com.android.systemui.plugins.GlobalActionsPanelPlugin;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.statusbar.BlurUtils;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.phone.NotificationShadeWindowController;
		@@ -200,6 +203,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		private final UiEventLogger mUiEventLogger;
		private final NotificationShadeDepthController mDepthController;
		private final BlurUtils mBlurUtils;
		private final SysUiState mSysUiState;

		// Used for RingerModeTracker
		private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);
		@@ -301,7 +305,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		@Background Executor backgroundExecutor,
		ControlsListingController controlsListingController,
		ControlsController controlsController, UiEventLogger uiEventLogger,
		RingerModeTracker ringerModeTracker, @Main Handler handler) {
		RingerModeTracker ringerModeTracker, SysUiState sysUiState, @Main Handler handler) {
		mContext = new ContextThemeWrapper(context, com.android.systemui.R.style.qs_theme);
		mWindowManagerFuncs = windowManagerFuncs;
		mAudioManager = audioManager;
		@@ -330,6 +334,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		mBlurUtils = blurUtils;
		mRingerModeTracker = ringerModeTracker;
		mControlsController = controlsController;
		mSysUiState = sysUiState;
		mMainHandler = handler;

		// receive broadcasts
		@@ -638,7 +643,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		ActionsDialog dialog = new ActionsDialog(mContext, mAdapter, mOverflowAdapter,
		getWalletPanelViewController(), mDepthController, mSysuiColorExtractor,
		mStatusBarService, mNotificationShadeWindowController,
		shouldShowControls() ? mControlsUiController : null, mBlurUtils,
		shouldShowControls() ? mControlsUiController : null, mBlurUtils, mSysUiState,
		shouldUseControlsLayout(), this::onRotate, mKeyguardShowing);
		dialog.setCanceledOnTouchOutside(false); // Handled by the custom class.
		dialog.setOnDismissListener(this);
		@@ -1920,6 +1925,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		private final NotificationShadeWindowController mNotificationShadeWindowController;
		private final NotificationShadeDepthController mDepthController;
		private final BlurUtils mBlurUtils;
		private final SysUiState mSysUiState;
		private final boolean mUseControlsLayout;
		private ListPopupWindow mOverflowPopup;
		private final Runnable mOnRotateCallback;
		@@ -1934,7 +1940,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		SysuiColorExtractor sysuiColorExtractor, IStatusBarService statusBarService,
		NotificationShadeWindowController notificationShadeWindowController,
		ControlsUiController controlsUiController, BlurUtils blurUtils,
		boolean useControlsLayout, Runnable onRotateCallback, boolean keyguardShowing) {
		SysUiState sysuiState, boolean useControlsLayout, Runnable onRotateCallback,
		boolean keyguardShowing) {
		super(context, com.android.systemui.R.style.Theme_SystemUI_Dialog_GlobalActions);
		mContext = context;
		mAdapter = adapter;
		@@ -1945,6 +1952,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		mNotificationShadeWindowController = notificationShadeWindowController;
		mControlsUiController = controlsUiController;
		mBlurUtils = blurUtils;
		mSysUiState = sysuiState;
		mUseControlsLayout = useControlsLayout;
		mOnRotateCallback = onRotateCallback;
		mKeyguardShowing = keyguardShowing;
		@@ -2203,6 +2211,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		mShowing = true;
		mHadTopUi = mNotificationShadeWindowController.getForceHasTopUi();
		mNotificationShadeWindowController.setForceHasTopUi(true);
		mSysUiState.setFlag(SYSUI_STATE_GLOBAL_ACTIONS_SHOWING, true)
		.commitUpdate(mContext.getDisplayId());

		ViewGroup root = (ViewGroup) mGlobalActionsLayout.getRootView();
		root.setOnApplyWindowInsetsListener((v, windowInsets) -> {
		@@ -2303,6 +2313,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		if (mControlsUiController != null) mControlsUiController.hide();
		mNotificationShadeWindowController.setForceHasTopUi(mHadTopUi);
		mDepthController.updateGlobalDialogVisibility(0, null /* view */);
		mSysUiState.setFlag(SYSUI_STATE_GLOBAL_ACTIONS_SHOWING, false)
		.commitUpdate(mContext.getDisplayId());
		super.dismiss();
		}

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import com.android.systemui.colorextraction.SysuiColorExtractor;
		import com.android.systemui.controls.controller.ControlsController;
		import com.android.systemui.controls.management.ControlsListingController;
		import com.android.systemui.controls.ui.ControlsUiController;
		import com.android.systemui.model.SysUiState;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.plugins.GlobalActions;
		import com.android.systemui.statusbar.BlurUtils;
		@@ -107,6 +108,7 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
		@Mock private UiEventLogger mUiEventLogger;
		@Mock private RingerModeTracker mRingerModeTracker;
		@Mock private RingerModeLiveData mRingerModeLiveData;
		@Mock private SysUiState mSysUiState;
		@Mock private Handler mHandler;

		private TestableLooper mTestableLooper;
		@@ -150,6 +152,7 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
		mControlsController,
		mUiEventLogger,
		mRingerModeTracker,
		mSysUiState,
		mHandler
		);
		mGlobalActionsDialog.setZeroDialogPressDelayForTesting();