cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge 1.0.x back into trunk

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
res/layout/decrypt.xml
View File

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

4
res/layout/edit_key.xml
View File

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

4
res/layout/encrypt.xml
View File

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

8
res/layout/main.xml
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>