PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sort orders on longs."

Browse Source
This commit is contained in:
Ian Rogers
2016-06-07 15:49:49 +00:00
committed by Android (Google) Code Review
parent 6304854536 03936cea60
commit d7b28f70b0
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/settings/UsageStatsActivity.java
View File

@@ -75,14 +75,14 @@ public class UsageStatsActivity extends Activity implements OnItemSelectedListen
@Override @Override
public final int compare(UsageStats a, UsageStats b) { public final int compare(UsageStats a, UsageStats b) {
// return by descending order // return by descending order
return (int)(b.getLastTimeUsed() - a.getLastTimeUsed()); return Long.compare(b.getLastTimeUsed(), a.getLastTimeUsed());
} }
} }
public static class UsageTimeComparator implements Comparator<UsageStats> { public static class UsageTimeComparator implements Comparator<UsageStats> {
@Override @Override
public final int compare(UsageStats a, UsageStats b) { public final int compare(UsageStats a, UsageStats b) {
return (int)(b.getTotalTimeInForeground() - a.getTotalTimeInForeground()); return Long.compare(b.getTotalTimeInForeground(), a.getTotalTimeInForeground());
} }
} }

2
src/com/android/settings/notification/NotificationStation.java
View File

@@ -133,7 +133,7 @@ public class NotificationStation extends SettingsPreferenceFragment {
@Override @Override
public int compare(HistoricalNotificationInfo lhs, public int compare(HistoricalNotificationInfo lhs,
HistoricalNotificationInfo rhs) { HistoricalNotificationInfo rhs) {
return (int)(rhs.timestamp - lhs.timestamp); return Long.compare(rhs.timestamp, lhs.timestamp);
} }
}; };