Ensure mCurrentPage is valid after page is removed
Specific case this addresses: removing work profile
- Removing work profile causes workspace to be rebound
- This means pages are removed and re-added
- As icons are added back to the pages, they use the
context of the current page to ensure theming is
correct (see ag/1919636)
- Without this change, the current page could be null,
causing a crash. Now we make sure the index is valid.
Bug: 62699220
Change-Id: I0aa1d0c2c6150c51dacb2eb860e4dacd183b3505
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index dcc7a9d..185c887 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -926,6 +926,7 @@
@Override
public void onChildViewRemoved(View parent, View child) {
updateFreescrollBounds();
+ mCurrentPage = validateNewPage(mCurrentPage);
invalidate();
}