From 3f8408e2b21826ded3ba768a01fcb7837c6944ae Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 18 Jul 2017 15:14:38 -0700 Subject: [PATCH] BidiFormat wrap version code in installed app detail UI Change-Id: Ib592e4504331c4fc334ef5257e3d6d21c08098c0 Fix: 37862201 Test: visual --- src/com/android/settings/applications/InstalledAppDetails.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index d06404ef39..f1337fc4a7 100755 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -57,6 +57,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.Preference.OnPreferenceClickListener; import android.support.v7.preference.PreferenceCategory; import android.support.v7.preference.PreferenceScreen; +import android.text.BidiFormatter; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.format.Formatter; @@ -67,6 +68,7 @@ import android.view.MenuItem; import android.view.View; import android.webkit.IWebViewUpdateService; import android.widget.Button; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -83,9 +85,8 @@ import com.android.settings.applications.defaultapps.DefaultSmsPreferenceControl import com.android.settings.applications.instantapps.InstantAppButtonsController; import com.android.settings.datausage.AppDataUsage; import com.android.settings.datausage.DataUsageList; -import com.android.settings.datausage.DataUsageSummary; -import com.android.settings.development.DevelopmentSettingsEnabler; import com.android.settings.datausage.DataUsageUtils; +import com.android.settings.development.DevelopmentSettingsEnabler; import com.android.settings.fuelgauge.AdvancedPowerUsageDetail; import com.android.settings.fuelgauge.BatteryEntry; import com.android.settings.fuelgauge.BatteryStatsHelperLoader; @@ -105,6 +106,7 @@ import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.applications.StorageStatsSource.AppStorageStats; import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoader; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashSet; @@ -632,7 +634,8 @@ public class InstalledAppDetails extends AppInfoBase .setSummary(summary) .setIsInstantApp(isInstantApp) .done(activity, false /* rebindActions */); - mVersionPreference.setSummary(getString(R.string.version_text, pkgInfo.versionName)); + mVersionPreference.setSummary(getString(R.string.version_text, + BidiFormatter.getInstance().unicodeWrap(pkgInfo.versionName))); } @VisibleForTesting -- 2.11.0