diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-17 11:00:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-17 11:00:30 +0000 |
| commit | be57fca41a731217010d9f92554cf48708b06ecf (patch) | |
| tree | 7bedc0f6ce12d10aad0bb1ba3a75b9d3d12ad8cd /core/java | |
| parent | 49024bacf63db39467e7f318c682ad771ec0de22 (diff) | |
| parent | 788fa41482b9d398591b7db8b0b01839029611ad (diff) | |
| download | frameworks_base-be57fca41a731217010d9f92554cf48708b06ecf.zip frameworks_base-be57fca41a731217010d9f92554cf48708b06ecf.tar.gz frameworks_base-be57fca41a731217010d9f92554cf48708b06ecf.tar.bz2 | |
Merge "Extended locales in AAPT / AssetManager."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 7fc364f..3d9daca 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1569,10 +1569,7 @@ public class Resources { String locale = null; if (mConfiguration.locale != null) { - locale = mConfiguration.locale.getLanguage(); - if (mConfiguration.locale.getCountry() != null) { - locale += "-" + mConfiguration.locale.getCountry(); - } + locale = mConfiguration.locale.toLanguageTag(); } int width, height; if (mMetrics.widthPixels >= mMetrics.heightPixels) { |