diff options
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 91014a6a6..c1c41a8c2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3593,10 +3593,14 @@ public class Launcher extends Activity @Override public void bindScreens(ArrayList<Long> orderedScreenIds) { // Make sure the first screen is always at the start. - if (orderedScreenIds.indexOf(Workspace.FIRST_SCREEN_ID) != 0) { + if (FeatureFlags.QSB_ON_FIRST_SCREEN && + orderedScreenIds.indexOf(Workspace.FIRST_SCREEN_ID) != 0) { orderedScreenIds.remove(Workspace.FIRST_SCREEN_ID); orderedScreenIds.add(0, Workspace.FIRST_SCREEN_ID); mModel.updateWorkspaceScreenOrder(this, orderedScreenIds); + } else if (!FeatureFlags.QSB_ON_FIRST_SCREEN && orderedScreenIds.isEmpty()) { + // If there are no screens, we need to have an empty screen + mWorkspace.addExtraEmptyScreen(); } bindAddScreens(orderedScreenIds); @@ -3612,7 +3616,7 @@ public class Launcher extends Activity int count = orderedScreenIds.size(); for (int i = 0; i < count; i++) { long screenId = orderedScreenIds.get(i); - if (screenId != Workspace.FIRST_SCREEN_ID) { + if (!FeatureFlags.QSB_ON_FIRST_SCREEN || screenId != Workspace.FIRST_SCREEN_ID) { // No need to bind the first screen, as its always bound. mWorkspace.insertNewWorkspaceScreenBeforeEmptyScreen(screenId); } |