commit 97f63ba910182adc0123c8282914c48ab3cbb2dc
author Alison Cichowlas <asc@google.com> Fri Mar 16 15:44:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 16 15:44:12 2018 +0000
tree e3c75382486a84ff972f22943cd8d2850c9bac3d
parent 2483a40841784d581fcfb850c154fd0add730fbc
parent 83ca82f749a025fc09f9c1c026454a2f5eb915a7

Merge "Sort Uncategorized channel to the bottom." into pi-dev

src/com/android/settings/notification/NotificationSettingsBase.java

diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index a4310a1..01f9e88 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -355,7 +355,13 @@
             (left, right) -> {
                 if (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());
             };