diff options
author | Adam Cohen <adamcohen@google.com> | 2013-08-20 11:57:13 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-08-20 15:01:56 -0700 |
commit | 89bddfaa6d1dbd1534c5f5c5f3163c10f627209e (patch) | |
tree | 4d4f38257a99e4c9f77ccee72f9e4b4d730fe555 | |
parent | c9c4424eaddb64a9f30d95f250570d7dd1937c7b (diff) | |
download | android_packages_apps_Trebuchet-89bddfaa6d1dbd1534c5f5c5f3163c10f627209e.tar.gz android_packages_apps_Trebuchet-89bddfaa6d1dbd1534c5f5c5f3163c10f627209e.tar.bz2 android_packages_apps_Trebuchet-89bddfaa6d1dbd1534c5f5c5f3163c10f627209e.zip |
Stripping unused method param
Change-Id: Id71664a88908773c5e64c9394070ad231d2148a1
-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 c29e74f5e..b1d835512 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3543,7 +3543,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 77f726a44..81d764171 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) { |