diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
| commit | 20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (patch) | |
| tree | 258667acf6ea0c995b47195492d453c7459b31ca /OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | |
| parent | 92ac2ded10548756922a4c22ebae0a19b8862426 (diff) | |
| parent | 5c44f8400970de5943fd6c5e804dfa394f3deb01 (diff) | |
| download | open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.gz open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.bz2 open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.zip | |
Merge tag 'v3.2.1' into linked-identities
Version 3.2.1
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 33fc78780..9167a2859 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -7,7 +7,7 @@ <LinearLayout android:visibility="gone" - android:id="@+id/decrypt_text_valid" + android:id="@+id/decrypt_content" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -37,7 +37,7 @@ </LinearLayout> <LinearLayout - android:id="@+id/decrypt_text_invalid" + android:id="@+id/decrypt_error_overlay" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" @@ -54,7 +54,7 @@ android:textColor="@color/android_red_light" /> <Button - android:id="@+id/decrypt_text_invalid_button" + android:id="@+id/decrypt_error_overlay_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/button_edgy" @@ -62,4 +62,4 @@ android:text="@string/decrypt_invalid_button" android:layout_gravity="center_horizontal" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |