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:55:07 (GMT)
commitdc157cb8ebb6e874e1880bb96bbb407be573baf4 (patch)
treeafd9c0b2007216e39e0ca4806ca755b4fba5b93e
parent60b6aa9ddd3ae098fe6096e153b3f278d3d06055 (diff)
downloadandroid_packages_apps_Trebuchet-dc157cb8ebb6e874e1880bb96bbb407be573baf4.zip
android_packages_apps_Trebuchet-dc157cb8ebb6e874e1880bb96bbb407be573baf4.tar.gz
android_packages_apps_Trebuchet-dc157cb8ebb6e874e1880bb96bbb407be573baf4.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)
-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 ccca0d6..43baa96 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);