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

Sort channels and groups by id

Browse Source 
Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
This commit is contained in:
Julia Reynolds
2017-04-10 12:47:13 -04:00
parent 4c4f2a7c4c
commit 7be0dbd86c
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/notification/AppNotificationSettings.java
View File

@@ -269,11 +269,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
if (left.isDeleted() != right.isDeleted()) { if (left.isDeleted() != right.isDeleted()) {
return Boolean.compare(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()); return left.getId().compareTo(right.getId());
} }
}; };
@@ -290,12 +285,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} else if (right.getId() == null && left.getId() != null) { } else if (right.getId() == null && left.getId() != null) {
return -1; 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()); return left.getId().compareTo(right.getId());
} }
}; };