diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | 707d1538836e2a65c0a1bb0157617e44f3ec81a2 (patch) | |
| tree | c6ca9d6e1244680e9e409f45358e8771b1cf0c05 /src/com/android/launcher3/Workspace.java | |
| parent | 4c1a4c359ff31552a66453287ecee32940661352 (diff) | |
| download | android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.tar.gz android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.tar.bz2 android_packages_apps_Trebuchet-707d1538836e2a65c0a1bb0157617e44f3ec81a2.zip | |
Move Scrolling Wallpaper to new Trebuchet Settings
Conflicts:
src/com/android/launcher3/OverviewSettingsPanel.java
src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
Change-Id: I57961ae9b6f0df334ddd2c4563ddfd7e2939f01e
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 08204574d..f2388ceb4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -5290,6 +5290,16 @@ public class Workspace extends SmoothPagedView TransitionEffect.setFromString(this, SettingsProvider.getString(mLauncher, SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_TRANSITION_EFFECT, R.string.preferences_interface_homescreen_scrolling_transition_effect)); + + mScrollWallpaper = SettingsProvider.getBoolean(mLauncher, + SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL, + R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default); + + if (!mScrollWallpaper) { + if (mWindowToken != null) mWallpaperManager.setWallpaperOffsets(mWindowToken, 0f, 0.5f); + } else { + mWallpaperOffset.syncWithScroll(); + } } public boolean getShowSearchBar() { |