summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-04-16 10:26:48 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-04-16 10:26:48 -0700
commite32cb9d660cbb0bb65dd84695f528b3bab981916 (patch)
treefaa372dca7f947d6d45ebe520c068810d59b9773 /src
parent32e86c34c37787895a9f55982ead5fbb4afcd1fe (diff)
parent83e840d93447367ec1e7c07c2523cbea0115fb10 (diff)
downloadandroid_packages_apps_Trebuchet-e32cb9d660cbb0bb65dd84695f528b3bab981916.tar.gz
android_packages_apps_Trebuchet-e32cb9d660cbb0bb65dd84695f528b3bab981916.tar.bz2
android_packages_apps_Trebuchet-e32cb9d660cbb0bb65dd84695f528b3bab981916.zip
Merge "Trebuchet: Fix vertical position of wallpaper when mWallpaperHack is activated" into cm-10.1
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 092f5a082..7e330eb3b 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -1864,7 +1864,7 @@ public class Workspace extends PagedView
// Wallpaper is smaller than screen
y += (height - wallpaperHeight) / 2;
} else {
- y -= (wallpaperHeight - (height + mWallpaperOffsets[1])) / 2;
+ y -= mWallpaperScrollY * (wallpaperHeight - (height + mWallpaperOffsets[1])) + mWallpaperOffsets[1];
}
canvas.drawBitmap(mWallpaperBitmap, x, y, mPaint);