diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-17 19:24:07 +0200 |
commit | 374b21410e82877efcdd1e5110376e975bddbf9f (patch) | |
tree | e17df8931d627e58da677aee274249e1d51c34e2 /OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | |
parent | 1a7677008bae900fb11a383d04766737aaa3f02f (diff) | |
parent | 04d2b6a5076a1a7264687999152f8c24ece773ab (diff) | |
download | open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.gz open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.tar.bz2 open-keychain-374b21410e82877efcdd1e5110376e975bddbf9f.zip |
Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
.travis.yml
OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index ea6be462f..cb20254ff 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:visibility="gone" + tools:visibility="visible" android:id="@+id/decrypt_content" android:layout_width="match_parent" android:layout_height="match_parent" @@ -28,6 +30,7 @@ android:layout_height="wrap_content" android:gravity="top" android:hint="" + tools:text="This is the plaintext" android:textIsSelectable="true" /> </ScrollView> |