DO NOT MERGE
Change sorting strategy when DO state changes in app launcher.
Per UXR b/80304586, removing the re-sorting strategy for now until I have solid requirements from them.
Bug: 80304586
Test: Use "adb shell dumpsys activity service com.android.car inject-vhal-event 0x11400400 8 && adb shell dumpsys activity service com.android.car inject-vhal-event 0x11600207 30" to simulate driving events
Change-Id: I33c9b25e0726eb8e42d449bb635060b301e78ff0
diff --git a/src/com/android/car/carlauncher/AppGridAdapter.java b/src/com/android/car/carlauncher/AppGridAdapter.java
index 2852a08..4f6e34a 100644
--- a/src/com/android/car/carlauncher/AppGridAdapter.java
+++ b/src/com/android/car/carlauncher/AppGridAdapter.java
@@ -121,11 +121,7 @@
private void sortAllApps() {
if (mApps != null) {
- Comparator<AppMetaData> comparator =
- mIsDistractionOptimizationRequired
- ? AppLauncherUtils.DISTRACTION_OPTIMIZED_COMPARATOR
- : AppLauncherUtils.ALPHABETICAL_COMPARATOR;
- Collections.sort(mApps, comparator);
+ Collections.sort(mApps, AppLauncherUtils.ALPHABETICAL_COMPARATOR);
}
}
}
\ No newline at end of file
diff --git a/src/com/android/car/carlauncher/AppLauncherUtils.java b/src/com/android/car/carlauncher/AppLauncherUtils.java
index e48d23e..30e4ae6 100644
--- a/src/com/android/car/carlauncher/AppLauncherUtils.java
+++ b/src/com/android/car/carlauncher/AppLauncherUtils.java
@@ -46,16 +46,6 @@
/**
* Comparator for {@link AppMetaData} that sorts the list
- * first by is distraction optimized in descending order (optimized apps first)
- * then by the "displayName" property in ascending order.
- * Used when distraction optimization is required.
- */
- static final Comparator<AppMetaData> DISTRACTION_OPTIMIZED_COMPARATOR = Comparator
- .comparing(AppMetaData::getIsDistractionOptimized).reversed()
- .thenComparing(AppMetaData::getDisplayName, String::compareToIgnoreCase);
-
- /**
- * Comparator for {@link AppMetaData} that sorts the list
* by the "displayName" property in ascending order.
*/
static final Comparator<AppMetaData> ALPHABETICAL_COMPARATOR = Comparator
