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/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"/>