Merge "Improve items arrangement in the app switcher popup" into tm-qpr-dev

2023-02-24 14:15:36 +00:00
parent 4fd0994ae5 294fe1c246
commit 050627e4f7
1 changed files with 6 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt
@@ -546,8 +546,12 @@ class ControlsUiControllerImpl @Inject constructor (
            RenderInfo.registerComponentIcon(it.componentName, it.icon)
        }

-        var adapter = ItemAdapter(context, R.layout.controls_spinner_item).apply {
-            addAll(items)
+        val adapter = ItemAdapter(context, R.layout.controls_spinner_item).apply {
+            add(selected)
+            addAll(items
+                    .filter { it !== selected }
+                    .sortedBy { it.appName.toString() }
+            )
        }

        val iconSize = context.resources