diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 13:18:43 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 13:18:43 +0200 |
| commit | 1b38a5b2e398ed25019b9a44d62e30e0118ff6e5 (patch) | |
| tree | 909f523f67bc474fd19601a37b56ce5d7f8fac30 /OpenPGP-Keychain/src/main/res/layout | |
| parent | a9f868a5e74e2c540d0b71d69560b780c7e16a06 (diff) | |
| parent | b06f142c5046618d97737d3f7f482ca7198f24e4 (diff) | |
| download | open-keychain-1b38a5b2e398ed25019b9a44d62e30e0118ff6e5.tar.gz open-keychain-1b38a5b2e398ed25019b9a44d62e30e0118ff6e5.tar.bz2 open-keychain-1b38a5b2e398ed25019b9a44d62e30e0118ff6e5.zip | |
Merge remote-tracking branch 'origin/master' into db-overhaul
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml index 16234762c..3e0d35c9b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml @@ -28,20 +28,6 @@ android:src="@drawable/overlay_error" /> </RelativeLayout> - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/lookup_key" - android:visibility="gone" - android:layout_width="wrap_content" - android:layout_height="50dp" - android:padding="4dp" - android:text="@string/btn_lookup_key" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" - bootstrapbutton:bb_size="small" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> - <TextView android:id="@+id/mainUserId" android:layout_width="wrap_content" @@ -60,4 +46,17 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:layout_below="@+id/mainUserId" android:layout_toRightOf="@+id/relativeLayout" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:layout_width="wrap_content" + android:layout_height="50dp" + android:padding="4dp" + android:text="@string/btn_lookup_key" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" + bootstrapbutton:bb_size="small" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> </RelativeLayout>
\ No newline at end of file |