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

small ui changes in encrypt

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-09-01 21:43:15 +02:00
parent 6a3e7921cf
commit 6b5e65253c
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
View File

@@ -72,7 +72,7 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView {
private void initView() { private void initView() {
swapCursor(null); swapCursor(null);
setPrefix(getContext().getString(R.string.label_to)); setPrefix(getContext().getString(R.string.label_to) + " ");
allowDuplicates(false); allowDuplicates(false);
} }

13
OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View File

@@ -8,6 +8,11 @@
android:paddingRight="16dp" android:paddingRight="16dp"
android:paddingLeft="16dp"> android:paddingLeft="16dp">
<org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
android:id="@+id/recipient_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -22,7 +27,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/label_asymmetric_from" /> android:text="@string/label_asymmetric_from"
android:paddingRight="8dp"/>
<org.sufficientlysecure.keychain.ui.widget.SignKeySpinner <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
android:id="@+id/sign" android:id="@+id/sign"
@@ -31,9 +37,4 @@
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
</LinearLayout> </LinearLayout>
<org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
android:id="@+id/recipient_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>

4
OpenKeychain/src/main/res/layout/recipient_box_entry.xml
View File

@@ -9,9 +9,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dip"
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"
android:padding="4dp"/>
<ImageView <ImageView
android:id="@android:id/icon" android:id="@android:id/icon"

6
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -92,8 +92,8 @@
<string name="label_file_ascii_armor">Files: ASCII Armor</string> <string name="label_file_ascii_armor">Files: ASCII Armor</string>
<string name="label_write_version_header">Let others know that you\'re using OpenKeychain</string> <string name="label_write_version_header">Let others know that you\'re using OpenKeychain</string>
<string name="label_write_version_header_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string> <string name="label_write_version_header_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
<string name="label_asymmetric_from">From:</string> <string name="label_asymmetric_from">Signed by:</string>
<string name="label_to">To:</string> <string name="label_to">Encrypt to:</string>
<string name="label_delete_after_encryption">Files: Delete After Encryption</string> <string name="label_delete_after_encryption">Files: Delete After Encryption</string>
<string name="label_delete_after_decryption">Delete After Decryption</string> <string name="label_delete_after_decryption">Delete After Decryption</string>
<string name="label_encryption_algorithm">Encryption Algorithm</string> <string name="label_encryption_algorithm">Encryption Algorithm</string>
@@ -506,7 +506,7 @@
<string name="my_keys">My Keys</string> <string name="my_keys">My Keys</string>
<!-- hints --> <!-- hints -->
<string name="encrypt_content_edit_text_hint">The message entered here will be signed using the key selected in \'From\' and encrypted for all recipients selected in \'To\'.</string> <string name="encrypt_content_edit_text_hint">The message entered here will be signed using the key selected in \'Signed by\' and encrypted for all recipients selected in \'Encrypt to\'.</string>
<string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string> <string name="decrypt_content_edit_text_hint">Enter ciphertext here to decrypt and/or verify…</string>
<!-- certs --> <!-- certs -->