diff options
Diffstat (limited to 'chromium/ui/base/l10n/l10n_util_android.cc')
| -rw-r--r-- | chromium/ui/base/l10n/l10n_util_android.cc | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/chromium/ui/base/l10n/l10n_util_android.cc b/chromium/ui/base/l10n/l10n_util_android.cc index 62d919bdc80..154b6759711 100644 --- a/chromium/ui/base/l10n/l10n_util_android.cc +++ b/chromium/ui/base/l10n/l10n_util_android.cc @@ -17,10 +17,6 @@ namespace l10n_util { -jboolean IsRTL(JNIEnv* env, jclass clazz) { - return base::i18n::IsRTL(); -} - jint GetFirstStrongCharacterDirection(JNIEnv* env, jclass clazz, jstring string) { return base::i18n::GetFirstStrongCharacterDirection( @@ -34,6 +30,20 @@ std::string GetDefaultLocale() { return ConvertJavaStringToUTF8(locale); } +bool IsLayoutRtl() { + static bool is_layout_rtl_cached = false; + static bool layout_rtl_cache; + + if (!is_layout_rtl_cached) { + is_layout_rtl_cached = true; + JNIEnv* env = base::android::AttachCurrentThread(); + layout_rtl_cache = + static_cast<bool>(Java_LocalizationUtils_isLayoutRtl(env)); + } + + return layout_rtl_cache; +} + namespace { // Common prototype of ICU uloc_getXXX() functions. @@ -73,8 +83,8 @@ ScopedJavaLocalRef<jobject> NewJavaLocale( } // namespace -string16 GetDisplayNameForLocale(const std::string& locale, - const std::string& display_locale) { +base::string16 GetDisplayNameForLocale(const std::string& locale, + const std::string& display_locale) { JNIEnv* env = base::android::AttachCurrentThread(); ScopedJavaLocalRef<jobject> java_locale = NewJavaLocale(env, locale); @@ -93,7 +103,8 @@ jstring GetDurationString(JNIEnv* env, jclass clazz, jlong timeInMillis) { ScopedJavaLocalRef<jstring> jtime_remaining = base::android::ConvertUTF16ToJavaString( env, - ui::TimeFormat::TimeRemaining( + ui::TimeFormat::Simple( + ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_SHORT, base::TimeDelta::FromMilliseconds(timeInMillis))); return jtime_remaining.Release(); } |