summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2015-06-15 11:31:55 -0700
committerStephen Bird <sbird@cyngn.com>2015-06-16 00:55:03 +0000
commit2788cebadb3424cb8d47fc36a90d2542e78d32e5 (patch)
treea066c7781cbdc826a961104f297c8152f50c34b9
parent59ca19ff68b20a6dc80014c21dff29a835afb91b (diff)
downloadandroid_packages_apps_Trebuchet-2788cebadb3424cb8d47fc36a90d2542e78d32e5.tar.gz
android_packages_apps_Trebuchet-2788cebadb3424cb8d47fc36a90d2542e78d32e5.tar.bz2
android_packages_apps_Trebuchet-2788cebadb3424cb8d47fc36a90d2542e78d32e5.zip
Scrolling: Fix fade in workspaces from ignoring us
The fade in option ignores all user settings if the device is in landscape or is a tablet. Clean up the settings loading logic and ensure that the user settings are respected always. Repro Steps: - Force Rotation - kill trebuchet - scroll to new screen Change-Id: I9bc49d1abebd88ac8c95ef44ea4e874494e29e1e (cherry picked from commit 8de4b987b0a5ff9f09e59145a6ebab26a6abde73)
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index a8c7bcfdc..e4d6aa736 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -350,8 +350,6 @@ public class Workspace extends SmoothPagedView
mLauncher = (Launcher) context;
final Resources res = getResources();
- mWorkspaceFadeInAdjacentScreens = LauncherAppState.getInstance().getDynamicGrid().
- getDeviceProfile().shouldFadeAdjacentWorkspaceScreens();
mFadeInAdjacentScreens = false;
mWallpaperManager = WallpaperManager.getInstance(context);