| commit | e98461861066735869a82f2002921b3db533dafc | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Thu Oct 28 22:53:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 28 22:53:44 2021 +0000 |
| tree | 96751ee0d214c28d3bc38e9c8bece3cddb09348f | |
| parent | ccb17341b15a983ff315bc96e734f4708db1a1cd [diff] | |
| parent | 00841576d49bbef4d684b55a8ee36276488b4561 [diff] |
Merge "Fix NPE when TaskView isn't attached to RecentsView" into sc-v2-dev am: 00841576d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16143390 Change-Id: I2521d09e43988565816de0c60f5d1a4b9500b808
diff --git a/quickstep/src/com/android/quickstep/views/TaskMenuView.java b/quickstep/src/com/android/quickstep/views/TaskMenuView.java index 03ab737..5c73fbb 100644 --- a/quickstep/src/com/android/quickstep/views/TaskMenuView.java +++ b/quickstep/src/com/android/quickstep/views/TaskMenuView.java
@@ -210,7 +210,7 @@ @Override public void onScrollChanged() { - RecentsView rv = mTaskView.getRecentsView(); + RecentsView rv = mActivity.getOverviewPanel(); setPosition(mTaskView.getX() - rv.getScrollX(), mTaskView.getY() - rv.getScrollY(), rv.getOverScrollShift()); }