diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-12-19 21:41:09 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-19 21:41:09 +0000 |
| commit | 62d0f2dc6df3fb1acbe154e5fb1d369585290368 (patch) | |
| tree | 38594d3f5d209528cffb3f67da8472f3f61eb1bc /src/com/cyanogenmod/trebuchet/Workspace.java | |
| parent | c6383d8946a76a94b1714d92fd9abb9bb0b34102 (diff) | |
| download | android_packages_apps_Trebuchet-62d0f2dc6df3fb1acbe154e5fb1d369585290368.tar.gz android_packages_apps_Trebuchet-62d0f2dc6df3fb1acbe154e5fb1d369585290368.tar.bz2 android_packages_apps_Trebuchet-62d0f2dc6df3fb1acbe154e5fb1d369585290368.zip | |
Workspace: Wallpaper Size
Change-Id: I5bb894de9647e6acd8a82fae508bd251d9263137
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/Workspace.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index a6a440b4e..b08c8d8e4 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -317,6 +317,7 @@ public class Workspace extends SmoothPagedView private boolean mResizeAnyWidget; private boolean mHideIconLabels; private boolean mScrollWallpaper; + private int mWallpaperSize; private boolean mShowScrollingIndicator; private boolean mFadeScrollingIndicator; private int mScrollingIndicatorPosition; @@ -407,6 +408,7 @@ public class Workspace extends SmoothPagedView res.getString(R.string.config_workspaceDefaultTransitionEffect)); mScrollWallpaper = PreferencesProvider.Interface.Homescreen.Scrolling.getScrollWallpaper(); mWallpaperHack = PreferencesProvider.Interface.Homescreen.Scrolling.getWallpaperHack(); + mWallpaperSize = PreferencesProvider.Interface.Homescreen.Scrolling.getWallpaperSize(); mShowOutlines = PreferencesProvider.Interface.Homescreen.Scrolling.getShowOutlines( res.getBoolean(R.bool.config_workspaceDefaultShowOutlines)); mFadeInAdjacentScreens = PreferencesProvider.Interface.Homescreen.Scrolling.getFadeInAdjacentScreens( @@ -1046,12 +1048,14 @@ public class Workspace extends SmoothPagedView mWallpaperWidth = (int) (maxDim * wallpaperTravelToScreenWidthRatio(maxDim, minDim)); mWallpaperHeight = maxDim; } else { - mWallpaperWidth = Math.max((int) (minDim * DEFAULT_WALLPAPER_SCREENS_SPAN), maxDim); + int screens = mWallpaperSize; + mWallpaperWidth = Math.max((int) (minDim * screens), maxDim); mWallpaperHeight = maxDim; } new Thread("setWallpaperDimension") { public void run() { mWallpaperManager.suggestDesiredDimensions(mWallpaperWidth, mWallpaperHeight); + checkWallpaper(); } }.start(); } @@ -1205,6 +1209,13 @@ public class Workspace extends SmoothPagedView mIsMovingFast = false; return false; } + + // Don't have any lag between workspace and wallpaper on non-large devices + if (!LauncherApplication.isScreenLarge()) { + mHorizontalWallpaperOffset = mFinalHorizontalWallpaperOffset; + return true; + } + boolean isLandscape = mDisplaySize.x > mDisplaySize.y; long currentTime = System.currentTimeMillis(); @@ -1233,7 +1244,6 @@ public class Workspace extends SmoothPagedView float hOffsetDelta = mFinalHorizontalWallpaperOffset - mHorizontalWallpaperOffset; boolean jumpToFinalValue = Math.abs(hOffsetDelta) < UPDATE_THRESHOLD; - // Don't have any lag between workspace and wallpaper on non-large devices if (!LauncherApplication.isScreenLarge() || jumpToFinalValue) { mHorizontalWallpaperOffset = mFinalHorizontalWallpaperOffset; } else { |