diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2013-12-17 21:16:36 +0000 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-01-24 16:25:19 -0800 |
| commit | 5094b6c61ef0a3dc87a6ca8a03cdab932a53bbe5 (patch) | |
| tree | 1b5760f3145ddc1509f9204b11ddae3b535e2fc4 /src/com/android/launcher3/Workspace.java | |
| parent | 7fc14e45774e3094ef3afdf391a13ad54df62a3e (diff) | |
| download | android_packages_apps_Trebuchet-5094b6c61ef0a3dc87a6ca8a03cdab932a53bbe5.tar.gz android_packages_apps_Trebuchet-5094b6c61ef0a3dc87a6ca8a03cdab932a53bbe5.tar.bz2 android_packages_apps_Trebuchet-5094b6c61ef0a3dc87a6ca8a03cdab932a53bbe5.zip | |
Workspace: Scroll wallpaper
Change-Id: I6946df98ada04a3d1fb1da705154888d5cd6973d
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 12117f451..9c5a4cd46 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -209,6 +209,7 @@ public class Workspace extends SmoothPagedView private boolean mWorkspaceFadeInAdjacentScreens; WallpaperOffsetInterpolator mWallpaperOffset; + private boolean mScrollWallpaper; private Runnable mDelayedResizeRunnable; private Runnable mDelayedSnapToPageRunnable; private Point mDisplaySize = new Point(); @@ -310,8 +311,11 @@ public class Workspace extends SmoothPagedView mShowSearchBar = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH, R.bool.preferences_interface_homescreen_search_default); mShowOutlines = SettingsProvider.getBoolean(context, - SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_SHOW_OUTLINES, - R.bool.preferences_interface_homescreen_scrolling_show_outlines_default); + SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_PAGE_OUTLINES, + R.bool.preferences_interface_homescreen_scrolling_page_outlines_default); + mScrollWallpaper = SettingsProvider.getBoolean(context, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL, + R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default); mLauncher = (Launcher) context; final Resources res = getResources(); @@ -441,7 +445,7 @@ public class Workspace extends SmoothPagedView // In this case, we will skip drawing background protection } - mWallpaperOffset = new WallpaperOffsetInterpolator(); + if (mScrollWallpaper) mWallpaperOffset = new WallpaperOffsetInterpolator(); Display display = mLauncher.getWindowManager().getDefaultDisplay(); display.getSize(mDisplaySize); @@ -1313,7 +1317,7 @@ public class Workspace extends SmoothPagedView @Override public void computeScroll() { super.computeScroll(); - mWallpaperOffset.syncWithScroll(); + if (mScrollWallpaper) mWallpaperOffset.syncWithScroll(); if (isInOverviewMode() && !isReordering(true)) { updateDefaultScreenButton(); @@ -1600,7 +1604,7 @@ public class Workspace extends SmoothPagedView @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount()) { + if (mFirstLayout && mCurrentPage >= 0 && mCurrentPage < getChildCount() && mScrollWallpaper) { mWallpaperOffset.syncWithScroll(); mWallpaperOffset.jumpToFinal(); } @@ -1608,6 +1612,16 @@ public class Workspace extends SmoothPagedView } @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + + // Center wallpaper if scrolling disabled + if (!mScrollWallpaper && mWindowToken != null) { + mWallpaperManager.setWallpaperOffsets(mWindowToken, 0f, 0.5f); + } + } + + @Override protected void onDraw(Canvas canvas) { // Draw the background gradient if necessary if (mBackground != null && mBackgroundAlpha > 0.0f && mDrawBackground) { |