Snap for 11954976 from a8f0155c892a7a3f3b044fcf99e9616e7b362fe3 to 24Q3-release (8e06ff56) · Commits · e / os / BlissLauncher3

aconfig/launcher.aconfig

+18 −0

Original line number	Diff line number	Diff line
		@@ -284,3 +284,21 @@ flag {
		description: "Enables folders in all apps"
		bug: "341582436"
		}

		flag {
		name: "enable_recents_in_taskbar"
		namespace: "launcher"
		description: "Replace hybrid hotseat app predictions with strictly Recent Apps"
		bug: "315354060"
		}

		flag {
		name: "enable_first_screen_broadcast_archiving_extras"
		namespace: "launcher"
		description: "adds Extras to first screen broadcast for archived apps"
		bug: "322314760"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

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

+3 −13

Original line number	Diff line number	Diff line
		@@ -41,8 +41,6 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
		import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING;
		import static com.android.window.flags.Flags.enableDesktopWindowingMode;
		import static com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps;
		import static com.android.wm.shell.Flags.enableTinyTaskbar;

		import android.animation.AnimatorSet;
		@@ -304,7 +302,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		new VoiceInteractionWindowController(this),
		new TaskbarTranslationController(this),
		new TaskbarSpringOnStashController(this),
		createTaskbarRecentAppsController(),
		new TaskbarRecentAppsController(
		RecentsModel.INSTANCE.get(this),
		LauncherActivityInterface.INSTANCE::getDesktopVisibilityController),
		TaskbarEduTooltipController.newInstance(this),
		new KeyboardQuickSwitchController(),
		new TaskbarPinningController(this, () ->
		@@ -314,16 +314,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
		mLauncherPrefs = LauncherPrefs.get(this);
		}

		private TaskbarRecentAppsController createTaskbarRecentAppsController() {
		// TODO(b/335401172): unify DesktopMode checks in Launcher
		if (enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps()) {
		return new DesktopTaskbarRunningAppsController(
		RecentsModel.INSTANCE.get(this),
		LauncherActivityInterface.INSTANCE::getDesktopVisibilityController);
		}
		return TaskbarRecentAppsController.DEFAULT;
		}

		/** Updates {@link DeviceProfile} instances for any Taskbar windows. */
		public void updateDeviceProfile(DeviceProfile launcherDp) {
		applyDeviceProfile(launcherDp);

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -180,8 +180,9 @@ public class TaskbarControllers {
		taskbarUnfoldAnimationController, taskbarKeyguardController,
		stashedHandleViewController, taskbarStashController,
		taskbarAutohideSuspendController, taskbarPopupController, taskbarInsetsController,
		voiceInteractionWindowController, taskbarTranslationController,
		taskbarEduTooltipController, keyboardQuickSwitchController, taskbarPinningController
		voiceInteractionWindowController, taskbarRecentAppsController,
		taskbarTranslationController, taskbarEduTooltipController,
		keyboardQuickSwitchController, taskbarPinningController,
		};
		mBackgroundRendererControllers = new BackgroundRendererController[] {
		taskbarDragLayerController, taskbarScrimViewController,

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

+2 −17

Original line number	Diff line number	Diff line
		@@ -5,9 +5,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BACK_DISABLED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DOZING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_HOME_DISABLED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK;
		@@ -16,6 +13,7 @@ import static com.android.systemui.shared.system.QuickStepContract.WAKEFULNESS_A
		import android.app.KeyguardManager;

		import com.android.launcher3.AbstractFloatingView;
		import com.android.quickstep.util.SystemUiFlagUtils;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.shared.system.QuickStepContract.SystemUiStateFlags;

		@@ -26,19 +24,6 @@ import java.io.PrintWriter;
		*/
		public class TaskbarKeyguardController implements TaskbarControllers.LoggableTaskbarController {

		private static final long KEYGUARD_SYSUI_FLAGS = SYSUI_STATE_BOUNCER_SHOWING
		\| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING \| SYSUI_STATE_DEVICE_DOZING
		\| SYSUI_STATE_OVERVIEW_DISABLED \| SYSUI_STATE_HOME_DISABLED
		\| SYSUI_STATE_BACK_DISABLED \| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED
		\| SYSUI_STATE_WAKEFULNESS_MASK;

		// If any of these SysUi flags (via QuickstepContract) is set, the device to be considered
		// locked.
		public static final long MASK_ANY_SYSUI_LOCKED = SYSUI_STATE_BOUNCER_SHOWING
		\| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
		\| SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED
		\| SYSUI_STATE_DEVICE_DREAMING;

		private final TaskbarActivityContext mContext;
		private long mKeyguardSysuiFlags;
		private boolean mBouncerShowing;
		@@ -55,7 +40,7 @@ public class TaskbarKeyguardController implements TaskbarControllers.LoggableTas
		}

		public void updateStateForSysuiFlags(@SystemUiStateFlags long systemUiStateFlags) {
		long interestingKeyguardFlags = systemUiStateFlags & KEYGUARD_SYSUI_FLAGS;
		long interestingKeyguardFlags = systemUiStateFlags & SystemUiFlagUtils.KEYGUARD_SYSUI_FLAGS;
		if (interestingKeyguardFlags == mKeyguardSysuiFlags) {
		// No change in keyguard relevant flags
		return;

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		package com.android.launcher3.taskbar;

		import static com.android.app.animation.Interpolators.EMPHASIZED;
		import static com.android.launcher3.taskbar.TaskbarKeyguardController.MASK_ANY_SYSUI_LOCKED;
		import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP;
		import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_OVERVIEW;
		import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_STASHED_LAUNCHER_STATE;
		@@ -51,6 +50,7 @@ import com.android.launcher3.uioverrides.QuickstepLauncher;
		import com.android.launcher3.util.MultiPropertyFactory.MultiProperty;
		import com.android.quickstep.RecentsAnimationCallbacks;
		import com.android.quickstep.RecentsAnimationController;
		import com.android.quickstep.util.SystemUiFlagUtils;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.animation.ViewRootSync;
		import com.android.systemui.shared.recents.model.ThumbnailData;
		@@ -343,8 +343,7 @@ public class TaskbarLauncherStateController {
		prevIsAwake && hasAnyFlag(FLAGS_LAUNCHER_ACTIVE));
		}

		boolean isDeviceLocked = hasAnyFlag(systemUiStateFlags, MASK_ANY_SYSUI_LOCKED);
		updateStateForFlag(FLAG_DEVICE_LOCKED, isDeviceLocked);
		updateStateForFlag(FLAG_DEVICE_LOCKED, SystemUiFlagUtils.isLocked(systemUiStateFlags));

		// Taskbar is hidden whenever the device is dreaming. The dreaming state includes the
		// interactive dreams, AoD, screen off. Since the SYSUI_STATE_DEVICE_DREAMING only kicks in