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
This commit is contained in:
Tony 2017-07-04 09:43:06 -07:00
parent f593fb916e
commit a361c7204f
1 changed files with 1 additions and 0 deletions

View File

@ -926,6 +926,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
@Override
public void onChildViewRemoved(View parent, View child) {
updateFreescrollBounds();
mCurrentPage = validateNewPage(mCurrentPage);
invalidate();
}