| commit | a763a7ccd48494ff7ec796b378bfa88a2211ec6b | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Jun 15 03:14:42 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 15 03:14:42 2022 +0000 |
| tree | d5fab97342014f7682e04dc925f22f2db18baa7e | |
| parent | 51ceb5f2005ec7caf7483be3be7ca8651c5b2592 [diff] | |
| parent | 356eaea195643d39c329daef4639348f7edc2f7d [diff] |
Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev am: 4ee29221df am: 356eaea195 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18820561 Change-Id: I83c63625c78cc4ce8791ac6190a2e758bd7713b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 73be5be..cba0b7d 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java
@@ -1187,7 +1187,9 @@ } public int getScrollForPage(int index) { - if (!pageScrollsInitialized() || index >= mPageScrolls.length || index < 0) { + // TODO(b/233112195): Use !pageScrollsInitialized() instead of mPageScrolls == null, once we + // root cause where we should be using runOnPageScrollsInitialized(). + if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) { return 0; } else { return mPageScrolls[index];