diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 22 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 6bd66d49b..88046e4e0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3539,7 +3539,7 @@ public class Launcher extends Activity int count = orderedScreenIds.size(); for (int i = 0; i < count; i++) { Log.w(TAG, "10249126 - bindAddScreens(" + orderedScreenIds.get(i) + ")"); - mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(orderedScreenIds.get(i), false); + mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(orderedScreenIds.get(i)); } } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 7d3a830ca..696b702c8 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -461,26 +461,22 @@ public class Workspace extends SmoothPagedView return mTouchState != TOUCH_STATE_REST; } - public long insertNewWorkspaceScreen(long screenId) { - return insertNewWorkspaceScreen(screenId, getChildCount(), true); - } - - public long insertNewWorkspaceScreenBeforeEmptyScreen(long screenId, boolean updateDb) { + public long insertNewWorkspaceScreenBeforeEmptyScreen(long screenId) { // Find the index to insert this view into. If the empty screen exists, then // insert it before that. int insertIndex = mScreenOrder.indexOf(EXTRA_EMPTY_SCREEN_ID); if (insertIndex < 0) { insertIndex = mScreenOrder.size(); } - return insertNewWorkspaceScreen(screenId, insertIndex, updateDb); + return insertNewWorkspaceScreen(screenId, insertIndex); } - public long insertNewWorkspaceScreen(long screenId, boolean updateDb) { - return insertNewWorkspaceScreen(screenId, getChildCount(), updateDb); + public long insertNewWorkspaceScreen(long screenId) { + return insertNewWorkspaceScreen(screenId, getChildCount()); } - public long insertNewWorkspaceScreen(long screenId, int insertIndex, boolean updateDb) { - Log.w(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ", " + updateDb + ")"); + public long insertNewWorkspaceScreen(long screenId, int insertIndex) { + Log.w(TAG, "10249126 - insertNewWorkspaceScreen(" + screenId + ", " + insertIndex + ")"); CellLayout newScreen = (CellLayout) mLauncher.getLayoutInflater().inflate(R.layout.workspace_screen, null); @@ -489,10 +485,6 @@ public class Workspace extends SmoothPagedView mWorkspaceScreens.put(screenId, newScreen); mScreenOrder.add(insertIndex, screenId); addView(newScreen, insertIndex); - if (updateDb) { - // On bind we don't need to update the screens in the database. - mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder); - } return screenId; } @@ -550,7 +542,7 @@ public class Workspace extends SmoothPagedView } public void addExtraEmptyScreen() { - insertNewWorkspaceScreen(EXTRA_EMPTY_SCREEN_ID, false); + insertNewWorkspaceScreen(EXTRA_EMPTY_SCREEN_ID); } public CellLayout getScreenWithId(long screenId) { |