From 46a06da01cded4ba355381be41455f85f85369fa Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 29 Sep 2015 16:58:02 -0700 Subject: Fixing other missing cases of truncated sorts. Bug: 24505761 Change-Id: I9b9358e8b134f0c4aac32ac536d9c8a1f0629957 --- src/com/android/launcher3/InvariantDeviceProfile.java | 4 ++-- src/com/android/launcher3/LauncherModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index ae204c40c..ae430e049 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -252,8 +252,8 @@ public class InvariantDeviceProfile { ArrayList pointsByNearness = points; Collections.sort(pointsByNearness, new Comparator() { public int compare(InvariantDeviceProfile a, InvariantDeviceProfile b) { - return (int) (dist(width, height, a.minWidthDps, a.minHeightDps) - - dist(width, height, b.minWidthDps, b.minHeightDps)); + return Float.compare(dist(width, height, a.minWidthDps, a.minHeightDps), + dist(width, height, b.minWidthDps, b.minHeightDps)); } }); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e1cd298e3..1b0b3a4fd 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2469,7 +2469,7 @@ public class LauncherModel extends BroadcastReceiver lhs.cellY * cellCountX + lhs.cellX); long rr = (rhs.container * containerOffset + rhs.screenId * screenOffset + rhs.cellY * cellCountX + rhs.cellX); - return (int) (lr - rr); + return Long.compare(lr, rr); } }); } -- cgit v1.2.3