diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 16:06:37 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 16:06:37 +0200 |
commit | c2163460971cc01e65d7dfd18eec491f01ebc744 (patch) | |
tree | a34080d4c8f2b4cecff51990f83ad53f105cbaae /OpenKeychain | |
parent | a4b7daf266b037c6a39cef0586aadedf32861ad5 (diff) | |
download | open-keychain-c2163460971cc01e65d7dfd18eec491f01ebc744.tar.gz open-keychain-c2163460971cc01e65d7dfd18eec491f01ebc744.tar.bz2 open-keychain-c2163460971cc01e65d7dfd18eec491f01ebc744.zip |
minor ui and wording changes
Diffstat (limited to 'OpenKeychain')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 20 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 8 |
2 files changed, 20 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index c4f9279a2..377ce4fb6 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:card_view="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="16dp" @@ -111,22 +112,33 @@ </ViewAnimator> - <FrameLayout + <!-- this layout is used for a highlight thing, so we use padding instead of margin --> + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" + android:paddingLeft="14dp" + android:paddingRight="14dp" android:id="@+id/cert_key_spincontainer" android:visibility="gone" + tools:visibility="visible" > + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_marginRight="4dp" + android:layout_marginEnd="4dp" + android:text="@string/add_keys_my_key" /> + <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner - android:layout_marginLeft="14dp" - android:layout_marginRight="14dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/cert_key_spinner"> </org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner> - </FrameLayout> + </LinearLayout> <LinearLayout android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 98c264113..6a13a0b4f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1316,10 +1316,10 @@ <string name="linked_create_verify">"Verify"</string> <string name="linked_text_clipboard">Text has been copied to clipboard</string> - <string name="linked_verified_https">"The link between this Website and key was securely verified. If you believe the Website is genuine, you may confirm this Identity with your key."</string> - <string name="linked_verified_github">"The link between this Github account and key was securely verified. If you believe the account is genuine, you may confirm this Identity with your key."</string> - <string name="linked_verified_dns">"The link between this Domain Name and key was securely verified. If you believe the Domain is genuine, you may confirm this Identity with your key."</string> - <string name="linked_verified_twitter">"The link between this Twitter account and key was securely verified. If you believe the account is genuine, you may confirm this Identity with your key."</string> + <string name="linked_verified_https">"The link between this Website and key was securely verified. If you believe the Website is genuine, confirm this verification with your key."</string> + <string name="linked_verified_github">"The link between this Github account and key was securely verified. If you believe the account is genuine, confirm this verification with your key."</string> + <string name="linked_verified_dns">"The link between this Domain Name and key was securely verified. If you believe the Domain is genuine, confirm this verification with your key."</string> + <string name="linked_verified_twitter">"The link between this Twitter account and key was securely verified. If you believe the account is genuine, confirm this verification with your key."</string> <string name="linked_verified_secret_https">"The link between your Website and key was securely verified. Everything looks in order."</string> <string name="linked_verified_secret_github">"The link between your Github account and key was securely verified. Everything looks in order."</string> <string name="linked_verified_secret_dns">"The link between your Domain Name and key was securely verified. Everything looks in order."</string> |