Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10c63668 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal Committed by Mohammed Althaf T
Browse files

feat: Do not allow empty first screen

parent ba48b3a1
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -1118,13 +1118,18 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
        int currentPage = getNextPage();
        IntArray removeScreens = new IntArray();
        int total = mWorkspaceScreens.size();
        int maxId = SECOND_SCREEN_ID;
        if (MultiModeController.isSingleLayerMode() && total > 2) {
            maxId = FIRST_SCREEN_ID;
        }

        for (int i = 0; i < total; i++) {
            int id = mWorkspaceScreens.keyAt(i);
            CellLayout cl = mWorkspaceScreens.valueAt(i);
            // FIRST_SCREEN_ID can never be removed.
            if (((!FeatureFlags.QSB_ON_FIRST_SCREEN.get()
                    || SHOULD_SHOW_FIRST_PAGE_WIDGET)
                    || id > SECOND_SCREEN_ID)
                    || id > maxId)
                    && cl.getShortcutsAndWidgets().getChildCount() == 0) {
                removeScreens.add(id);
            }