aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex <alescdb@users.noreply.github.com>2015-10-22 21:03:25 +0200
committerAlex <alescdb@users.noreply.github.com>2015-10-22 21:03:25 +0200
commit99df8463ab1e002a29e552ca13604bf4d8fe6b8c (patch)
tree7485f72acd9259c423b9ca365fcacfe6c1a04b16
parent3b694e0b884110bd7d03837acdaa780ef645bd2b (diff)
parent0eeb8794fab1358389b0ff98d15761abe23ced9f (diff)
downloadconnectbot-99df8463ab1e002a29e552ca13604bf4d8fe6b8c.tar.gz
connectbot-99df8463ab1e002a29e552ca13604bf4d8fe6b8c.tar.bz2
connectbot-99df8463ab1e002a29e552ca13604bf4d8fe6b8c.zip
Merge branch 'master' into key-vectors
-rw-r--r--app/src/main/java/org/connectbot/HostEditorFragment.java4
-rw-r--r--app/src/main/res/layout/fragment_host_editor.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/java/org/connectbot/HostEditorFragment.java b/app/src/main/java/org/connectbot/HostEditorFragment.java
index fe6f838..392e870 100644
--- a/app/src/main/java/org/connectbot/HostEditorFragment.java
+++ b/app/src/main/java/org/connectbot/HostEditorFragment.java
@@ -204,6 +204,8 @@ public class HostEditorFragment extends Fragment {
mQuickConnectContainer =
(TextInputLayout) view.findViewById(R.id.quickconnect_field_container);
+ /* Request focus on creation because elements in this fragment do not autofocus. */
+ mQuickConnectContainer.requestFocus();
mQuickConnectField = (EditText) view.findViewById(R.id.quickconnect_field);
String oldQuickConnect = savedInstanceState == null ?
@@ -318,6 +320,8 @@ public class HostEditorFragment extends Fragment {
@Override
public void onStartTrackingTouch(SeekBar seekBar) {
+ /* Clear focus on font size EditText so its text value can update. */
+ mFontSizeText.clearFocus();
}
@Override
diff --git a/app/src/main/res/layout/fragment_host_editor.xml b/app/src/main/res/layout/fragment_host_editor.xml
index e4a2094..faa22bc 100644
--- a/app/src/main/res/layout/fragment_host_editor.xml
+++ b/app/src/main/res/layout/fragment_host_editor.xml
@@ -25,6 +25,8 @@
>
<LinearLayout
+ android:focusable="true"
+ android:focusableInTouchMode="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"