diff options
| author | Torne Wuff <torne@wolfpuppy.org.uk> | 2015-03-22 12:34:36 +0000 |
|---|---|---|
| committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2015-03-22 12:36:39 +0000 |
| commit | ac19012a304609f8a87990527927386900dad6ea (patch) | |
| tree | 3bd0594231fbd6292ce971cb216fcb70e1f2ba7a | |
| parent | a79810b6486ef2fe8e67a932310539be02840cbf (diff) | |
| download | connectbot-ac19012a304609f8a87990527927386900dad6ea.tar.gz connectbot-ac19012a304609f8a87990527927386900dad6ea.tar.bz2 connectbot-ac19012a304609f8a87990527927386900dad6ea.zip | |
Only enable right modifier directory shortcuts on Dream.
Disable right modifier directory shortcut keys by default unless running
on a Dream.
| -rw-r--r-- | res/xml/preferences.xml | 2 | ||||
| -rw-r--r-- | src/org/connectbot/HostListActivity.java | 13 | ||||
| -rw-r--r-- | src/org/connectbot/service/TerminalKeyListener.java | 2 | ||||
| -rw-r--r-- | src/org/connectbot/util/PreferenceConstants.java | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index a1b79ae..70bdb5b 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -136,7 +136,7 @@ android:summary="@string/pref_keymode_summary" android:entries="@array/list_keymode" android:entryValues="@array/list_keymode_values" - android:defaultValue="Use right-side keys" + android:defaultValue="none" /> <ListPreference diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index 99c2a39..3929ee7 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -165,16 +165,23 @@ public class HostListActivity extends ListActivity { // detect HTC Dream and apply special preferences if (Build.MANUFACTURER.equals("HTC") && Build.DEVICE.equals("dream")) { + SharedPreferences.Editor editor = prefs.edit(); + boolean doCommit = false; if (!prefs.contains(PreferenceConstants.SHIFT_FKEYS) && !prefs.contains(PreferenceConstants.CTRL_FKEYS)) { - SharedPreferences.Editor editor = prefs.edit(); editor.putBoolean(PreferenceConstants.SHIFT_FKEYS, true); editor.putBoolean(PreferenceConstants.CTRL_FKEYS, true); - editor.commit(); + doCommit = true; } if (!prefs.contains(PreferenceConstants.STICKY_MODIFIERS)) { - SharedPreferences.Editor editor = prefs.edit(); editor.putString(PreferenceConstants.STICKY_MODIFIERS, PreferenceConstants.YES); + doCommit = true; + } + if (!prefs.contains(PreferenceConstants.KEYMODE)) { + editor.putString(PreferenceConstants.KEYMODE, PreferenceConstants.KEYMODE_RIGHT); + doCommit = true; + } + if (doCommit) { editor.commit(); } } diff --git a/src/org/connectbot/service/TerminalKeyListener.java b/src/org/connectbot/service/TerminalKeyListener.java index ad13818..13e8dd1 100644 --- a/src/org/connectbot/service/TerminalKeyListener.java +++ b/src/org/connectbot/service/TerminalKeyListener.java @@ -595,7 +595,7 @@ public class TerminalKeyListener implements OnKeyListener, OnSharedPreferenceCha } private void updatePrefs() { - keymode = prefs.getString(PreferenceConstants.KEYMODE, PreferenceConstants.KEYMODE_RIGHT); + keymode = prefs.getString(PreferenceConstants.KEYMODE, PreferenceConstants.KEYMODE_NONE); shiftedNumbersAreFKeysOnHardKeyboard = prefs.getBoolean(PreferenceConstants.SHIFT_FKEYS, false); controlNumbersAreFKeysOnSoftKeyboard = diff --git a/src/org/connectbot/util/PreferenceConstants.java b/src/org/connectbot/util/PreferenceConstants.java index ab5e4a9..d3cd832 100644 --- a/src/org/connectbot/util/PreferenceConstants.java +++ b/src/org/connectbot/util/PreferenceConstants.java @@ -51,6 +51,7 @@ public class PreferenceConstants { public static final String KEYMODE_RIGHT = "Use right-side keys"; public static final String KEYMODE_LEFT = "Use left-side keys"; + public static final String KEYMODE_NONE = "none"; public static final String CAMERA = "camera"; |