Merge "Maintain fake nav bar position in overview for landscape" into ub-launcher3-rvc-dev (c217c72b) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -780,12 +780,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
		}
		}

		if (endTarget == RECENTS \|\| endTarget == HOME) {
		// Since we're now done quickStepping, we want to only listen for touch events
		// for the main orientation's nav bar, instead of multiple
		mDeviceState.enableMultipleRegions(false);
		}

		if (mDeviceState.isOverviewDisabled() && (endTarget == RECENTS \|\| endTarget == LAST_TASK)) {
		return LAST_TASK;
		}
		@@ -1243,6 +1237,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
		}
		ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);
		doLogGesture(HOME);
		mDeviceState.enableMultipleRegions(false);
		}

		protected abstract void finishRecentsControllerToHome(Runnable callback);
		@@ -1258,6 +1253,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte

		SystemUiProxy.INSTANCE.get(mContext).onOverviewShown(false, TAG);
		doLogGesture(RECENTS);
		mDeviceState.onSwipeUpToOverview(mActivityInterface);
		reset();
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,11 @@ public final class FallbackActivityInterface extends
		\|\| super.deferStartingActivity(deviceState, ev);
		}

		@Override
		public void onExitOverview(RecentsAnimationDeviceState deviceState, Runnable exitRunnable) {
		// no-op, fake landscape not supported for 3P
		}

		@Override
		public int getContainerType() {
		RecentsActivity activity = getCreatedActivity();

+22 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.appprediction.PredictionUiStateManager;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.touch.PagedOrientationHandler;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		@@ -224,6 +225,27 @@ public final class LauncherActivityInterface extends
		}


		@Override
		public void onExitOverview(RecentsAnimationDeviceState deviceState, Runnable exitRunnable) {
		final StateManager<LauncherState> stateManager = getCreatedActivity().getStateManager();
		stateManager.addStateListener(
		new StateManager.StateListener<LauncherState>() {
		@Override
		public void onStateTransitionComplete(LauncherState toState) {
		// Are we going from Recents to Workspace?
		if (toState == LauncherState.NORMAL) {
		exitRunnable.run();

		// reset layout on swipe to home
		RecentsView recentsView = getCreatedActivity().getOverviewPanel();
		recentsView.setLayoutRotation(deviceState.getCurrentActiveRotation(),
		deviceState.getDisplayRotation());
		stateManager.removeStateListener(this);
		}
		}
		});
		}

		@Override
		public Rect getOverviewWindowBounds(Rect homeBounds, RemoteAnimationTargetCompat target) {
		return homeBounds;

+0 −1

Original line number	Diff line number	Diff line
		@@ -554,7 +554,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
		\|\| previousGestureState.isRecentsAnimationRunning()
		? newBaseConsumer(previousGestureState, newGestureState, event)
		: mResetGestureInputConsumer;
		// TODO(b/149880412): 2 button landscape mode is wrecked. Fixit!
		if (mDeviceState.isGesturalNavMode()) {
		handleOrientationSetup(base);
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,9 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
		return deviceState.isInDeferredGestureRegion(ev);
		}

		public abstract void onExitOverview(RecentsAnimationDeviceState deviceState,
		Runnable exitRunnable);

		/**
		* Updates the prediction state to the overview state.
		*/