| commit | 356eaea195643d39c329daef4639348f7edc2f7d | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Jun 15 02:57:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 15 02:57:25 2022 +0000 |
| tree | 469ec5bbebc72f299413924e1b6064cbc8365627 | |
| parent | c692e966c7981c51ba2c0816b616ffc51368e206 [diff] | |
| parent | 4ee29221dfb379e4fb736649570a614c6d5d8147 [diff] |
Merge "Revert line that could wrongly initialize RecentsView scroll" into tm-dev am: 4ee29221df Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18820561 Change-Id: I8bf00bf9bc97e977f51dc9b184d2058ca3595071 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];