diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
index 522f0f7..682ac0b 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardContainer.java
@@ -196,17 +196,17 @@ public class LeanbackKeyboardContainer {
mVoiceButtonView.setCallback(new RecognizerView.Callback() {
@Override
public void onCancelRecordingClicked() {
- LeanbackKeyboardContainer.this.cancelVoiceRecording();
+ cancelVoiceRecording();
}
@Override
public void onStartRecordingClicked() {
- LeanbackKeyboardContainer.this.startVoiceRecording();
+ startVoiceRecording();
}
@Override
public void onStopRecordingClicked() {
- LeanbackKeyboardContainer.this.cancelVoiceRecording();
+ cancelVoiceRecording();
}
});
initKeyboards();
@@ -274,8 +274,8 @@ public class LeanbackKeyboardContainer {
}
private void initKeyboards() {
- mAbcKeyboard = new Keyboard(mContext, R.xml.qwerty_us);
- mSymKeyboard = new Keyboard(mContext, R.xml.sym_us);
+ mAbcKeyboard = new Keyboard(mContext, R.xml.qwerty_en_us);
+ mSymKeyboard = new Keyboard(mContext, R.xml.sym_en_us);
updateAddonKeyboard();
mNumKeyboard = new Keyboard(mContext, R.xml.number);
}
diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardView.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardView.java
index bbe1a48..abfedd6 100644
--- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardView.java
+++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/keyboard/android/leanback/ime/LeanbackKeyboardView.java
@@ -32,7 +32,7 @@ public class LeanbackKeyboardView extends FrameLayout {
/**
* keys count among which space key spans (important: wrong value will broke navigation)
*/
- public static final int ASCII_PERIOD_LEN = 6;
+ public static final int ASCII_PERIOD_LEN = 5;
public static final int ASCII_SPACE = 32;
private static final boolean DEBUG = false;
public static final int KEYCODE_CAPS_LOCK = -6;
diff --git a/leankeykeyboard/src/main/res/drawable-hdpi-v4/ic_voice.png b/leankeykeyboard/src/main/res/drawable-hdpi-v4/ic_voice.png
new file mode 100644
index 0000000..1ca7277
Binary files /dev/null and b/leankeykeyboard/src/main/res/drawable-hdpi-v4/ic_voice.png differ
diff --git a/leankeykeyboard/src/main/res/drawable-mdpi-v4/ic_voice.png b/leankeykeyboard/src/main/res/drawable-mdpi-v4/ic_voice.png
new file mode 100644
index 0000000..5ca7b53
Binary files /dev/null and b/leankeykeyboard/src/main/res/drawable-mdpi-v4/ic_voice.png differ
diff --git a/leankeykeyboard/src/main/res/drawable-xhdpi-v4/ic_voice.png b/leankeykeyboard/src/main/res/drawable-xhdpi-v4/ic_voice.png
new file mode 100644
index 0000000..5936d63
Binary files /dev/null and b/leankeykeyboard/src/main/res/drawable-xhdpi-v4/ic_voice.png differ
diff --git a/leankeykeyboard/src/main/res/layout/input_leanback.xml b/leankeykeyboard/src/main/res/layout/input_leanback.xml
index d27c773..f56e573 100644
--- a/leankeykeyboard/src/main/res/layout/input_leanback.xml
+++ b/leankeykeyboard/src/main/res/layout/input_leanback.xml
@@ -3,13 +3,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/leankeykeyboard/src/main/res/values/dimens.xml b/leankeykeyboard/src/main/res/values/dimens.xml
index f7edbfb..ea55a3c 100644
--- a/leankeykeyboard/src/main/res/values/dimens.xml
+++ b/leankeykeyboard/src/main/res/values/dimens.xml
@@ -5,9 +5,9 @@
- 230.0dip
+ 192.0dip
12.0dip
8.0dip
96.0dip
diff --git a/leankeykeyboard/src/main/res/values/languages.xml b/leankeykeyboard/src/main/res/values/languages.xml
index f0fbfed..cd4a833 100644
--- a/leankeykeyboard/src/main/res/values/languages.xml
+++ b/leankeykeyboard/src/main/res/values/languages.xml
@@ -1,7 +1,7 @@
- - English|us
+ - English|en_us
- Arabic|ar
- Bulgarian|bg
- Dutch|nl
diff --git a/leankeykeyboard/src/main/res/values/strings.xml b/leankeykeyboard/src/main/res/values/strings.xml
index a43b68d..0085ce6 100644
--- a/leankeykeyboard/src/main/res/values/strings.xml
+++ b/leankeykeyboard/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
Caps Lock
Left
Right
+ Voice Input
Plug in a headset to hear password keys spoken.
Dot.
Select additional layouts
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ar.xml b/leankeykeyboard/src/main/res/xml/qwerty_ar.xml
index 3f216e3..93e7e4f 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_ar.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_ar.xml
@@ -59,6 +59,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_bg.xml b/leankeykeyboard/src/main/res/xml/qwerty_bg.xml
index e24075a..1ac058e 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_bg.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_bg.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_de.xml b/leankeykeyboard/src/main/res/xml/qwerty_de.xml
index fd91f73..d0d1074 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_de.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_de.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_el.xml b/leankeykeyboard/src/main/res/xml/qwerty_el.xml
index a81ef95..003a646 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_el.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_el.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_us.xml b/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml
similarity index 96%
rename from leankeykeyboard/src/main/res/xml/qwerty_us.xml
rename to leankeykeyboard/src/main/res/xml/qwerty_en_us.xml
index 545932e..c95fd6c 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_us.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml
@@ -59,6 +59,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml b/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml
index 25b11e2..6dbd28e 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml
@@ -57,6 +57,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_fa.xml b/leankeykeyboard/src/main/res/xml/qwerty_fa.xml
index bdda4d1..bf99558 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_fa.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_fa.xml
@@ -63,6 +63,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_fr.xml b/leankeykeyboard/src/main/res/xml/qwerty_fr.xml
index 713fa39..0fb3369 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_fr.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_fr.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_he.xml b/leankeykeyboard/src/main/res/xml/qwerty_he.xml
index 58df348..c451455 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_he.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_he.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_is.xml b/leankeykeyboard/src/main/res/xml/qwerty_is.xml
index 67ba757..fe4cc0a 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_is.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_is.xml
@@ -63,6 +63,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_it.xml b/leankeykeyboard/src/main/res/xml/qwerty_it.xml
index 004c3fd..450660f 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_it.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_it.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_nl.xml b/leankeykeyboard/src/main/res/xml/qwerty_nl.xml
index deafc22..5de5df1 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_nl.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_nl.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ru.xml b/leankeykeyboard/src/main/res/xml/qwerty_ru.xml
index 34f3a60..9672cf3 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_ru.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_ru.xml
@@ -58,6 +58,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_sv.xml b/leankeykeyboard/src/main/res/xml/qwerty_sv.xml
index abf8e2c..fac3006 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_sv.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_sv.xml
@@ -58,6 +58,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_th.xml b/leankeykeyboard/src/main/res/xml/qwerty_th.xml
index 8ea9e7b..df2548d 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_th.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_th.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_tr.xml b/leankeykeyboard/src/main/res/xml/qwerty_tr.xml
index 3aa7976..7bead24 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_tr.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_tr.xml
@@ -62,6 +62,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_uk.xml b/leankeykeyboard/src/main/res/xml/qwerty_uk.xml
index 8709d49..b5b794b 100644
--- a/leankeykeyboard/src/main/res/xml/qwerty_uk.xml
+++ b/leankeykeyboard/src/main/res/xml/qwerty_uk.xml
@@ -58,6 +58,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/sym_us.xml b/leankeykeyboard/src/main/res/xml/sym_en_us.xml
similarity index 95%
rename from leankeykeyboard/src/main/res/xml/sym_us.xml
rename to leankeykeyboard/src/main/res/xml/sym_en_us.xml
index ada010f..5e70911 100644
--- a/leankeykeyboard/src/main/res/xml/sym_us.xml
+++ b/leankeykeyboard/src/main/res/xml/sym_en_us.xml
@@ -58,6 +58,7 @@
+
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_az.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_az.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_az.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_az.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ca.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_ca.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_ca.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_ca.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_da.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_da.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_da.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_da.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_en_gb.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_en_gb.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_en_gb.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_en_gb.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_en_in.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_en_in.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_en_in.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_en_in.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_es_eu.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_es_eu.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_es_eu.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_es_eu.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_et.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_et.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_et.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_et.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_eu.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_eu.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_eu.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_eu.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_fi.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_fi.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_fi.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_fi.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_leanback_ru.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_leanback_ru.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_leanback_ru.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_leanback_ru.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwerty_nb.xml b/leankeykeyboard/src/main/res/xml/unused/qwerty_nb.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwerty_nb.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwerty_nb.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwertz.xml b/leankeykeyboard/src/main/res/xml/unused/qwertz.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwertz.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwertz.xml
diff --git a/leankeykeyboard/src/main/res/xml/qwertz_ch.xml b/leankeykeyboard/src/main/res/xml/unused/qwertz_ch.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/qwertz_ch.xml
rename to leankeykeyboard/src/main/res/xml/unused/qwertz_ch.xml
diff --git a/leankeykeyboard/src/main/res/xml/sym_en_gb.xml b/leankeykeyboard/src/main/res/xml/unused/sym_en_gb.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/sym_en_gb.xml
rename to leankeykeyboard/src/main/res/xml/unused/sym_en_gb.xml
diff --git a/leankeykeyboard/src/main/res/xml/sym_en_in.xml b/leankeykeyboard/src/main/res/xml/unused/sym_en_in.xml
similarity index 100%
rename from leankeykeyboard/src/main/res/xml/sym_en_in.xml
rename to leankeykeyboard/src/main/res/xml/unused/sym_en_in.xml