PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add temporary system property checks in addition in addition to flag checks." into main

Browse Source
This commit is contained in:
Jakob Schneider
2023-12-18 13:27:15 +00:00
committed by Android (Google) Code Review
parent 1ab510bc3c e06d787e2a
commit 5e8a4ab400
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/spa/app/appinfo/AppButtons.kt
View File

@@ -63,7 +63,7 @@ private class AppButtonsPresenter(
@Composable @Composable
private fun getActionButtons(app: ApplicationInfo): List<ActionButton> = listOfNotNull( private fun getActionButtons(app: ApplicationInfo): List<ActionButton> = listOfNotNull(
if (featureFlags.archiving()) { if (isArchivingEnabled(featureFlags)) {
if (app.isArchived) { if (app.isArchived) {
appRestoreButton.getActionButton(app) appRestoreButton.getActionButton(app)
} else { } else {

5
src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
View File

@@ -125,7 +125,7 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
title = stringResource(R.string.application_info_label), title = stringResource(R.string.application_info_label),
actions = { actions = {
packageInfoState.value?.applicationInfo?.let { app -> packageInfoState.value?.applicationInfo?.let { app ->
if (featureFlags.archiving()) TopBarAppLaunchButton(packageInfoPresenter, app) if (isArchivingEnabled(featureFlags)) TopBarAppLaunchButton(packageInfoPresenter, app)
AppInfoSettingsMoreOptions(packageInfoPresenter, app) AppInfoSettingsMoreOptions(packageInfoPresenter, app)
} }
} }
@@ -174,3 +174,6 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {
appInfoProvider.FooterAppVersion() appInfoProvider.FooterAppVersion()
} }
} }
fun isArchivingEnabled(featureFlags: FeatureFlags) =
featureFlags.archiving() || "true" == System.getProperty("pm.archiving.enabled")

2
src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
View File

@@ -166,7 +166,7 @@ class PackageInfoPresenter(
flags = PackageManager.MATCH_ANY_USER.toLong() or flags = PackageManager.MATCH_ANY_USER.toLong() or
PackageManager.MATCH_DISABLED_COMPONENTS.toLong() or PackageManager.MATCH_DISABLED_COMPONENTS.toLong() or
PackageManager.GET_PERMISSIONS.toLong() or PackageManager.GET_PERMISSIONS.toLong() or
if (featureFlags.archiving()) PackageManager.MATCH_ARCHIVED_PACKAGES else 0, if (isArchivingEnabled(featureFlags)) PackageManager.MATCH_ARCHIVED_PACKAGES else 0,
userId = userId, userId = userId,
) )
} }