Fix conflicts
This commit is contained in:
1 parent
3269857e66
commit
32922a2e02
25 files changed
+39
-358
No files matched your search
@@ -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
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user