diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-04 19:53:50 +0100 |
| commit | d090d4d332c9b1f5174890de531e2cc6936c038b (patch) | |
| tree | 0ab75b52d12bfb464c0588a1f4a09b2d595b7113 /OpenPGP-Keychain/src/main/res | |
| parent | b78a564de3d8c3771d2e8ae445e0a43b026531ab (diff) | |
| download | open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.gz open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.tar.bz2 open-keychain-d090d4d332c9b1f5174890de531e2cc6936c038b.zip | |
work on lookup key, fix some illegal state exceptions with hack
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml | 58 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 7 |
2 files changed, 39 insertions, 26 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index c6834d745..91ee15c38 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -20,10 +20,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingTop="4dp" android:paddingLeft="10dp" android:paddingRight="10dp"> - <LinearLayout + <RelativeLayout android:id="@+id/signature" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,7 +36,8 @@ <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:id="@+id/relativeLayout"> <ImageView android:id="@+id/ic_signature" @@ -50,29 +52,41 @@ android:src="@drawable/overlay_error" /> </RelativeLayout> - <LinearLayout + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:visibility="gone" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip"> + android:layout_height="50dp" + android:padding="4dp" + android:text="@string/btn_lookup_key" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" + bootstrapbutton:bb_size="small" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignTop="@+id/linearLayout" + android:layout_toRightOf="@+id/relativeLayout" /> - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id Rest" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_alignBottom="@+id/relativeLayout" + android:layout_alignLeft="@+id/mainUserId" + android:layout_alignStart="@+id/mainUserId" /> + </RelativeLayout> <LinearLayout android:layout_width="match_parent" diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 8c26ac548..ff63ea58a 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -65,7 +65,7 @@ <string name="btn_back">Back</string> <string name="btn_clipboard">Clipboard</string> <string name="btn_share">Share with…</string> - + <string name="btn_lookup_key">Lookup key</string> <!-- menu --> <string name="menu_preferences">Settings</string> @@ -233,15 +233,14 @@ <item quantity="other">Found %d keys.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string> + <string name="unknown_signature">Unknown signature, click button to lookup the missing key.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d bad secret key ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> <item quantity="other">%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> </plurals> - <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string> - <string name="key_send_success">Successfully sent key to server</string> + <string name="key_send_success">Successfully uploaded key to server</string> <string name="key_sign_success">Successfully signed key</string> <string name="list_empty">This list is empty!</string> <string name="nfc_successfull">Successfully sent key with NFC Beam!</string> |