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

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

Merge "Fix app version name RTL issue" into udc-dev

parents a15c4886 6a6cfd96

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

+8 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { 
    private fun AppVersion() {

        if (packageInfo.versionName == null) return

        Spacer(modifier = Modifier.height(4.dp))

        SettingsBody(packageInfo.versionName)

        SettingsBody(packageInfo.versionNameBidiWrapped)

    }



    @Composable
@@ -84,10 +84,15 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { 
        if (packageInfo.versionName == null) return

        Divider()

        Box(modifier = Modifier.padding(SettingsDimension.itemPadding)) {

            val versionName = BidiFormatter.getInstance().unicodeWrap(packageInfo.versionName)

            SettingsBody(stringResource(R.string.version_text, versionName))

            SettingsBody(stringResource(R.string.version_text, packageInfo.versionNameBidiWrapped))

        }

    }



    private companion object {

        /** Wrapped the version name, so its directionality still keep same when RTL. */

        val PackageInfo.versionNameBidiWrapped: String

            get() = BidiFormatter.getInstance().unicodeWrap(versionName)

    }

}



@Composable