aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorJeremy Klein <jklein24@gmail.com>2015-10-15 10:36:41 -0700
committerJeremy Klein <jklein24@gmail.com>2015-10-15 10:36:41 -0700
commit91424dbb94766ddaa013c090dfa4b74107aca6fd (patch)
tree9dc5e14c577f085e25e55775047a280078a597a5 /app/src/main/res/layout
parent783c975a9d532cfcd1177b1cac0322973e576b22 (diff)
parent924fb892f05b175c1424940fe224ba03467945d2 (diff)
downloadconnectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.tar.gz
connectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.tar.bz2
connectbot-91424dbb94766ddaa013c090dfa4b74107aca6fd.zip
Merge pull request #297 from rhansby/broken-paste
Fix paste button being permanently disabled because SSH session was not yet open.
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/act_console.xml3
-rw-r--r--app/src/main/res/layout/act_generatepubkey.xml4
-rw-r--r--app/src/main/res/layout/dia_changepassword.xml6
-rw-r--r--app/src/main/res/layout/dia_password.xml2
4 files changed, 7 insertions, 8 deletions
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index fea3a00..097fe85 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -20,7 +20,6 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#ff000000">
@@ -65,7 +64,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/console_password_instructions"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"
/>
diff --git a/app/src/main/res/layout/act_generatepubkey.xml b/app/src/main/res/layout/act_generatepubkey.xml
index feb0ed9..b4a8270 100644
--- a/app/src/main/res/layout/act_generatepubkey.xml
+++ b/app/src/main/res/layout/act_generatepubkey.xml
@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"/>
</TableRow>
@@ -163,7 +163,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"/>
</TableRow>
diff --git a/app/src/main/res/layout/dia_changepassword.xml b/app/src/main/res/layout/dia_changepassword.xml
index 7f0d5b2..f4320b3 100644
--- a/app/src/main/res/layout/dia_changepassword.xml
+++ b/app/src/main/res/layout/dia_changepassword.xml
@@ -39,7 +39,7 @@
android:id="@+id/old_password"
android:layout_width="200dip"
android:layout_height="wrap_content"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"
/>
</TableRow>
@@ -58,7 +58,7 @@
android:id="@+id/password1"
android:layout_width="200dip"
android:layout_height="wrap_content"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"
/>
</TableRow>
@@ -95,7 +95,7 @@
android:id="@+id/password2"
android:layout_width="200dip"
android:layout_height="wrap_content"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"
/>
</TableRow>
diff --git a/app/src/main/res/layout/dia_password.xml b/app/src/main/res/layout/dia_password.xml
index 148e197..dd84fd4 100644
--- a/app/src/main/res/layout/dia_password.xml
+++ b/app/src/main/res/layout/dia_password.xml
@@ -30,7 +30,7 @@
android:layout_width="250dip"
android:layout_height="wrap_content"
android:hint="@string/prompt_password"
- android:password="true"
+ android:inputType="textPassword"
android:singleLine="true"
/>