diff --git a/java/res/values-xlarge/config.xml b/java/res/values-xlarge/config.xml
new file mode 100644
index 000000000..0a1d4e48d
--- /dev/null
+++ b/java/res/values-xlarge/config.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ medium
+
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 0bb0e337d..14b8d0060 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -32,6 +32,7 @@
400
1200
800
+ small
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 3e034a028..fe2e2e236 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -36,9 +36,9 @@
Word suggestion settings
-
+
- Auto-capitalization
+ Auto-capitalization
Quick fixes
@@ -81,7 +81,7 @@
%s : Saved
-
+
Go
@@ -104,16 +104,16 @@
Voice input
-
+
Voice input is not currently supported for your language, but does work in English.
-
+
Voice input uses Google\'s speech recognition. The Mobile Privacy Policy applies.
-
+
To turn off voice input, go to input method settings.
@@ -121,7 +121,7 @@
To use voice input, press the microphone button.
-
+
Speak now
@@ -136,7 +136,7 @@
Couldn\'t connect
-
+
Error, too much speech.
@@ -153,8 +153,7 @@
No matches found
-
+
Voice search not installed
@@ -188,10 +187,10 @@
Input languages
Slide finger on spacebar to change language
-
+
\u2190 Touch again to save
-
+
Dictionary available
@@ -210,10 +209,10 @@
Czech Keyboard
Danish Keyboard
German Keyboard
- English (United Kingdom) Keyboard
- English (United States) Keyboard
+ English (UK) Keyboard
+ English (US) Keyboard
Spanish Keyboard
- Spanish (United States) Keyboard
+ Spanish (US) Keyboard
French Keyboard
French (Canada) Keyboard
French (Switzerland) Keyboard
@@ -227,10 +226,10 @@
Czech Voice
German Voice
English (Australia) Voice
- English (United Kingdom) Voice
+ English (UK) Voice
English (India) Voice
English (New Zealand) Voice
- English (United States) Voice
+ English (US) Voice
Spanish Voice
French Voice
Japanese Voice
@@ -239,8 +238,8 @@
Portuguese Voice
Russian Voice
Turkish Voice
- Chinese (China) Voice
- Chinese (Taiwan) Voice
+ Chinese (China, Simplified) Voice
+ Chinese (Taiwan, Traditional) Voice
Usability Study Mode
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
index 0a42857ff..7cae4f1df 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
@@ -75,6 +75,9 @@ public class LatinKeyboard extends Keyboard {
private static int sSpacebarVerticalCorrection;
+ private static final String SMALL_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR = "small";
+ private static final String MEDIUM_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR = "medium";
+
public LatinKeyboard(Context context, KeyboardId id) {
super(context, id);
final Resources res = context.getResources();
@@ -189,10 +192,23 @@ public class LatinKeyboard extends Keyboard {
paint.setAntiAlias(true);
paint.setTextAlign(Align.CENTER);
+ final String textSizeOfLanguageOnSpacebar = res.getString(
+ R.string.config_text_size_of_language_on_spacebar,
+ SMALL_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR);
+ final int textStyle;
+ final int defaultTextSize;
+ if (MEDIUM_TEXT_SIZE_OF_LANGUAGE_ON_SPACEBAR.equals(textSizeOfLanguageOnSpacebar)) {
+ textStyle = android.R.style.TextAppearance_Medium;
+ defaultTextSize = 18;
+ } else {
+ textStyle = android.R.style.TextAppearance_Small;
+ defaultTextSize = 14;
+ }
+
final boolean allowVariableTextSize = true;
final String language = layoutSpaceBar(paint, subtypeSwitcher.getInputLocale(),
mButtonArrowLeftIcon, mButtonArrowRightIcon, width, height,
- getTextSizeFromTheme(android.R.style.TextAppearance_Small, 14),
+ getTextSizeFromTheme(textStyle, defaultTextSize),
allowVariableTextSize);
// Draw language text with shadow