summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-07-19 18:13:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-19 18:13:20 +0000
commit0b5f8f82e3d4bf5664a39aa89b99872227ed6951 (patch)
treed7e5991a643ec7c3a9adee5cb8b69eaa5f4ed1d1 /src/com/android/launcher3
parent6aa29a823a6a297ea6658524ec602b667e934387 (diff)
parent7d522f885cf9a8bad056c056d9eb4cd7867d5ba9 (diff)
downloadandroid_packages_apps_Trebuchet-0b5f8f82e3d4bf5664a39aa89b99872227ed6951.tar.gz
android_packages_apps_Trebuchet-0b5f8f82e3d4bf5664a39aa89b99872227ed6951.tar.bz2
android_packages_apps_Trebuchet-0b5f8f82e3d4bf5664a39aa89b99872227ed6951.zip
Merge changes from topic 'am-121e73e9-eff7-4ee5-aecf-aaaaf9cc4eb5' into ub-launcher3-dorval-polish2
* changes: Fix regression which broke Workspace flings in RTL am: 5360b6ee4f Fix regression which broke Workspace flings in RTL
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 0d7e4fa56..f781a3d1d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1401,7 +1401,7 @@ public class Workspace extends PagedView
@Override
protected boolean shouldFlingForVelocity(int velocityX) {
// When the overlay is moving, the fling or settle transition is controlled by the overlay.
- return Float.compare(mOverlayTranslation, 0) == 0 &&
+ return Float.compare(Math.abs(mOverlayTranslation), 0) == 0 &&
super.shouldFlingForVelocity(velocityX);
}