aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-16 15:59:26 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-16 15:59:26 +0100
commit6c153b15430c00b5213062be4bb5830d52f2589a (patch)
treeaa214d760e889737b4defdc13f3676ca3f7dcfa8 /OpenKeychain/src/main/res
parentb6a1463161779b820a8b03a9d17c8a35dccea338 (diff)
downloadopen-keychain-6c153b15430c00b5213062be4bb5830d52f2589a.tar.gz
open-keychain-6c153b15430c00b5213062be4bb5830d52f2589a.tar.bz2
open-keychain-6c153b15430c00b5213062be4bb5830d52f2589a.zip
linked id ui work dns/twitter
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml6
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
2 files changed, 3 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
index c416588d7..edbe33c59 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
@@ -23,15 +23,13 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/linked_create_dns_2_1" />
- <EditText
+ <TextView
android:id="@+id/linked_create_dns_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:imeOptions="actionNext"
android:layout_marginTop="8dp"
android:layout_gravity="center_horizontal"
- android:inputType="textUri|none"
- android:enabled="false"/>
+ android:textIsSelectable="true" />
<TextView
android:layout_width="wrap_content"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index ef72989e0..d989b1a47 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1166,7 +1166,7 @@
<string name="linked_create_twitter_1_2">"A message will be generated in the next step, which you can then customize and finally publish to your timeline."</string>
<string name="linked_create_twitter_1_3">"This tweet links back to your pgp key, to make the connection verifiable in both directions."</string>
<string name="linked_create_twitter_handle">Twitter Handle</string>
- <string name="linked_create_twitter_2_1">"A message for this Twitter account has been created. You can add some text in front if you like."</string>
+ <string name="linked_create_twitter_2_1">"A message for this Twitter account has been created. You can add some text in front if you like, or leave it as-is."</string>
<string name="linked_create_twitter_2_2">"Here's a preview of the full tweet:"</string>
<string name="linked_create_twitter_2_3">"Once you are happy with the tweet, click next to proceed."</string>
<string name="linked_create_twitter_3_1">"Alright, here's the finished text:"</string>