Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev (d6c6f586) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -599,12 +599,12 @@ public abstract class WMShellModule {
		Context context, ShellInit shellInit,
		ShellTaskOrganizer shellTaskOrganizer,
		RootDisplayAreaOrganizer rootDisplayAreaOrganizer,
		@ShellMainThread Handler mainHandler
		@ShellMainThread Handler mainHandler,
		Transitions transitions
		) {
		if (DesktopMode.IS_SUPPORTED) {
		return Optional.of(new DesktopModeController(context, shellInit, shellTaskOrganizer,
		rootDisplayAreaOrganizer,
		mainHandler));
		rootDisplayAreaOrganizer, mainHandler, transitions));
		} else {
		return Optional.empty();
		}

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode;

		import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.view.WindowManager.TRANSIT_CHANGE;

		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_DESKTOP_MODE;

		@@ -37,6 +38,7 @@ import com.android.wm.shell.RootDisplayAreaOrganizer;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.common.annotations.ShellMainThread;
		import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.Transitions;

		/**
		* Handles windowing changes when desktop mode system setting changes
		@@ -47,15 +49,18 @@ public class DesktopModeController {
		private final ShellTaskOrganizer mShellTaskOrganizer;
		private final RootDisplayAreaOrganizer mRootDisplayAreaOrganizer;
		private final SettingsObserver mSettingsObserver;
		private final Transitions mTransitions;

		public DesktopModeController(Context context, ShellInit shellInit,
		ShellTaskOrganizer shellTaskOrganizer,
		RootDisplayAreaOrganizer rootDisplayAreaOrganizer,
		@ShellMainThread Handler mainHandler) {
		@ShellMainThread Handler mainHandler,
		Transitions transitions) {
		mContext = context;
		mShellTaskOrganizer = shellTaskOrganizer;
		mRootDisplayAreaOrganizer = rootDisplayAreaOrganizer;
		mSettingsObserver = new SettingsObserver(mContext, mainHandler);
		mTransitions = transitions;
		shellInit.addInitCallback(this::onInit, this);
		}

		@@ -89,8 +94,12 @@ public class DesktopModeController {
		}
		wct.merge(mRootDisplayAreaOrganizer.prepareWindowingModeChange(displayId,
		targetWindowingMode), true /* transfer */);
		if (Transitions.ENABLE_SHELL_TRANSITIONS) {
		mTransitions.startTransition(TRANSIT_CHANGE, wct, null);
		} else {
		mRootDisplayAreaOrganizer.applyTransaction(wct);
		}
		}

		/**
		* A {@link ContentObserver} for listening to changes to {@link Settings.System#DESKTOP_MODE}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeControllerTest.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.ShellTestCase;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.Transitions;

		import org.junit.Before;
		import org.junit.Test;
		@@ -63,6 +64,8 @@ public class DesktopModeControllerTest extends ShellTestCase {
		private ShellExecutor mTestExecutor;
		@Mock
		private Handler mMockHandler;
		@Mock
		private Transitions mMockTransitions;

		private DesktopModeController mController;
		private ShellInit mShellInit;
		@@ -72,7 +75,7 @@ public class DesktopModeControllerTest extends ShellTestCase {
		mShellInit = Mockito.spy(new ShellInit(mTestExecutor));

		mController = new DesktopModeController(mContext, mShellInit, mShellTaskOrganizer,
		mRootDisplayAreaOrganizer, mMockHandler);
		mRootDisplayAreaOrganizer, mMockHandler, mMockTransitions);

		mShellInit.init();
		}