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

Merge "Sort channels and groups by id" into oc-dev am: 665c1ced58

Browse Source 
am: 80f06dc54c

Change-Id: Ic8dbeaadda4f3f322f7afb60204fe817e19388fa
This commit is contained in:
Julia Reynolds
2017-04-11 19:47:16 +00:00
committed by android-build-merger
parent ad3843f4e4 80f06dc54c
commit a38202fb5e
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()) {
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 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} 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());
}
};