Merge "Add null check on mRecentsView in the InputConsumerProxy" into tm-qpr-dev

This commit is contained in:
Tony Wickham
2022-07-06 16:27:14 +00:00
committed by Android (Google) Code Review

View File

@@ -297,9 +297,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
mActivityInterface = gestureState.getActivityInterface();
mActivityInitListener = mActivityInterface.createActivityInitListener(this::onActivityInit);
mInputConsumerProxy =
new InputConsumerProxy(context,
() -> mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation(),
inputConsumer, () -> {
new InputConsumerProxy(context, /* rotationSupplier = */ () -> {
if (mRecentsView == null) {
return ROTATION_0;
}
return mRecentsView.getPagedViewOrientedState().getRecentsActivityRotation();
}, inputConsumer, /* callback = */ () -> {
endRunningWindowAnim(mGestureState.getEndTarget() == HOME /* cancel */);
endLauncherTransitionController();
}, new InputProxyHandlerFactory(mActivityInterface, mGestureState));