commit 74645da037af648d3384f4518b070930c676298f
author Michael Jurka <mikejurka@google.com> Fri Jan 14 16:09:30 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 14 16:09:30 2011 -0800
tree 0211cf5851cd3be8dd78e20cd20eb1eedfe7f3e4
parent e00e693cb0940311d076e4c5242b799c4f04fd48
parent cb2e6510ca4c53582c8294956a4afa5208eb75f9

am cb2e6510: am 8dcd99ea: Merge "fixed vertical parallax" into honeycomb

* commit 'cb2e6510ca4c53582c8294956a4afa5208eb75f9':
  fixed vertical parallax

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 020f553..8e0308c 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -616,7 +616,7 @@
         Display display = mLauncher.getWindowManager().getDefaultDisplay();
         int wallpaperTravelHeight = (int) (display.getHeight() *
                 wallpaperTravelToScreenHeightRatio(display.getWidth(), display.getHeight()));
-        float offsetFromCenter = (wallpaperTravelHeight / mWallpaperHeight) / 2f;
+        float offsetFromCenter = (wallpaperTravelHeight / (float) mWallpaperHeight) / 2f;
         switch (offsetPosition) {
             case TOP:
                 offset = 0.5f - offsetFromCenter;