Fix conflicts

2024-01-08 15:24:23 +08:00
parent 3269857e66
commit 32922a2e02
25 changed files with 39 additions and 358 deletions
@@ -800,14 +800,6 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
        });
    }

-
-    /**
-     * Returns if the given screenId is already in the Workspace
-     */
-    public boolean containsScreenId(int screenId) {
-        return this.mWorkspaceScreens.containsKey(screenId);
-    }
-
    /**
     * Returns if the given screenId is already in the Workspace
     */