holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

Key to switch to numeric pane

Browse Source
This commit is contained in:
jaguillo 2015-10-11 15:30:39 +02:00
parent 549c753450
commit 03cc0a5429
8 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/arrays.xml
View File

@ -3,6 +3,5 @@
<string-array name="pref_layout_values">
<item>azerty</item>
<item>qwerty</item>
<item>numeric</item>
</string-array>
</resources>

1
res/values/strings.xml
View File

@ -11,7 +11,6 @@
<string-array name="pref_layout_entries">
<item>Azerty</item>
<item>Qwerty</item>
<item>Numeric</item>
</string-array>
<string name="pref_category_typing">Typing</string>

2
res/xml/azerty.xml
View File

@ -35,7 +35,7 @@
<key width="2.0" key0="backspace" key1="insert" key2="delete" />
</row>
<row>
<key width="1.8" key0="ctrl" />
<key width="1.8" key0="ctrl" key3="switch_numeric" />
<key width="1.0" key0="alt" key1="page_up" key2="end" key3="home" key4="page_down" />
<key width="4.4" key0="space" />
<key key1="up" key2="right" key3="left" key4="down" />

2
res/xml/numeric.xml
View File

@ -30,7 +30,7 @@
<key width="1.0" key0="enter" key1="config" />
</row>
<row>
<key width="1.0" key0="ctrl" />
<key width="1.0" key0="ctrl" key3="switch_text" />
<key width="1.0" key0="space" />
<key width="1.0" key0="space" />
<key width="3.0" key0="0" />

2
res/xml/qwerty.xml
View File

@ -35,7 +35,7 @@
<key width="1.5" key0="backspace" key2="delete" />
</row>
<row>
<key width="1.8" key0="ctrl" />
<key width="1.8" key0="ctrl" key3="switch_numeric" />
<key key0="alt" key1="page_up" key2="end" key3="home" key4="page_down" />
<key width="4.4" key0="space" />
<key key1="up" key2="right" key3="left" key4="down" />

5
srcs/juloo.keyboard2/KeyValue.java
View File

@ -8,6 +8,8 @@ class KeyValue
{
public static final int EVENT_NONE = -1;
public static final int EVENT_CONFIG = -2;
public static final int EVENT_SWITCH_TEXT = -3;
public static final int EVENT_SWITCH_NUMERIC = -4;
public static final char CHAR_NONE = '\0';
public static final int FLAG_KEEP_ON = 1;
@ -165,6 +167,9 @@ class KeyValue
new KeyValue("9", null, '9', KeyEvent.KEYCODE_9, 0);
new KeyValue("config", "Conf", CHAR_NONE, EVENT_CONFIG, 0);
new KeyValue("switch_text", "ABC", CHAR_NONE, EVENT_SWITCH_TEXT, 0);
new KeyValue("switch_numeric", "123+", CHAR_NONE, EVENT_SWITCH_NUMERIC, 0);
new KeyValue("enter", "↵", CHAR_NONE, KeyEvent.KEYCODE_ENTER, 0);
new KeyValue("up", "↑", CHAR_NONE, KeyEvent.KEYCODE_DPAD_UP, 0);
new KeyValue("right", "→", CHAR_NONE, KeyEvent.KEYCODE_DPAD_RIGHT, 0);

34
srcs/juloo.keyboard2/Keyboard2.java
View File

@ -5,7 +5,9 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.inputmethodservice.InputMethodService;
import android.os.Bundle;
import android.text.InputType;
import android.preference.PreferenceManager;
import android.view.inputmethod.EditorInfo;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
@ -14,6 +16,8 @@ public class Keyboard2 extends InputMethodService
implements SharedPreferences.OnSharedPreferenceChangeListener
{
private Keyboard2View _inputView = null;
private KeyboardData _textKeyboard = null;
private KeyboardData _numericKeyboard = null;
@Override
public void onCreate()
@ -21,6 +25,7 @@ public class Keyboard2 extends InputMethodService
super.onCreate();
PreferenceManager.setDefaultValues(this, R.xml.settings, false);
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
updateConfig();
_inputView = (Keyboard2View)getLayoutInflater().inflate(R.layout.input, null);
_inputView.reset_prefs(this);
}
@ -32,13 +37,22 @@ public class Keyboard2 extends InputMethodService
if (parent != null)
parent.removeView(_inputView);
_inputView.reset();
return (_inputView);
}
@Override
public void onStartInputView(EditorInfo info, boolean restarting)
{
if ((info.inputType & InputType.TYPE_CLASS_NUMBER) != 0)
_inputView.setKeyboard(_numericKeyboard);
else
_inputView.setKeyboard(_textKeyboard);
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
{
updateConfig();
_inputView.reset_prefs(this);
}
@ -53,6 +67,20 @@ public class Keyboard2 extends InputMethodService
_inputView.reset();
}
private void updateConfig()
{
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
String keyboardLayout = prefs.getString("keyboard_layout", null);
int xmlRes = 0;
if (keyboardLayout != null)
xmlRes = getResources().getIdentifier(keyboardLayout, "xml", getPackageName());
if (xmlRes == 0)
xmlRes = R.xml.azerty;
_textKeyboard = new KeyboardData(getResources().getXml(xmlRes));
_numericKeyboard = new KeyboardData(getResources().getXml(R.xml.numeric));
}
public void handleKeyUp(KeyValue key, int flags)
{
if (getCurrentInputConnection() == null)
@ -63,6 +91,10 @@ public class Keyboard2 extends InputMethodService
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
}
else if (key.getEventCode() == KeyValue.EVENT_SWITCH_TEXT)
_inputView.setKeyboard(_textKeyboard);
else if (key.getEventCode() == KeyValue.EVENT_SWITCH_NUMERIC)
_inputView.setKeyboard(_numericKeyboard);
else if ((flags & (KeyValue.FLAG_CTRL | KeyValue.FLAG_ALT)) != 0)
handleMetaKeyUp(key, flags);
else if (key.getEventCode() == KeyEvent.KEYCODE_DEL)

13
srcs/juloo.keyboard2/Keyboard2View.java
View File

@ -102,15 +102,12 @@ public class Keyboard2View extends View
_marginBottom = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("margin_bottom", (int)_marginBottom), getResources().getDisplayMetrics());
_keyHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("key_height", (int)_keyHeight), getResources().getDisplayMetrics());
_horizontalMargin = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, prefs.getInt("horizontal_margin", (int)_horizontalMargin), getResources().getDisplayMetrics());
reset();
}
String keyboardLayout = prefs.getString("keyboard_layout", null);
int xmlRes = 0;
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));
public void setKeyboard(KeyboardData keyboard)
{
_keyboard = keyboard;
reset();
}