aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing other missing cases of truncated sorts." into ub-launcher3-burnaby-polish

Browse Source
This commit is contained in:
Winson Chung
2015-09-30 00:06:55 +00:00
committed by Android (Google) Code Review
parent 58ecbe40f6 46a06da01c
commit 850de64c0d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/launcher3/InvariantDeviceProfile.java
View File

@@ -252,8 +252,8 @@ public class InvariantDeviceProfile {
ArrayList<InvariantDeviceProfile> pointsByNearness = points;
Collections.sort(pointsByNearness, new Comparator<InvariantDeviceProfile>() {
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));
}
});

2
src/com/android/launcher3/LauncherModel.java
View File

@@ -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);
}
});
}