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

Merge "Sort Uncategorized channel to the bottom." into pi-dev am: 97f63ba910

Browse Source 
am: 3aaf3bcc52

Change-Id: Ibd106a3ce049eb90263f69878088b91e3e8dc359
This commit is contained in:
Alison Cichowlas
2018-03-16 16:23:48 +00:00
committed by android-build-merger
parent e827f1528c 3aaf3bcc52
commit b9ef0adf66
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -355,7 +355,13 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
(left, right) -> { (left, right) -> {
if (left.isDeleted() != right.isDeleted()) { if (left.isDeleted() != right.isDeleted()) {
return Boolean.compare(left.isDeleted(), right.isDeleted()); return Boolean.compare(left.isDeleted(), right.isDeleted());
} else if (left.getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) {
// Uncategorized/miscellaneous legacy channel goes last
return 1;
} else if (right.getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) {
return -1;
} }
return left.getId().compareTo(right.getId()); return left.getId().compareTo(right.getId());
}; };