Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia57c1347977562827e2f3d136a15033b120a5465
This commit is contained in:
Matt Pietal
2020-06-03 17:36:58 +00:00
committed by Automerger Merge Worker
parent 7b27b4f306 de54cb473e
commit 4cecd4bc26
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,10 @@ class ControlsUiControllerImpl @Inject constructor (
SelectionItem(it.loadLabel(), "", it.loadIcon(), it.componentName) SelectionItem(it.loadLabel(), "", it.loadIcon(), it.componentName)
} }
uiExecutor.execute { uiExecutor.execute {
onResult(lastItems) parent.removeAllViews()
if (lastItems.size > 0) {
onResult(lastItems)
}
} }
} }
} }
@@ -189,8 +192,6 @@ class ControlsUiControllerImpl @Inject constructor (
} }
private fun showSeedingView(items: List<SelectionItem>) { private fun showSeedingView(items: List<SelectionItem>) {
parent.removeAllViews()
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
inflater.inflate(R.layout.controls_no_favorites, parent, true) inflater.inflate(R.layout.controls_no_favorites, parent, true)
val subtitle = parent.requireViewById<TextView>(R.id.controls_subtitle) val subtitle = parent.requireViewById<TextView>(R.id.controls_subtitle)
@@ -198,8 +199,6 @@ class ControlsUiControllerImpl @Inject constructor (
} }
private fun showInitialSetupView(items: List<SelectionItem>) { private fun showInitialSetupView(items: List<SelectionItem>) {
parent.removeAllViews()
val inflater = LayoutInflater.from(context) val inflater = LayoutInflater.from(context)
inflater.inflate(R.layout.controls_no_favorites, parent, true) inflater.inflate(R.layout.controls_no_favorites, parent, true)
@@ -263,7 +262,6 @@ class ControlsUiControllerImpl @Inject constructor (
} }
private fun showControlsView(items: List<SelectionItem>) { private fun showControlsView(items: List<SelectionItem>) {
parent.removeAllViews()
controlViewsById.clear() controlViewsById.clear()
createListView() createListView()