aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.pngbin0 -> 2616 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.pngbin0 -> 1457 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.pngbin0 -> 4012 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.pngbin0 -> 6626 bytes
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_share_fragment.xml2
-rw-r--r--OpenKeychain/src/main/res/raw/help_about.html2
6 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png
new file mode 100644
index 000000000..6ff9bb7b4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png
new file mode 100644
index 000000000..bfea67f33
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png
new file mode 100644
index 000000000..864a18d1a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png
new file mode 100644
index 000000000..02efa1d24
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
index 29a6fc5b1..e02ba83c3 100644
--- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml
@@ -135,7 +135,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
- android:src="@drawable/ic_action_secure"
+ android:src="@drawable/ic_action_safeslinger"
android:layout_gravity="center_vertical"
style="@style/SelectableItem" />
diff --git a/OpenKeychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html
index 580ac5865..1933a9225 100644
--- a/OpenKeychain/src/main/res/raw/help_about.html
+++ b/OpenKeychain/src/main/res/raw/help_about.html
@@ -26,6 +26,7 @@ And don't add newlines before or after p tags because of transifex -->
<li>Nikhil Peter Raj</li>
<li>Paul Sarbinowski</li>
<li>'Senecaso'</li>
+<li>Signe RĂ¼sch</li>
<li>Sreeram Boyapati</li>
<li>Thialfihar (APG 1.x)</li>
<li>Tim Bray</li>
@@ -44,6 +45,7 @@ And don't add newlines before or after p tags because of transifex -->
<li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li>
<li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li>
<li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li>
+<li><a href="https://github.com/SafeSlingerProject/exchange-android">SafeSlinger Exchange library</a> (MIT License)</li>
</ul>
</body>
</html>