Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b083ac authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Refresh the app version and size" into main

parents 8165397f 3f313cf9

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { 
    @Composable

    fun FooterAppVersion(showPackageName: Boolean = rememberIsDevelopmentSettingsEnabled()) {

        val context = LocalContext.current

        val footer = remember(showPackageName) {

        val footer = remember(packageInfo, showPackageName) {

            val list = mutableListOf<String>()

            packageInfo.versionNameBidiWrapped?.let {

                list += context.getString(R.string.version_text, it)

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ private const val TAG = "AppStorageSize" 
@Composable

fun ApplicationInfo.getStorageSize(): State<String> {

    val context = LocalContext.current

    return remember {

    return remember(this) {

        flow {

            val sizeBytes = calculateSizeBytes(context)

            this.emit(if (sizeBytes != null) Formatter.formatFileSize(context, sizeBytes) else "")