diff options
Diffstat (limited to 'srcs/juloo.keyboard2')
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2.java | 6 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2View.java | 23 |
2 files changed, 23 insertions, 6 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java index 2c2563a..c718152 100644 --- a/srcs/juloo.keyboard2/Keyboard2.java +++ b/srcs/juloo.keyboard2/Keyboard2.java @@ -6,6 +6,7 @@ import android.inputmethodservice.InputMethodService; import android.preference.PreferenceManager; import android.view.KeyEvent; import android.view.View; +import android.view.ViewGroup; public class Keyboard2 extends InputMethodService implements SharedPreferences.OnSharedPreferenceChangeListener @@ -25,10 +26,15 @@ public class Keyboard2 extends InputMethodService @Override public View onCreateInputView() { + ViewGroup parent = (ViewGroup)_inputView.getParent(); + + if (parent != null) + parent.removeView(_inputView); _inputView.reset(); return (_inputView); } + @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { _inputView.reset_prefs(this); diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index 4e41303..fd8a7ab 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -86,24 +86,35 @@ public class Keyboard2View extends View SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ime); _ime = ime; - _subValueDist = prefs.getFloat("sub_value_dist", _subValueDist); + try + { + _subValueDist = prefs.getFloat("sub_value_dist", _subValueDist); + } + catch (Exception e) + { + _subValueDist = 7.0f; + } _vibrateEnabled = prefs.getBoolean("vibrate_enabled", _vibrateEnabled); _vibrateDuration = prefs.getLong("vibrate_duration", _vibrateDuration); _longPressTimeout = prefs.getLong("longpress_timeout", _longPressTimeout); _longPressInterval = prefs.getLong("longpress_interval", _longPressInterval); _marginBottom = prefs.getFloat("margin_bottom", _marginBottom); - String keyboardLayout = prefs.getString("keyboard_layout", "azerty"); + String keyboardLayout = prefs.getString("keyboard_layout", null); + int xmlRes = 0; - if (keyboardLayout.equals("azerty")) // TODO change this - _keyboard = new KeyboardData(ime.getResources().getXml(R.xml.azerty)); - else - _keyboard = new KeyboardData(ime.getResources().getXml(R.xml.qwerty)); + if (keyboardLayout != null) + xmlRes = ime.getResources().getIdentifier(keyboardLayout, "xml", ime.getPackageName()); + if (xmlRes == 0) + xmlRes = R.xml.azerty; + _keyboard = new KeyboardData(ime.getResources().getXml(xmlRes)); + reset(); } public void reset() { _flags = 0; + _downKeys.clear(); requestLayout(); invalidate(); } |