diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/com/cyanogenmod/trebuchet/PagedView.java | 2 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 14 | ||||
-rw-r--r-- | src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/PagedView.java b/src/com/cyanogenmod/trebuchet/PagedView.java index 50c0ff2..0bc1e1b 100644 --- a/src/com/cyanogenmod/trebuchet/PagedView.java +++ b/src/com/cyanogenmod/trebuchet/PagedView.java @@ -468,8 +468,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc || getScrollY() != mScroller.getCurrY() || mOverScrollX != mScroller.getCurrX()) { scrollTo(mScroller.getCurrX(), mScroller.getCurrY()); + invalidate(); } - invalidate(); return true; } else if (mNextPage != INVALID_PAGE) { mCurrentPage = Math.max(0, Math.min(mNextPage, getPageCount() - 1)); diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index a6a440b..b08c8d8 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 { diff --git a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java index cf989f0..be9d5f3 100644 --- a/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java +++ b/src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java @@ -111,6 +111,9 @@ public final class PreferencesProvider { public static boolean getWallpaperHack() { return getBoolean("ui_homescreen_scrolling_wallpaper_hack", false); } + public static int getWallpaperSize() { + return getInt("ui_homescreen_scrolling_wallpaper_size", 2); + } public static boolean getFadeInAdjacentScreens(boolean def) { return getBoolean("ui_homescreen_scrolling_fade_adjacent_screens", def); } |