diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-14 16:21:04 +0200 |
| commit | 3814ae7d53a22ba89f1e39d7a4661016f76cf8c8 (patch) | |
| tree | d83d41d3c424a784da144515665fb41ef650aa52 /OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | |
| parent | dbaf7070ead596f5c70ad48fc55aada2f77a856a (diff) | |
| parent | d5dd6a49c8156a699b3fbbbeef06658e1c232c16 (diff) | |
| download | open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.gz open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.tar.bz2 open-keychain-3814ae7d53a22ba89f1e39d7a4661016f76cf8c8.zip | |
Merge branch 'master' into mime4j
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 9362b35bb..f6237ec69 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -8,11 +8,11 @@ <LinearLayout android:visibility="gone" - tools:visibility="visible" android:id="@+id/decrypt_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + tools:visibility="visible"> <ScrollView android:fillViewport="true" @@ -39,12 +39,12 @@ </LinearLayout> <LinearLayout - android:visibility="gone" android:id="@+id/decrypt_error_overlay" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:visibility="gone"> <TextView android:layout_width="wrap_content" @@ -65,4 +65,4 @@ android:layout_gravity="center_horizontal" /> </LinearLayout> -</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
\ No newline at end of file +</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> |