Merge commit 'goog/master'

Conflicts:
	native/Android.mk

1 files changed, 7 insertions, 0 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
index 32cd8a45f..6aea5d13a 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java
@@ -430,6 +430,13 @@ public class LatinKeyboard extends Keyboard {
         Locale locale = mLanguageSwitcher.getLocaleCount() > 0
                 ? mLanguageSwitcher.getInputLocale()
                 : null;
+        // If the language count is 1 and is the same as the system language, don't show it.
+        if (locale != null
+                && mLanguageSwitcher.getLocaleCount() == 1
+                && mLanguageSwitcher.getSystemLocale().getLanguage()
+                   .equalsIgnoreCase(locale.getLanguage())) {
+            locale = null;
+        }
         if (mLocale != null && mLocale.equals(locale)) return;
         mLocale = locale;
         updateSpaceBarForLocale();