commit 51a760a0f2788950b260dcabbc81d638ecfc6acd
author Roozbeh Pournader <roozbeh@google.com> Thu Jun 23 20:01:01 2016 +0000
committer Roozbeh Pournader <roozbeh@google.com> Thu Jun 23 20:01:01 2016 +0000
tree 2754898e7ab36918dacb6a1aa3e2748d178306c0
parent ad48dc18a55313095b7a777bef6d66faa40ef7dd

Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""

This reverts commit ad48dc18a55313095b7a777bef6d66faa40ef7dd. sr-Latn is no
longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I1922ef649aab36be6ba3b94e3fd79a71a14acdff

core/java/com/android/internal/app/LocaleStore.java

diff --git a/core/java/com/android/internal/app/LocaleStore.java b/core/java/com/android/internal/app/LocaleStore.java
index e3fce51..e782c3c 100644
--- a/core/java/com/android/internal/app/LocaleStore.java
+++ b/core/java/com/android/internal/app/LocaleStore.java
@@ -307,6 +307,9 @@
             localizedLocales.add(li.getLangScriptKey());
         }
 
+        // Serbian in Latin script is only partially localized in N.
+        localizedLocales.remove("sr-Latn");
+
         for (LocaleInfo li : sLocaleCache.values()) {
             li.setTranslated(localizedLocales.contains(li.getLangScriptKey()));
         }