aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when drags are cancelled

Browse Source
This commit is contained in:
Michael Jurka
2013-07-02 17:24:35 -07:00
parent 04d554afcb
commit ee0ce2b29f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Workspace.java
View File

@@ -499,9 +499,9 @@ public class Workspace extends SmoothPagedView
CellLayout newScreen = (CellLayout)
mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null);
addView(newScreen, getChildCount());
mWorkspaceScreens.put(screenId, newScreen);
mScreenOrder.add(screenId);
addView(newScreen, getChildCount());
if (updateDb) {
// On bind we don't need to update the screens in the database.
mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
@@ -525,10 +525,10 @@ public class Workspace extends SmoothPagedView
AppWidgetHostView.getDefaultPaddingForWidget(mLauncher, mLauncher.getComponentName(), p);
customContent.setPadding(p.left, p.top, p.right, p.bottom);
addView(customScreen, 0);
mWorkspaceScreens.put(CUSTOM_CONTENT_SCREEN_ID, customScreen);
mScreenOrder.add(0, CUSTOM_CONTENT_SCREEN_ID);
addView(customScreen, 0);
// Ensure that the current page and default page are maintained.
mDefaultPage++;