commit 271d59bec4ebf46e355e67771084f132f13cff64
author Chaohui Wang <chaohuiw@google.com> Thu Nov 17 12:56:50 2022 +0800
committer Chaohui Wang <chaohuiw@google.com> Thu Nov 17 13:05:12 2022 +0800
tree c2d53e33cfc22e7679d5067d145dd1f1b3047fd6
parent 386eac8b5c2b40562fa55d39d7d44cedf5792206

Update for MoreOptionsAction

Bug: 259492166
Test: Manually with Settings
Change-Id: I0b0b570a456d9464043a221a628ed33c19d780df

src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt

diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
index eb3ca48..0e965ac 100644
--- a/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettingsMoreOptions.kt
@@ -18,8 +18,6 @@
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
@@ -47,24 +45,16 @@
     val shownUninstallUpdates = remember(app) { isShowUninstallUpdates(context, app) }
     val shownUninstallForAllUsers = remember(app) { isShowUninstallForAllUsers(context, app) }
     if (!shownUninstallUpdates && !shownUninstallForAllUsers) return
-    MoreOptionsAction { onDismissRequest ->
+    MoreOptionsAction {
         if (shownUninstallUpdates) {
-            DropdownMenuItem(
-                text = { Text(stringResource(R.string.app_factory_reset)) },
-                onClick = {
-                    onDismissRequest()
-                    packageInfoPresenter.startUninstallActivity(forAllUsers = false)
-                },
-            )
+            MenuItem(text = stringResource(R.string.app_factory_reset)) {
+                packageInfoPresenter.startUninstallActivity(forAllUsers = false)
+            }
         }
         if (shownUninstallForAllUsers) {
-            DropdownMenuItem(
-                text = { Text(stringResource(R.string.uninstall_all_users_text)) },
-                onClick = {
-                    onDismissRequest()
-                    packageInfoPresenter.startUninstallActivity(forAllUsers = true)
-                },
-            )
+            MenuItem(text = stringResource(R.string.uninstall_all_users_text)) {
+                packageInfoPresenter.startUninstallActivity(forAllUsers = true)
+            }
         }
     }
 }