| commit | 908a1ef10d2a11b8b0508cb495a95a42ac2d2387 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 22 11:04:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 22 11:04:10 2021 +0000 |
| tree | 61b3562de8eb1d1a2683d5bbd2a1b524aac568a4 | |
| parent | a66ee1dddaef7e8fa9215e4888a748a269050fd9 [diff] | |
| parent | 125ea48ce570c00bc20630685f3f8ae6b1cd0cc2 [diff] |
Merge "Add null check for recents scaling during quick switch." into sc-v2-dev am: d32a472e5c am: 125ea48ce5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15358270 Change-Id: Ifd729f96f9f291a91901dfca33f51e54cf0bb72b
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 357d407..076f28a 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1821,7 +1821,7 @@ // Scaling of RecentsView during quick switch based on amount of recents scroll private float getScaleProgressDueToScroll() { - if (!mActivity.getDeviceProfile().isTablet || mRecentsView == null + if (mActivity == null || !mActivity.getDeviceProfile().isTablet || mRecentsView == null || !mRecentsViewScrollLinked) { return 0; }