From 8ec56141ef8bc435fed656f4df408560a487e636 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 28 Sep 2022 20:40:27 +0800 Subject: [PATCH] Show install type label for instant app To indicate an instant app in App Settings page. Bug: 236346018 Test: App Settings page with Instant App Change-Id: I6cc470c609067ff4f205fbf4fbf60e1e520b84bc --- .../spaprivileged/template/app/AppInfo.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt index c89ffe560eb72..9611b136d8816 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt @@ -53,14 +53,23 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { ), horizontalAlignment = Alignment.CenterHorizontally, ) { + val app = packageInfo.applicationInfo Box(modifier = Modifier.padding(SettingsDimension.itemPaddingAround)) { - AppIcon(app = packageInfo.applicationInfo, size = SettingsDimension.appIconInfoSize) + AppIcon(app = app, size = SettingsDimension.appIconInfoSize) } - AppLabel(packageInfo.applicationInfo) + AppLabel(app) + InstallType(app) if (displayVersion) AppVersion() } } + @Composable + private fun InstallType(app: ApplicationInfo) { + if (!app.isInstantApp) return + Spacer(modifier = Modifier.height(4.dp)) + SettingsBody(stringResource(R.string.install_type_instant)) + } + @Composable private fun AppVersion() { if (packageInfo.versionName == null) return