diff options
| author | Ashley Hughes <spirit.returned@gmail.com> | 2014-02-22 10:27:03 +0000 |
|---|---|---|
| committer | Ashley Hughes <spirit.returned@gmail.com> | 2014-02-22 10:27:03 +0000 |
| commit | 1b25ec5a0c011f5024d5f14f9919645a455e8a41 (patch) | |
| tree | f819ac3cea715f3c5cfc5f40bbf8673013ccc7ff /OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml | |
| parent | c3c311152ef33a6887909dbbeae40e8d01f96a9d (diff) | |
| parent | d1e8acd3027dce6fd34620b67a2d2be1634822cf (diff) | |
| download | open-keychain-1b25ec5a0c011f5024d5f14f9919645a455e8a41.tar.gz open-keychain-1b25ec5a0c011f5024d5f14f9919645a455e8a41.tar.bz2 open-keychain-1b25ec5a0c011f5024d5f14f9919645a455e8a41.zip | |
master merge
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml | 57 |
1 files changed, 35 insertions, 22 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index c6834d745..e6c81c3fc 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -20,10 +20,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingTop="4dp" android:paddingLeft="10dp" android:paddingRight="10dp"> - <LinearLayout + <RelativeLayout android:id="@+id/signature" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,7 +36,8 @@ <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:id="@+id/relativeLayout"> <ImageView android:id="@+id/ic_signature" @@ -50,29 +52,40 @@ android:src="@drawable/overlay_error" /> </RelativeLayout> - <LinearLayout + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:visibility="gone" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip"> + 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" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignTop="@+id/linearLayout" + android:layout_toRightOf="@+id/relativeLayout" /> - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id Rest" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_below="@+id/mainUserId" + android:layout_toRightOf="@+id/relativeLayout" /> + </RelativeLayout> <LinearLayout android:layout_width="match_parent" |