summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Bird <sbird@cyngn.com>2015-06-15 18:31:55 (GMT)
committerStephen Bird <sbird@cyngn.com>2015-06-16 00:56:03 (GMT)
commit89b0017aebb61c7d2ab5944eb38e8c29b14c51b4 (patch)
tree04f94998e32a549c1992149c198a7491d5bcd587
parent36fcac12c25d0cc733ed0d4a90889d140434fd07 (diff)
downloadandroid_packages_apps_Trebuchet-89b0017aebb61c7d2ab5944eb38e8c29b14c51b4.zip
android_packages_apps_Trebuchet-89b0017aebb61c7d2ab5944eb38e8c29b14c51b4.tar.gz
android_packages_apps_Trebuchet-89b0017aebb61c7d2ab5944eb38e8c29b14c51b4.tar.bz2
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) (cherry picked from commit 2788cebadb3424cb8d47fc36a90d2542e78d32e5)
-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 a0b99e5..a4350e7 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -352,8 +352,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);