Merge "Verifying that new applications are added and fixing issue with new items getting wrong ids." into jb-ub-gel-agar

2013-07-31 17:34:53 +00:00
parent 08ab8d28c6 c763c4e4d2
commit 63d7870ea2
7 changed files with 299 additions and 165 deletions
@@ -1319,7 +1319,13 @@ public class Workspace extends SmoothPagedView
            progress = Math.max(0, progress);

            setBackgroundAlpha(progress * 0.8f);
-            float transY = progress * (getViewportHeight() - getPageIndicator().getTop());
+            float height = getViewportHeight();
+            if (getPageIndicator() != null) {
+                height -= getPageIndicator().getTop();
+            } else if (mLauncher.getHotseat() != null) {
+                height -= mLauncher.getHotseat().getTop();
+            }
+            float transY = progress * height;

            if (mLauncher.getHotseat() != null) {
                mLauncher.getHotseat().setTranslationY(transY);