Merge "Stop using DesktopModeStatus in SystemUI" into main (8ee1bab8) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/desktopmode/FakeDesktopConfig.kt→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/FakeDesktopConfig.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.shared.desktopmode

		import android.app.TaskInfo

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/desktopmode/FakeDesktopState.kt→libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/FakeDesktopState.kt

+1 −1

File changed and moved.

Contains only whitespace changes.

packages/SystemUI/src/com/android/systemui/LauncherProxyService.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ import com.android.systemui.statusbar.phone.StatusBarWindowCallback;
		import com.android.systemui.statusbar.policy.CallbackController;
		import com.android.systemui.unfold.progress.UnfoldTransitionProgressForwarder;
		import com.android.wm.shell.back.BackAnimation;
		import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
		import com.android.wm.shell.shared.desktopmode.DesktopState;
		import com.android.wm.shell.sysui.ShellInterface;

		import dagger.Lazy;
		@@ -191,6 +191,8 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis
		private final BroadcastDispatcher mBroadcastDispatcher;
		private final BackAnimation mBackAnimation;

		private final DesktopState mDesktopState;

		private ILauncherProxy mLauncherProxy;
		private int mConnectionBackoffAttempts;
		private boolean mBound;
		@@ -742,7 +744,8 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis
		BroadcastDispatcher broadcastDispatcher,
		Optional<BackAnimation> backAnimation,
		ProcessWrapper processWrapper,
		DisplayRepository displayRepository
		DisplayRepository displayRepository,
		DesktopState desktopState
		) {
		// b/241601880: This component should only be running for primary users or
		// secondaryUsers when visibleBackgroundUsers are supported.
		@@ -784,6 +787,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis
		mUnfoldTransitionProgressForwarder = unfoldTransitionProgressForwarder;
		mBroadcastDispatcher = broadcastDispatcher;
		mBackAnimation = backAnimation.orElse(null);
		mDesktopState = desktopState;

		if (!KeyguardWmStateRefactor.isEnabled()) {
		mSysuiUnlockAnimationController = sysuiUnlockAnimationController;
		@@ -824,7 +828,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis
		public void moveFocusedTaskToStageSplit(int displayId, boolean leftOrTop) {
		if (mLauncherProxy != null) {
		try {
		if (DesktopModeStatus.canEnterDesktopMode(mContext)
		if (mDesktopState.canEnterDesktopMode()
		&& (mDefaultDisplaySysUIState.getFlags()
		& SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0) {
		return;

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.view.Display;

		import androidx.annotation.Nullable;

		import com.android.app.displaylib.PerDisplayRepository;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.keyguard.dagger.ClockRegistryModule;
		import com.android.keyguard.dagger.KeyguardBouncerComponent;
		@@ -63,9 +64,9 @@ import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.SystemUser;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.demomode.dagger.DemoModeModule;
		import com.android.systemui.desktop.dagger.DesktopModule;
		import com.android.systemui.deviceentry.DeviceEntryModule;
		import com.android.systemui.display.DisplayModule;
		import com.android.app.displaylib.PerDisplayRepository;
		import com.android.systemui.display.dagger.SystemUIDisplaySubcomponent;
		import com.android.systemui.doze.dagger.DozeComponent;
		import com.android.systemui.dreams.dagger.DreamModule;
		@@ -227,6 +228,7 @@ import javax.inject.Named;
		ConnectivityModule.class,
		ControlsModule.class,
		DemoModeModule.class,
		DesktopModule.class,
		DeviceEntryModule.class,
		DisableFlagsModule.class,
		DisplayModule.class,

packages/SystemUI/src/com/android/systemui/desktop/OWNERS

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		include /libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS
		include /libs/WindowManager/Shell/OWNERS