diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8e753fb..45f74d2 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -45,6 +45,8 @@ Jak bude klávesa pro přepnutí klávesnice reagovat Vibrace Preference intenzity vibrací při stisku klávesy + + Styl Spodní odsazení Výška klávesnice diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 57ceba8..f6ee617 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -45,6 +45,8 @@ Verhalten der Tastaturumschalttaste Vibration Vibration bei Tastendruck ein-/ausschalten + + Design Unterer Abstand Höhe der Tastatur diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 85a2d0d..c54106b 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -45,6 +45,8 @@ Comportamiento de la tecla para cambiar formatos Vibración Habilitar/deshabilitar vibración al presionar una tecla + + Estilo Margen del pie Altura del teclado diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 29a5667..0104a3c 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -45,6 +45,8 @@ رفتار کلید تغییردهنده صفحه کلید لرزش فعال/غیرفعال کردن لرزش در زمان فشار دادن کلیدها + + سبک حاشیه پایین ارتفاع صفحه کلید diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5398563..4619ca4 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -45,6 +45,8 @@ Comportement de la touche de changement de clavier Vibreur Vibration a chaque touche + + Style Marge du bas Hauteur du clavier diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 8267193..51643df 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -45,6 +45,8 @@ Vibrazione Abilita/Disabilita Vibrazione alla pressione dei tasti + + Stile Margine inferiore Altezza tastiera diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 5587a0b..686532b 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -45,6 +45,8 @@ 진동 키 누를 때 진동 키거/끄기 + + 스타일 아래 넓이 키보드 높이 diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index d0ccbb5..10ec311 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -45,6 +45,8 @@ Tastatūras pārslēgšanas taustiņa uzvedība Trīcēšana Iespējot/atspējot taustiņa piespiešanas trīcēšanu + + Izskata pielāgojumi Apakšējā apmale Tastatūras augstums diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a9b35f9..f5e4e7b 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -45,6 +45,8 @@ Działanie klawisza przełączającego klawiaturę Wibracje Wł./wył. wibrację przy naciśnięciu klawisza + + Styl Margines dolny Wysokość klawiatury diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 66b3f36..cc5a21c 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -45,6 +45,8 @@ Comportamento da tecla de troca de teclado Vibração Ativar/desativar vibração ao digitar + + Estilo Margem inferior Altura do teclado diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c78b5ae..3347004 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -45,6 +45,8 @@ Comportamentul tastei pentru schimbarea tastaturii Vibrație Activați/dezactivați vibrația la apăsarea tastelor + + Stil Marginea de jos Înălțimea tastaturii diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 0cf4c81..ed6caed 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -45,6 +45,8 @@ Поведение клавиши переключения клавиатуры Вибрация Включение/выключение вибрации при нажатии клавиши + + Стиль Нижняя граница поля Высота клавиатуры diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 770dab0..b318866 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -45,6 +45,8 @@ Titreşim Tuşa basıldığında titreşimi etkinleştir + + Stil Alt boşluk Klavye yüksekliği diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 088810f..96fadbe 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -47,6 +47,8 @@ Sự rung Bật/tắt rung khi nhấn + + Kiểu cách Căn lề dưới Chiều cao bàn phím diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index a4b20f4..01bc65d 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -45,6 +45,8 @@ 切换键盘按钮的行为 振动 启用或者禁用按下按键时振动 + + 样式 键盘下边距 键盘高度 diff --git a/res/values/strings.xml b/res/values/strings.xml index c278493..6a280f5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -45,6 +45,8 @@ Behavior of the keyboard-switching key Vibration Enable/disable vibration on keypress + Pin entry layout + When typing numbers, dates and phone numbers Style Margin bottom Keyboard height diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 8a8c8d7..d6bf7c3 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -22,6 +22,7 @@ + diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java index c6b3ed4..09db10d 100644 --- a/srcs/juloo.keyboard2/Config.java +++ b/srcs/juloo.keyboard2/Config.java @@ -52,6 +52,7 @@ final class Config public int theme; // Values are R.style.* public boolean autocapitalisation; public boolean switch_input_immediate; + public boolean pin_entry_enabled; // Dynamically set public boolean shouldOfferSwitchingToNextInputMethod; @@ -157,6 +158,7 @@ final class Config switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false); extra_keys_param = ExtraKeysPreference.get_extra_keys(_prefs); extra_keys_custom = CustomExtraKeysPreference.get(_prefs); + pin_entry_enabled = _prefs.getBoolean("pin_entry_enabled", true); } KeyValue action_key() diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 48e60db..3606213 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -71,6 +71,12 @@ public class Keyboard2 extends InputMethodService return KeyboardData.load(getResources(), layout_id); } + /** Load a layout that contains a numpad (eg. the pin entry). */ + KeyboardData loadNumpad(int layout_id) + { + return _config.modify_numpad(KeyboardData.load(getResources(), layout_id)); + } + @Override public void onCreate() { @@ -154,7 +160,7 @@ public class Keyboard2 extends InputMethodService } } if (default_layout == null) - default_layout = KeyboardData.load(getResources(), R.xml.latn_qwerty_us); + default_layout = loadLayout(R.xml.latn_qwerty_us); _localeTextLayout = default_layout; if (_config.second_layout == null) { @@ -235,20 +241,21 @@ public class Keyboard2 extends InputMethodService return null; } - private void refresh_special_layout(EditorInfo info) + private KeyboardData refresh_special_layout(EditorInfo info) { switch (info.inputType & InputType.TYPE_MASK_CLASS) { case InputType.TYPE_CLASS_NUMBER: case InputType.TYPE_CLASS_PHONE: case InputType.TYPE_CLASS_DATETIME: - _currentSpecialLayout = - _config.modify_numpad(KeyboardData.load(getResources(), R.xml.pin)); - break; + if (_config.pin_entry_enabled) + return loadNumpad(R.xml.pin); + else + return loadNumpad(R.xml.numeric); default: - _currentSpecialLayout = null; break; } + return null; } @Override @@ -256,7 +263,7 @@ public class Keyboard2 extends InputMethodService { refresh_config(); refresh_action_label(info); - refresh_special_layout(info); + _currentSpecialLayout = refresh_special_layout(info); _keyboardView.setKeyboard(current_layout()); _keyeventhandler.started(info); setInputView(_keyboardView); @@ -382,7 +389,7 @@ public class Keyboard2 extends InputMethodService break; case SWITCH_NUMERIC: - setSpecialLayout(_config.modify_numpad(loadLayout(R.xml.numeric))); + setSpecialLayout(loadNumpad(R.xml.numeric)); break; case SWITCH_EMOJI: @@ -422,7 +429,7 @@ public class Keyboard2 extends InputMethodService break; case SWITCH_GREEKMATH: - setSpecialLayout(_config.modify_numpad(loadLayout(R.xml.greekmath))); + setSpecialLayout(loadNumpad(R.xml.greekmath)); break; case CAPS_LOCK: