merge 1.0.x back into trunk

2010-06-30 19:59:33 +00:00
parent 933ec4f7b6
commit 16cea885e2
45 changed files with 21 additions and 32 deletions
--- 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>