Settings: Always show package name in installed app details (498f7414) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt

+3 −14

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.res.stringResource
		import androidx.compose.ui.semantics.semantics
		import androidx.compose.ui.unit.Dp
		import com.android.settingslib.development.DevelopmentSettingsEnabler
		import com.android.settingslib.spa.framework.compose.rememberDrawablePainter
		import com.android.settingslib.spa.framework.theme.SettingsDimension
		import com.android.settingslib.spa.widget.ui.CopyableBody
		@@ -87,16 +86,14 @@ class AppInfoProvider(private val packageInfo: PackageInfo) {
		}

		@Composable
		fun FooterAppVersion(showPackageName: Boolean = rememberIsDevelopmentSettingsEnabled()) {
		fun FooterAppVersion() {
		val context = LocalContext.current
		val footer = remember(packageInfo, showPackageName) {
		val footer = remember(packageInfo) {
		val list = mutableListOf<String>()
		packageInfo.versionNameBidiWrapped?.let {
		list += context.getString(R.string.version_text, it)
		}
		if (showPackageName) {
		list += packageInfo.packageName
		}
		list.joinToString(separator = System.lineSeparator())
		}
		if (footer.isBlank()) return
		@@ -106,14 +103,6 @@ class AppInfoProvider(private val packageInfo: PackageInfo) {
		}
		}

		@Composable
		private fun rememberIsDevelopmentSettingsEnabled(): Boolean {
		val context = LocalContext.current
		return remember {
		DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)
		}
		}

		private companion object {
		/** Wrapped the version name, so its directionality still keep same when RTL. */
		val PackageInfo.versionNameBidiWrapped: String?