Fixing small regression in PageIndicators add page, fixing NPE (Bug 10779956)

Change-Id: I7ff711c6fc97987efc57bf023913e33e31ccf140
This commit is contained in:
Winson Chung
2013-09-20 11:32:26 -07:00
parent 37cab1bc25
commit 89f9705077
3 changed files with 43 additions and 31 deletions

View File

@@ -616,6 +616,7 @@ public class Workspace extends SmoothPagedView
}
public long commitExtraEmptyScreen() {
int index = getPageIndexForScreenId(EXTRA_EMPTY_SCREEN_ID);
CellLayout cl = mWorkspaceScreens.get(EXTRA_EMPTY_SCREEN_ID);
mWorkspaceScreens.remove(EXTRA_EMPTY_SCREEN_ID);
mScreenOrder.remove(EXTRA_EMPTY_SCREEN_ID);
@@ -624,6 +625,11 @@ public class Workspace extends SmoothPagedView
mWorkspaceScreens.put(newId, cl);
mScreenOrder.add(newId);
// Update the page indicator marker
if (getPageIndicator() != null) {
getPageIndicator().updateMarker(index, getPageIndicatorMarker(index));
}
// Update the model for the new screen
mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);