Merge "Check null before getting DeviceProfile in AbsSwipeUpHandler" into tm-qpr-dev am: f7526085a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19038729 Change-Id: I4a518993597d2fc250f4b6879512b7f08b5e61ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1136,7 +1136,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
mInputConsumerProxy.enable();
|
||||
}
|
||||
if (endTarget == HOME) {
|
||||
duration = mActivity.getDeviceProfile().isTaskbarPresent
|
||||
duration = mActivity != null && mActivity.getDeviceProfile().isTaskbarPresent
|
||||
? StaggeredWorkspaceAnim.DURATION_TASKBAR_MS
|
||||
: StaggeredWorkspaceAnim.DURATION_MS;
|
||||
// Early detach the nav bar once the endTarget is determined as HOME
|
||||
|
||||
Reference in New Issue
Block a user