diff options
| author | Matt Garnes <matt@cyngn.com> | 2014-06-20 14:19:43 -0700 |
|---|---|---|
| committer | Raj Yengisetty <rajesh@cyngn.com> | 2015-07-24 19:23:37 -0700 |
| commit | cfad40b9e4e47cd10898786effdc8b7fdcc6cbf1 (patch) | |
| tree | 646f468567774544b6c6572f2a84fcbd62e6e519 | |
| parent | fd6c984ae46a61eeda176085df696eefbe3ec2f9 (diff) | |
| download | android_packages_apps_Trebuchet-cfad40b9e4e47cd10898786effdc8b7fdcc6cbf1.tar.gz android_packages_apps_Trebuchet-cfad40b9e4e47cd10898786effdc8b7fdcc6cbf1.tar.bz2 android_packages_apps_Trebuchet-cfad40b9e4e47cd10898786effdc8b7fdcc6cbf1.zip | |
Fix CustomContent/CMHome bugs with settings.
1. If Search Panel / CMHome is enabled, it would become visible
in overview mode after any setting is toggled. Fixed.
2. If all icons on the last home screen were removed and Search Panel /
CMHome is enabled, CMHome would become the only workspace, breaking
most things. Fixed.
Change-Id: I5a31e8058f71922c2790c6ac43b09ed7bcbe768a
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 913728bbd..051c48a8d 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4354,12 +4354,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(); } /** |