resolved conflicts for 1845049c to ub-launcher3-master
Change-Id: I25a01a0735be754f4c8daef5a4a04eaec651b95c
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index cd4f39c..5711db0 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2346,7 +2346,7 @@
Collections.sort(allWorkspaceItems, new Comparator<ItemInfo>() {
@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) {
@@ -2429,11 +2429,11 @@
lhs.cellY * screenCols + lhs.cellX);
long rr = (rhs.screenId * screenCellCount +
rhs.cellY * screenCols + rhs.cellX);
- return Long.compare(lr, rr);
+ return Utilities.longCompare(lr, rr);
}
case LauncherSettings.Favorites.CONTAINER_HOTSEAT: {
// We currently use the screen id as the rank
- return Long.compare(lhs.screenId, rhs.screenId);
+ return Utilities.longCompare(lhs.screenId, rhs.screenId);
}
default:
if (ProviderConfig.IS_DOGFOOD_BUILD) {
@@ -2444,7 +2444,7 @@
}
} else {
// Between containers, order by hotseat, desktop
- return Long.compare(lhs.container, rhs.container);
+ return Utilities.longCompare(lhs.container, rhs.container);
}
}
});
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 082800c..eef7a41 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -771,4 +771,11 @@
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 74fc92a..849b05c 100644
--- a/src/com/android/launcher3/util/ManagedProfileHeuristic.java
+++ b/src/com/android/launcher3/util/ManagedProfileHeuristic.java
@@ -156,7 +156,7 @@
@Override
public int compare(ShortcutInfo lhs, ShortcutInfo rhs) {
- return Long.compare(lhs.firstInstallTime, rhs.firstInstallTime);
+ return Utilities.longCompare(lhs.firstInstallTime, rhs.firstInstallTime);
}
});