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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19153319

Change-Id: I87a6dbe39d9e0d31d09dd9ce81fe0ca068b9ad10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2022-07-06 16:51:20 +00:00
committed by Automerger Merge Worker
@@ -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));