Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 850de64c authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents 58ecbe40 46a06da0

src/com/android/launcher3/InvariantDeviceProfile.java

+2 −2
Original line number Diff line number Diff line
@@ -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));

            }

        });

src/com/android/launcher3/LauncherModel.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

            });

        }