Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd83c491 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Handle all apps removed" into rvc-dev am: de54cb47 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11718264

Change-Id: Ib4b6176e24f15b78d001bba64e2f43c8ff784746
parents edcebdb9 de54cb47

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+4 −6
Original line number Diff line number Diff line
@@ -129,12 +129,15 @@ class ControlsUiControllerImpl @Inject constructor ( 
                        SelectionItem(it.loadLabel(), "", it.loadIcon(), it.componentName)

                    }

                    uiExecutor.execute {

                        parent.removeAllViews()

                        if (lastItems.size > 0) {

                            onResult(lastItems)

                        }

                    }

                }

            }

        }

    }



    override fun show(parent: ViewGroup, dismissGlobalActions: Runnable) {

        Log.d(ControlsUiController.TAG, "show()")
@@ -189,8 +192,6 @@ class ControlsUiControllerImpl @Inject constructor ( 
    }



    private fun showSeedingView(items: List<SelectionItem>) {

        parent.removeAllViews()



        val inflater = LayoutInflater.from(context)

        inflater.inflate(R.layout.controls_no_favorites, parent, true)

        val subtitle = parent.requireViewById<TextView>(R.id.controls_subtitle)
@@ -198,8 +199,6 @@ class ControlsUiControllerImpl @Inject constructor ( 
    }



    private fun showInitialSetupView(items: List<SelectionItem>) {

        parent.removeAllViews()



        val inflater = LayoutInflater.from(context)

        inflater.inflate(R.layout.controls_no_favorites, parent, true)
@@ -263,7 +262,6 @@ class ControlsUiControllerImpl @Inject constructor ( 
    }



    private fun showControlsView(items: List<SelectionItem>) {

        parent.removeAllViews()

        controlViewsById.clear()



        createListView()