diff options
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index c67ca9395..7e3584115 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1638,13 +1638,7 @@ public class Workspace extends SmoothPagedView } public int numCustomPages() { - // GEL integration is a special case (not a *real* screen) and should - // not be counted as custom content. - if(mLauncher.isGelIntegrationEnabled()) { - return 0; - } else { - return hasCustomContent() ? 1 : 0; - } + return hasCustomContent() ? 1 : 0; } public boolean isOnOrMovingToCustomContent() { @@ -2124,11 +2118,6 @@ public class Workspace extends SmoothPagedView int start = numCustomPages(); int end = getChildCount() - 1; - // For GEL integration, do not include the first page (GEL) - if(mLauncher.isGelIntegrationEnabled()) { - start += 1; - } - range[0] = Math.max(0, Math.min(start, getChildCount() - 1)); range[1] = Math.max(0, end); } @@ -4195,12 +4184,7 @@ public class Workspace extends SmoothPagedView } public int getCurrentPageOffsetFromCustomContent() { - int numCustomPages = numCustomPages(); - // Special case where the Gel Integration page must be counted below - if(mLauncher.isGelIntegrationEnabled() && mLauncher.isGelIntegrationSupported()) { - numCustomPages += 1; - } - return getNextPage() - numCustomPages; + return getNextPage() - numCustomPages(); } /** |