commit d469b7fdc2018bcb5403d3f45ba0aa1b678c47d3
author Tony Wickham <twickham@google.com> Fri Oct 30 18:48:11 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 18:48:11 2015 +0000
tree 52e7e391022c0d1b2976d3405e47d0fdeef251c6
parent 5ea422e39e4156fd8bfd5e6b142903d14a4c4a3e
parent a6631d76a70e495867c14c33c0af6fc779af4149

Merge "resolve merge conflicts of 4530aca912 to ub-launcher3-master." into ub-launcher3-master

WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java

diff --git a/WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java b/WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java
index 7ede260..cf4c35f 100644
--- a/WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java
+++ b/WallpaperPicker/src/com/android/launcher3/wallpapertileinfo/DefaultWallpaperInfo.java
@@ -44,7 +44,7 @@
 
             @Override
             public float getParallaxOffset() {
-                return 0;
+                return 0.5f;
             }
         }, null);
     }