Merge "Updating launcher for pip interface cleanup" into tm-qpr-dev (a5846c98) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1010,8 +1010,8 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
		switch (endTarget) {
		case HOME:
		mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME \| STATE_CAPTURE_SCREENSHOT);
		// Notify swipe-to-home (recents animation) is finished
		SystemUiProxy.INSTANCE.get(mContext).notifySwipeToHomeFinished();
		// Notify the SysUI to use fade-in animation when entering PiP
		SystemUiProxy.INSTANCE.get(mContext).setPipAnimationTypeToAlpha();
		break;
		case RECENTS:
		mStateCallback.setState(STATE_SCALED_CONTROLLER_RECENTS \| STATE_CAPTURE_SCREENSHOT

quickstep/src/com/android/quickstep/SystemUiProxy.java

+17 −18

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class SystemUiProxy implements ISystemUiProxy {
		linkToDeath();
		// re-attach the listeners once missing due to setProxy has not been initialized yet.
		if (mPipAnimationListener != null && mPip != null) {
		setPinnedStackAnimationListener(mPipAnimationListener);
		setPipAnimationListener(mPipAnimationListener);
		}
		if (mSplitScreenListener != null && mSplitScreen != null) {
		registerSplitScreenListener(mSplitScreenListener);
		@@ -357,20 +357,6 @@ public class SystemUiProxy implements ISystemUiProxy {
		}
		}

		/**
		* Notifies that swipe-to-home action is finished.
		*/
		@Override
		public void notifySwipeToHomeFinished() {
		if (mSystemUiProxy != null) {
		try {
		mSystemUiProxy.notifySwipeToHomeFinished();
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call notifySwipeToHomeFinished", e);
		}
		}
		}

		@Override
		public void notifyPrioritizedRotation(int rotation) {
		if (mSystemUiProxy != null) {
		@@ -475,12 +461,12 @@ public class SystemUiProxy implements ISystemUiProxy {
		}

		/**
		* Sets listener to get pinned stack animation callbacks.
		* Sets listener to get pip animation callbacks.
		*/
		public void setPinnedStackAnimationListener(IPipAnimationListener listener) {
		public void setPipAnimationListener(IPipAnimationListener listener) {
		if (mPip != null) {
		try {
		mPip.setPinnedStackAnimationListener(listener);
		mPip.setPipAnimationListener(listener);
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call setPinnedStackAnimationListener", e);
		}
		@@ -522,6 +508,19 @@ public class SystemUiProxy implements ISystemUiProxy {
		}
		}

		/**
		* Sets the next pip animation type to be the alpha animation.
		*/
		public void setPipAnimationTypeToAlpha() {
		if (mPip != null) {
		try {
		mPip.setPipAnimationTypeToAlpha();
		} catch (RemoteException e) {
		Log.w(TAG, "Failed call setPipAnimationTypeToAlpha", e);
		}
		}
		}

		//
		// Splitscreen
		//

quickstep/src/com/android/quickstep/views/RecentsView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -941,7 +941,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		.setSyncTransactionApplier(mSyncTransactionApplier));
		RecentsModel.INSTANCE.get(getContext()).addThumbnailChangeListener(this);
		mIPipAnimationListener.setActivityAndRecentsView(mActivity, this);
		SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(
		SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener(
		mIPipAnimationListener);
		mOrientationState.initListeners();
		SplitScreenBounds.INSTANCE.addOnChangeListener(this);
		@@ -960,7 +960,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		.setSyncTransactionApplier(null));
		executeSideTaskLaunchCallback();
		RecentsModel.INSTANCE.get(getContext()).removeThumbnailChangeListener(this);
		SystemUiProxy.INSTANCE.get(getContext()).setPinnedStackAnimationListener(null);
		SystemUiProxy.INSTANCE.get(getContext()).setPipAnimationListener(null);
		SplitScreenBounds.INSTANCE.removeOnChangeListener(this);
		mIPipAnimationListener.setActivityAndRecentsView(null, null);
		mOrientationState.destroyListeners();
		@@ -4722,7 +4722,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		if (sendUserLeaveHint) {
		// Notify the SysUI to use fade-in animation when entering PiP from live tile.
		final SystemUiProxy systemUiProxy = SystemUiProxy.INSTANCE.get(getContext());
		systemUiProxy.notifySwipeToHomeFinished();
		systemUiProxy.setPipAnimationTypeToAlpha();
		systemUiProxy.setShelfHeight(true, mActivity.getDeviceProfile().hotseatBarSizePx);
		// Transaction to hide the task to avoid flicker for entering PiP from split-screen.
		// See also {@link AbsSwipeUpHandler#maybeFinishSwipeToHome}.