diff options
| author | Mario Bertschler <bmario@google.com> | 2016-12-29 23:33:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-29 23:33:01 +0000 |
| commit | 83d40e0608cdb93b0c60da92527391c1dc4e3593 (patch) | |
| tree | b9e00e6806743e2433dfc90262ffbb313f0f431d /src/com/android/launcher3/Workspace.java | |
| parent | 8ad02b8f3f3512cdb8eafba6da4483641bf24efc (diff) | |
| parent | dcc26fc69362c8b7a29dab75fc5df767d6edbf31 (diff) | |
| download | android_packages_apps_Trebuchet-83d40e0608cdb93b0c60da92527391c1dc4e3593.tar.gz android_packages_apps_Trebuchet-83d40e0608cdb93b0c60da92527391c1dc4e3593.tar.bz2 android_packages_apps_Trebuchet-83d40e0608cdb93b0c60da92527391c1dc4e3593.zip | |
Merge "Fixes a bug where the user ends in freescroll state even for regular workspace mode." into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index bf774e617..fccff6cf4 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4103,6 +4103,16 @@ public class Workspace extends PagedView } } + @Override + public boolean enableFreeScroll() { + if (getState() == State.OVERVIEW) { + return super.enableFreeScroll(); + } else { + Log.w(TAG, "enableFreeScroll called but not in overview: state=" + getState()); + return false; + } + } + /** * Used as a workaround to ensure that the AppWidgetService receives the * PACKAGE_ADDED broadcast before updating widgets. |