resolved conflicts for 850de64c to ub-launcher3-master
Change-Id: Ica4893082f03afe76abd42dca44016eb9e436c35
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 27cfd63..97a5559 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2445,11 +2445,11 @@
lhs.cellY * screenCols + lhs.cellX);
long rr = (rhs.screenId * screenCellCount +
rhs.cellY * screenCols + rhs.cellX);
- return (int) (lr - rr);
+ return Long.compare(lr, rr);
}
case LauncherSettings.Favorites.CONTAINER_HOTSEAT: {
// We currently use the screen id as the rank
- return (int) (lhs.screenId - rhs.screenId);
+ return Long.compare(lhs.screenId, rhs.screenId);
}
default:
if (ProviderConfig.IS_DOGFOOD_BUILD) {
@@ -2460,7 +2460,7 @@
}
} else {
// Between containers, order by hotseat, desktop
- return (int) (lhs.container - rhs.container);
+ return Long.compare(lhs.container, rhs.container);
}
}
});