summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-07-08 17:08:51 -0700
committerMichael Jurka <mikejurka@google.com>2011-07-08 17:08:51 -0700
commitff0e01b65dac8861d0a319fb643c67f8a573aa97 (patch)
treeac1317207cc33dfcdfd146f0ec7f56ed25f45fb4 /src
parent14a001ad67aaebc5cec3a34646b0dda1fa417e7c (diff)
downloadandroid_packages_apps_Trebuchet-ff0e01b65dac8861d0a319fb643c67f8a573aa97.tar.gz
android_packages_apps_Trebuchet-ff0e01b65dac8861d0a319fb643c67f8a573aa97.tar.bz2
android_packages_apps_Trebuchet-ff0e01b65dac8861d0a319fb643c67f8a573aa97.zip
Disable wallpaper panning when switching to All Apps
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Workspace.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index fd18338e9..611d360c0 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1439,7 +1439,10 @@ public class Workspace extends SmoothPagedView
float offsetFromCenter = (wallpaperTravelHeight / (float) mWallpaperHeight) / 2f;
boolean isLandscape = display.getWidth() > display.getHeight();
- final boolean enableWallpaperEffects = isHardwareAccelerated();
+ // on phones, don't scroll the wallpaper horizontally or vertically when switching
+ // to/from all apps
+ final boolean enableWallpaperEffects =
+ isHardwareAccelerated() && LauncherApplication.isScreenLarge();
if (enableWallpaperEffects) {
switch (shrinkState) {
// animating in
@@ -1752,7 +1755,10 @@ public class Workspace extends SmoothPagedView
}
Display display = mLauncher.getWindowManager().getDefaultDisplay();
boolean isLandscape = display.getWidth() > display.getHeight();
- final boolean enableWallpaperEffects = isHardwareAccelerated();
+ // on phones, don't scroll the wallpaper horizontally or vertically when switching
+ // to/from all apps
+ final boolean enableWallpaperEffects =
+ isHardwareAccelerated() && LauncherApplication.isScreenLarge();
if (enableWallpaperEffects) {
switch (mShrinkState) {
// animating out