Merge "Sort channels and groups by id" into oc-dev (665c1ced) · Commits · e / os / android_packages_apps_Settings

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -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());
		}
		};