commit 8660cf5d1b9d10eb969c8bbc908994e6affe33f6
author Winson <winsonc@google.com> Fri Sep 25 23:23:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 25 23:23:56 2015 +0000
tree f9512b931528e2531171bd21fa63ff04562d7427
parent 25beed886fe733465f666b8bad4fadb636ced4e3
parent 17e2d49547eb8d068b1ba816c6226cf5ef77369d

am 17e2d495: Use Long.compare() instead of truncating values for comparison.

* commit '17e2d49547eb8d068b1ba816c6226cf5ef77369d':
  Use Long.compare() instead of truncating values for comparison.

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 0f043ce..27cfd63 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2362,7 +2362,7 @@
             Collections.sort(allWorkspaceItems, new Comparator<ItemInfo>() {
                 @Override
                 public int compare(ItemInfo lhs, ItemInfo rhs) {
-                    return (int) (lhs.container - rhs.container);
+                    return Long.compare(lhs.container, rhs.container);
                 }
             });
             for (ItemInfo info : allWorkspaceItems) {