Merge "2x1 split-screen (2/n)" into main (95ebacb5) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+19 −5

Original line number	Original line	Diff line number	Diff line
	@@ -520,8 +520,7 @@ public class StageCoordinator extends StageCoordinatorAbstract {
	mDisplayController.addDisplayWindowListener(this);		mDisplayController.addDisplayWindowListener(this);
	mDisplayController.addDisplayChangingController(this);		mDisplayController.addDisplayChangingController(this);
	transitions.addHandler(this);		transitions.addHandler(this);
	mSplitUnsupportedToast = Toast.makeText(mContext,		mSplitUnsupportedToast = createSplitUnsupportedToast();
	R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT);
	mFoldLockSettingsObserver = new FoldLockSettingsObserver(mainHandler, context);		mFoldLockSettingsObserver = new FoldLockSettingsObserver(mainHandler, context);
	mFoldLockSettingsObserver.register();		mFoldLockSettingsObserver.register();
	mStatusBarHider = new SplitStatusBarHider(taskOrganizer, splitState,		mStatusBarHider = new SplitStatusBarHider(taskOrganizer, splitState,
	@@ -577,8 +576,7 @@ public class StageCoordinator extends StageCoordinatorAbstract {

	mDisplayController.addDisplayWindowListener(this);		mDisplayController.addDisplayWindowListener(this);
	transitions.addHandler(this);		transitions.addHandler(this);
	mSplitUnsupportedToast = Toast.makeText(mContext,		mSplitUnsupportedToast = createSplitUnsupportedToast();
	R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT);
	mFoldLockSettingsObserver =		mFoldLockSettingsObserver =
	new FoldLockSettingsObserver(context.getMainThreadHandler(), context);		new FoldLockSettingsObserver(context.getMainThreadHandler(), context);
	mFoldLockSettingsObserver.register();		mFoldLockSettingsObserver.register();
	@@ -591,6 +589,18 @@ public class StageCoordinator extends StageCoordinatorAbstract {
	mSplitTransitionModifier = new SplitTransitionModifier();		mSplitTransitionModifier = new SplitTransitionModifier();
	}		}

			private Toast createSplitUnsupportedToast() {
			Toast splitUnsupportedToast = null;
			try {
			splitUnsupportedToast = Toast.makeText(mContext,
			R.string.dock_non_resizeble_failed_to_dock_text, Toast.LENGTH_SHORT);
			} catch (Exception e) {
			ProtoLog.e(WM_SHELL_SPLIT_SCREEN,
			"Failed to create split unsupported toast %s", e.getMessage());
			}
			return splitUnsupportedToast;
			}

	public void setMixedHandler(DefaultMixedHandler mixedHandler) {		public void setMixedHandler(DefaultMixedHandler mixedHandler) {
	mMixedHandler = mixedHandler;		mMixedHandler = mixedHandler;
	}		}
	@@ -4724,7 +4734,11 @@ public class StageCoordinator extends StageCoordinatorAbstract {
	}		}

	void handleUnsupportedSplitStart() {		void handleUnsupportedSplitStart() {
			if (mSplitUnsupportedToast != null) {
	mSplitUnsupportedToast.show();		mSplitUnsupportedToast.show();
			} else {
			ProtoLog.w(WM_SHELL_SPLIT_SCREEN, "The split unsupported toast is null");
			}
	notifySplitAnimationStatus(false /animationRunning/);		notifySplitAnimationStatus(false /animationRunning/);
	}		}