diff options
author | Rajesh Yengisetty <rajesh@cyngn.com> | 2014-06-21 00:10:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-21 00:10:30 +0000 |
commit | 94ba73919c6219be8054696b1a23ef0d97bc64fb (patch) | |
tree | 43ceffa91ae9ebe9566b92640356b0a2bbebf52d /src/com | |
parent | 55c421b5fa09ef4336f65f9d368dde9670d9b44a (diff) | |
parent | 130110f316db7592a7e2d15f74c8fb60d1e4cc2a (diff) | |
download | android_packages_apps_Trebuchet-94ba73919c6219be8054696b1a23ef0d97bc64fb.tar.gz android_packages_apps_Trebuchet-94ba73919c6219be8054696b1a23ef0d97bc64fb.tar.bz2 android_packages_apps_Trebuchet-94ba73919c6219be8054696b1a23ef0d97bc64fb.zip |
Merge "Fix CustomContent/CMHome bugs with settings." into cm-11.0
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 20 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2947eda0f..a8f24ef38 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4894,6 +4894,7 @@ public class Launcher extends Activity // Synchronized reload mModel.startLoader(true, mWorkspace.getCurrentPage()); + mWorkspace.updateCustomContentVisibility(); } } 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(); } /** |