merge 1.0.x back into trunk

This commit is contained in:
Thialfihar
2010-06-30 19:59:33 +00:00
parent 933ec4f7b6
commit 16cea885e2
45 changed files with 21 additions and 32 deletions

View File

@@ -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>