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

Commit 9930e3dc authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23407776



Change-Id: Ia1c6f0f05cc217e155671a42c13997a7567fda5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1427dc37 e1532234

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