diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-23 16:22:32 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-23 16:25:06 +0000 |
| commit | f0ca96308b23643df1208acfe72015b46ae70067 (patch) | |
| tree | 265bc747a3b5383075ecb12d99c3c89dcd5a2274 /app/src/main/res/xml/preferences.xml | |
| parent | 89ee9588459755193dfff3df45f4494d53b25854 (diff) | |
| parent | f129a9b52110ffafec4400e17d78881c50307d8a (diff) | |
| download | connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.gz connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.bz2 connectbot-f0ca96308b23643df1208acfe72015b46ae70067.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/src/main/java/org/connectbot/HostListActivity.java
app/src/main/java/org/connectbot/service/TerminalKeyListener.java
Diffstat (limited to 'app/src/main/res/xml/preferences.xml')
| -rw-r--r-- | app/src/main/res/xml/preferences.xml | 62 |
1 files changed, 33 insertions, 29 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 6d64ce2..70bdb5b 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -27,15 +27,6 @@ android:defaultValue="true" /> - <ListPreference - android:key="update" - android:title="@string/pref_update_title" - android:summary="@string/pref_update_summary" - android:entries="@array/list_update" - android:entryValues="@array/list_update_values" - android:defaultValue="Daily" - /> - <CheckBoxPreference android:key="connPersist" android:title="@string/pref_conn_persist_title" @@ -43,6 +34,13 @@ android:defaultValue="true" /> + <CheckBoxPreference + android:key="wifilock" + android:title="@string/pref_wifilock_title" + android:summary="@string/pref_wifilock_summary" + android:defaultValue="true" + /> + <PreferenceCategory android:title="@string/pref_emulation_category"> @@ -92,6 +90,24 @@ /> <CheckBoxPreference + android:key="volumefont" + android:title="@string/pref_volumefont_title" + android:summary="@string/pref_volumefont_summary" + android:defaultValue="true" + /> + + <CheckBoxPreference + android:key="keepalive" + android:title="@string/pref_keepalive_title" + android:summary="@string/pref_keepalive_summary" + android:defaultValue="true" + /> + </PreferenceCategory> + + <PreferenceCategory + android:title="@string/pref_keyboard_category"> + + <CheckBoxPreference android:key="shiftfkeys" android:title="@string/pref_shiftfkeys_title" android:summary="@string/pref_shiftfkeys_summary" @@ -105,11 +121,13 @@ android:defaultValue="false" /> - <CheckBoxPreference - android:key="volumefont" - android:title="@string/pref_volumefont_title" - android:summary="@string/pref_volumefont_summary" - android:defaultValue="true" + <ListPreference + android:key="stickymodifiers" + android:title="@string/pref_stickymodifiers_title" + android:summary="@string/pref_stickymodifiers_summary" + android:entries="@array/list_stickymodifiers" + android:entryValues="@array/list_stickymodifiers_values" + android:defaultValue="no" /> <ListPreference @@ -118,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 @@ -131,20 +149,6 @@ /> <CheckBoxPreference - android:key="keepalive" - android:title="@string/pref_keepalive_title" - android:summary="@string/pref_keepalive_summary" - android:defaultValue="true" - /> - - <CheckBoxPreference - android:key="wifilock" - android:title="@string/pref_wifilock_title" - android:summary="@string/pref_wifilock_summary" - android:defaultValue="true" - /> - - <CheckBoxPreference android:key="bumpyarrows" android:title="@string/pref_bumpyarrows_title" android:summary="@string/pref_bumpyarrows_summary" |