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

Merge "Add app removal dialog button check" into udc-dev

Browse Source
This commit is contained in:
Anton Potapov
2023-03-15 16:33:53 +00:00
committed by Android (Google) Code Review
parent c1dfe6f64f 17c54fbc6e
commit 244087bf0a
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,8 +327,8 @@ class ControlsUiControllerImpl @Inject constructor (
@VisibleForTesting
internal fun startRemovingApp(componentName: ComponentName, appName: CharSequence) {
removeAppDialog?.cancel()
removeAppDialog = dialogsFactory.createRemoveAppDialog(context, appName) {
if (!controlsController.get().removeFavorites(componentName)) {
removeAppDialog = dialogsFactory.createRemoveAppDialog(context, appName) { shouldRemove ->
if (!shouldRemove || !controlsController.get().removeFavorites(componentName)) {
return@createRemoveAppDialog
}

24
packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsUiControllerImplTest.kt
View File

@@ -347,7 +347,7 @@ class ControlsUiControllerImplTest : SysuiTestCase() {
whenever(controlsController.removeFavorites(eq(componentName))).thenReturn(true)
val panel = SelectedItem.PanelItem("App name", componentName)
preferredPanelRepository.setSelectedComponent(
SelectedComponentRepository.SelectedComponent(panel)
SelectedComponentRepository.SelectedComponent(panel)
)
underTest.show(parent, {}, context)
underTest.startRemovingApp(componentName, "Test App")
@@ -361,6 +361,26 @@ class ControlsUiControllerImplTest : SysuiTestCase() {
assertThat(preferredPanelRepository.getSelectedComponent()).isNull()
}
@Test
fun testCancelRemovingAppsDoesntRemoveFavorite() {
val componentName = ComponentName(context, "cls")
whenever(controlsController.removeFavorites(eq(componentName))).thenReturn(true)
val panel = SelectedItem.PanelItem("App name", componentName)
preferredPanelRepository.setSelectedComponent(
SelectedComponentRepository.SelectedComponent(panel)
)
underTest.show(parent, {}, context)
underTest.startRemovingApp(componentName, "Test App")
fakeDialogController.clickNeutral()
verify(controlsController, never()).removeFavorites(eq(componentName))
assertThat(underTest.getPreferredSelectedItem(emptyList())).isEqualTo(panel)
assertThat(preferredPanelRepository.shouldAddDefaultComponent()).isTrue()
assertThat(preferredPanelRepository.getSelectedComponent())
.isEqualTo(SelectedComponentRepository.SelectedComponent(panel))
}
@Test
fun testHideCancelsTheRemoveAppDialog() {
val componentName = ComponentName(context, "cls")
@@ -375,7 +395,7 @@ class ControlsUiControllerImplTest : SysuiTestCase() {
private fun setUpPanel(panel: SelectedItem.PanelItem): ControlsServiceInfo {
val activity = ComponentName(context, "activity")
preferredPanelRepository.setSelectedComponent(
SelectedComponentRepository.SelectedComponent(panel)
SelectedComponentRepository.SelectedComponent(panel)
)
return ControlsServiceInfo(panel.componentName, panel.appName, activity)
}