Merge "Convert SysUiState flags from int to long" into main (fa09b124) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.util.GroupTask;
		import com.android.quickstep.util.TISBindHelper;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

		import java.io.PrintWriter;
		import java.util.Arrays;
		@@ -379,7 +380,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
		}

		@Override
		public void updateStateForSysuiFlags(int sysuiFlags) {
		public void updateStateForSysuiFlags(@SystemUiStateFlags long sysuiFlags) {
		mTaskbarLauncherStateController.updateStateForSysuiFlags(sysuiFlags);
		}

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ import com.android.systemui.shared.rotation.FloatingRotationButton;
		import com.android.systemui.shared.rotation.RotationButton;
		import com.android.systemui.shared.rotation.RotationButtonController;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		@@ -197,7 +198,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		private TaskbarControllers mControllers;
		private boolean mIsImeRenderingNavButtons;
		private ImageView mA11yButton;
		private int mSysuiStateFlags;
		@SystemUiStateFlags
		private long mSysuiStateFlags;
		private ImageView mBackButton;
		private ImageView mHomeButton;
		private MultiValueAlpha mBackButtonAlpha;
		@@ -442,7 +444,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		navButtonController.onButtonLongClick(BUTTON_SPACE, view));
		}

		private void parseSystemUiFlags(int sysUiStateFlags) {
		private void parseSystemUiFlags(@SystemUiStateFlags long sysUiStateFlags) {
		mSysuiStateFlags = sysUiStateFlags;
		boolean isImeVisible = (sysUiStateFlags & SYSUI_STATE_IME_SHOWING) != 0;
		boolean isImeSwitcherShowing = (sysUiStateFlags & SYSUI_STATE_IME_SWITCHER_SHOWING) != 0;
		@@ -450,7 +452,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		boolean isHomeDisabled = (sysUiStateFlags & SYSUI_STATE_HOME_DISABLED) != 0;
		boolean isRecentsDisabled = (sysUiStateFlags & SYSUI_STATE_OVERVIEW_DISABLED) != 0;
		boolean isBackDisabled = (sysUiStateFlags & SYSUI_STATE_BACK_DISABLED) != 0;
		int shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED
		long shadeExpandedFlags = SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED
		\| SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
		boolean isNotificationShadeExpanded = (sysUiStateFlags & shadeExpandedFlags) != 0;
		boolean isScreenPinningActive = (sysUiStateFlags & SYSUI_STATE_SCREEN_PINNING) != 0;
		@@ -477,7 +479,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
		}
		}

		public void updateStateForSysuiFlags(int systemUiStateFlags, boolean skipAnim) {
		public void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlags,
		boolean skipAnim) {
		if (systemUiStateFlags == mSysuiStateFlags) {
		return;
		}

quickstep/src/com/android/launcher3/taskbar/StashedHandleViewController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import com.android.launcher3.util.MultiPropertyFactory;
		import com.android.launcher3.util.MultiValueAlpha;
		import com.android.quickstep.NavHandle;
		import com.android.systemui.shared.navigationbar.RegionSamplingHelper;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

		import java.io.PrintWriter;

		@@ -303,7 +304,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT
		homeDisabled ? 0 : 1);
		}

		public void updateStateForSysuiFlags(int systemUiStateFlags) {
		public void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlags) {
		mTaskbarHidden = (systemUiStateFlags & SYSUI_STATE_NAV_BAR_HIDDEN) != 0;
		updateRegionSamplingWindowVisibility();
		}

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.rotation.RotationButtonController;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;
		import com.android.systemui.unfold.updates.RotationChangeProvider;
		import com.android.systemui.unfold.util.ScopedUnfoldTransitionProgressProvider;

		@@ -825,7 +826,8 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		return mIsDestroyed;
		}

		public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {
		public void updateSysuiStateFlags(@SystemUiStateFlags long systemUiStateFlags,
		boolean fromInit) {
		mControllers.navbarButtonsViewController.updateStateForSysuiFlags(systemUiStateFlags,
		fromInit);
		boolean isShadeVisible = (systemUiStateFlags & SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE) != 0;

quickstep/src/com/android/launcher3/taskbar/TaskbarForceVisibleImmersiveController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.launcher3.anim.AnimatedFloat;
		import com.android.launcher3.compat.AccessibilityManagerCompat;
		import com.android.launcher3.util.MultiPropertyFactory;
		import com.android.launcher3.util.TouchController;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

		/**
		* Controller for taskbar when force visible in immersive mode is set.
		@@ -83,7 +84,7 @@ public class TaskbarForceVisibleImmersiveController implements TouchController {
		}

		/** Update values tracked via sysui flags. */
		public void updateSysuiFlags(int sysuiFlags) {
		public void updateSysuiFlags(@SystemUiStateFlags long sysuiFlags) {
		mIsImmersiveMode = (sysuiFlags & SYSUI_STATE_ALLOW_GESTURE_IGNORING_BAR_VISIBILITY) == 0;
		if (mContext.isNavBarForceVisible()) {
		if (mIsImmersiveMode) {