Merge "Update for MoreOptionsAction"

This commit is contained in:
Chaohui Wang
2022-11-18 02:06:01 +00:00
committed by Android (Google) Code Review

View File

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