diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-06-30 19:59:33 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-06-30 19:59:33 +0000 |
| commit | 16cea885e225e04b7934e54210330530741d62f8 (patch) | |
| tree | 21aabbff4c333ef527cff3ca3da276524ac56510 /res/layout | |
| parent | 933ec4f7b6b113776c7f3ad89b316b37df4a933c (diff) | |
| download | open-keychain-16cea885e225e04b7934e54210330530741d62f8.tar.gz open-keychain-16cea885e225e04b7934e54210330530741d62f8.tar.bz2 open-keychain-16cea885e225e04b7934e54210330530741d62f8.zip | |
merge 1.0.x back into trunk
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/decrypt.xml | 8 | ||||
| -rw-r--r-- | res/layout/edit_key.xml | 4 | ||||
| -rw-r--r-- | res/layout/encrypt.xml | 4 | ||||
| -rw-r--r-- | res/layout/main.xml | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/res/layout/decrypt.xml b/res/layout/decrypt.xml index 41bbee479..2acae3086 100644 --- a/res/layout/decrypt.xml +++ b/res/layout/decrypt.xml @@ -199,15 +199,15 @@ <Button android:id="@+id/btn_reply" android:text="@string/btn_reply" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_height="fill_parent" android:layout_weight="1"/> <Button android:id="@+id/btn_decrypt" android:text="@string/btn_decrypt" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="0dip" + android:layout_height="fill_parent" android:layout_weight="1"/> </LinearLayout> diff --git a/res/layout/edit_key.xml b/res/layout/edit_key.xml index bf994fa44..0b441b0a2 100644 --- a/res/layout/edit_key.xml +++ b/res/layout/edit_key.xml @@ -45,14 +45,14 @@ <Button android:id="@+id/btn_save" android:layout_width="0dip" - android:layout_height="wrap_content" + android:layout_height="fill_parent" android:layout_weight="1" android:text="@string/btn_save"/> <Button android:id="@+id/btn_discard" android:layout_width="0dip" - android:layout_height="wrap_content" + android:layout_height="fill_parent" android:layout_weight="1" android:text="@string/btn_doNotSave"/> diff --git a/res/layout/encrypt.xml b/res/layout/encrypt.xml index dd51318c2..68808c8bf 100644 --- a/res/layout/encrypt.xml +++ b/res/layout/encrypt.xml @@ -368,14 +368,14 @@ android:text="@string/btn_encryptToClipboard" android:layout_weight="1" android:layout_width="0dip" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> <Button android:id="@+id/btn_encrypt" android:text="@string/btn_encrypt" android:layout_weight="1" android:layout_width="0dip" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> </LinearLayout> diff --git a/res/layout/main.xml b/res/layout/main.xml index 3603f656e..803b2abe9 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -52,14 +52,14 @@ android:text="@string/btn_encryptFile" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> <Button android:id="@+id/btn_decryptFile" android:text="@string/btn_decryptFile" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> </LinearLayout> @@ -73,14 +73,14 @@ android:text="@string/btn_encryptMessage" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> <Button android:id="@+id/btn_decryptMessage" android:text="@string/btn_decryptMessage" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="wrap_content"/> + android:layout_height="fill_parent"/> </LinearLayout> |