diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 1b0b3a4fd0..a0e287ae24 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2387,7 +2387,7 @@ public class LauncherModel extends BroadcastReceiver Collections.sort(allWorkspaceItems, new Comparator() { @Override public int compare(ItemInfo lhs, ItemInfo rhs) { - return Long.compare(lhs.container, rhs.container); + return Utilities.longCompare(lhs.container, rhs.container); } }); for (ItemInfo info : allWorkspaceItems) { @@ -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 Long.compare(lr, rr); + return Utilities.longCompare(lr, rr); } }); } diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index d054da31cd..2ed9a25ada 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -747,4 +747,11 @@ public final class Utilities { return msg; } } + + /** + * Replacement for Long.compare() which was added in API level 19. + */ + public static int longCompare(long lhs, long rhs) { + return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1); + } } diff --git a/src/com/android/launcher3/util/ManagedProfileHeuristic.java b/src/com/android/launcher3/util/ManagedProfileHeuristic.java index 74fc92a04e..849b05c0af 100644 --- a/src/com/android/launcher3/util/ManagedProfileHeuristic.java +++ b/src/com/android/launcher3/util/ManagedProfileHeuristic.java @@ -156,7 +156,7 @@ public class ManagedProfileHeuristic { @Override public int compare(ShortcutInfo lhs, ShortcutInfo rhs) { - return Long.compare(lhs.firstInstallTime, rhs.firstInstallTime); + return Utilities.longCompare(lhs.firstInstallTime, rhs.firstInstallTime); } });