summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-01-14 16:06:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-14 16:06:37 -0800
commit8dcd99eaf72a2f5233647e2a05757bcfb8f28c28 (patch)
treee4f37719f6e70b9c601640a5dd20c89913d4946a /src
parent0a1f18fe0ad9e3a5e7bc264885da4af106c26b0c (diff)
parent93a6b4e8a219e76faceae460fc700e9af283cf16 (diff)
downloadandroid_packages_apps_Trebuchet-8dcd99eaf72a2f5233647e2a05757bcfb8f28c28.tar.gz
android_packages_apps_Trebuchet-8dcd99eaf72a2f5233647e2a05757bcfb8f28c28.tar.bz2
android_packages_apps_Trebuchet-8dcd99eaf72a2f5233647e2a05757bcfb8f28c28.zip
Merge "fixed vertical parallax" into honeycomb
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 020f553d7..8e0308cd0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -616,7 +616,7 @@ public class Workspace extends SmoothPagedView
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;