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

Fix layout pref under debug builds

Browse Source 
Remove the use of [getIdentifier] because it requires the current
package name to be passed, which can't be found reliably since the
change in build system.
This commit is contained in:
Jules Aguillon 2021-04-13 01:58:25 +02:00
parent 5f5efe3157
commit 0b1befcc88
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,20 +82,30 @@ public class Keyboard2 extends InputMethodService
_keyboardView.reset();
}
private int _getKeyboardLayoutRes(SharedPreferences prefs)
{
// Not looking up using [getIdentifier] as it was intended because the
// [packageName] argument can't be passed reliably (eg. debug builds)
switch (prefs.getString("keyboard_layout", null))
{
case "azerty":
return R.xml.azerty;
default:
case "qwerty":
return R.xml.qwerty;
}
}
/*
** TODO: move this to Config object
*/
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));
_textKeyboard = new KeyboardData(getResources().getXml(_getKeyboardLayoutRes(prefs)));
if (_config.disableAccentKeys)
_textKeyboard.removeKeysByFlag(KeyValue.FLAGS_ACCENTS);
_numericKeyboard = new KeyboardData(getResources().getXml(R.xml.numeric));
_emojiPane = null;
}