diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-07-14 15:50:49 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-07-15 12:56:04 -0700 |
| commit | 5cd9dde5a2a77c5095f985186d8f03147fd22870 (patch) | |
| tree | de571251d8be1d3b2ee697e7b3a4b6df0490de6a /core/java/android/content | |
| parent | 39b88cdb35e11e60d8dbe4924fc2b9fbce3c595d (diff) | |
| download | frameworks_base-5cd9dde5a2a77c5095f985186d8f03147fd22870.zip frameworks_base-5cd9dde5a2a77c5095f985186d8f03147fd22870.tar.gz frameworks_base-5cd9dde5a2a77c5095f985186d8f03147fd22870.tar.bz2 | |
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 9625578..38ddede 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1711,7 +1711,7 @@ public class Resources { String locale = null; if (mConfiguration.locale != null) { - locale = adjustLanguageTag(localeToLanguageTag(mConfiguration.locale)); + locale = adjustLanguageTag(mConfiguration.locale.toLanguageTag()); } int width, height; if (mMetrics.widthPixels >= mMetrics.heightPixels) { @@ -1800,12 +1800,6 @@ public class Resources { } } - // Locale.toLanguageTag() is not available in Java6. LayoutLib overrides - // this method to enable users to use Java6. - private String localeToLanguageTag(Locale locale) { - return locale.toLanguageTag(); - } - /** * {@code Locale.toLanguageTag} will transform the obsolete (and deprecated) * language codes "in", "ji" and "iw" to "id", "yi" and "he" respectively. |