commit 665c1ced58bb119716fbd99118e41c13f1fd1fa0
author Julia Reynolds <juliacr@google.com> Tue Apr 11 19:18:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 11 19:18:53 2017 +0000
tree 2cf490969aaa39571453ea06d33d5718b26354ea
parent 9234a34a8027087bb7abaaa9e269052d16c370eb
parent 7be0dbd86cb42fc49cfb4119c5e806d57596ffb2

Merge "Sort channels and groups by id" into oc-dev

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

diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index c38b89d..78b9b1e 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -269,11 +269,6 @@
             if (left.isDeleted() != right.isDeleted()) {
                 return Boolean.compare(left.isDeleted(), right.isDeleted());
             }
-            CharSequence leftName = left.getName();
-            CharSequence rightName = right.getName();
-            if (!Objects.equals(leftName, rightName)) {
-                return sCollator.compare(leftName.toString(), rightName.toString());
-            }
             return left.getId().compareTo(right.getId());
         }
     };
@@ -290,12 +285,6 @@
                     } else if (right.getId() == null && left.getId() != null) {
                         return -1;
                     }
-                    CharSequence leftName = left.getName();
-                    CharSequence rightName = right.getName();
-                    // sort rest of the groups by name
-                    if (!Objects.equals(leftName, rightName)) {
-                        return sCollator.compare(leftName.toString(), rightName.toString());
-                    }
                     return left.getId().compareTo(right.getId());
                 }
             };