aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-01 07:26:16 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-01 07:37:49 +0200
commit66b9c167d6115ffa36ec92dd4d196d0e452d695a (patch)
tree0d8cc07e5970fddca2a011d0d41e8dd484b54556 /OpenKeychain/src/main
parent3e55fca0e5dcad792d821c3a20fc4c404083a124 (diff)
downloadopen-keychain-66b9c167d6115ffa36ec92dd4d196d0e452d695a.tar.gz
open-keychain-66b9c167d6115ffa36ec92dd4d196d0e452d695a.tar.bz2
open-keychain-66b9c167d6115ffa36ec92dd4d196d0e452d695a.zip
linked: update icon design of github l-id creation
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/account_key.pngbin0 -> 1078 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/link_24dp.pngbin0 -> 597 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/account_key.pngbin0 -> 678 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/link_24dp.pngbin0 -> 357 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/account_key.pngbin0 -> 1414 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.pngbin0 -> 719 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.pngbin4973 -> 0 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/account_key.pngbin0 -> 2266 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.pngbin0 -> 1087 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.pngbin0 -> 1418 bytes
-rw-r--r--OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml34
11 files changed, 27 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/account_key.png b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png
new file mode 100644
index 000000000..b6a99772e
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png
new file mode 100644
index 000000000..17482011b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/account_key.png b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png
new file mode 100644
index 000000000..d5e22f248
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png
new file mode 100644
index 000000000..df43ca5f4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png b/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png
new file mode 100644
index 000000000..14ce08dbc
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png
new file mode 100644
index 000000000..95eaeb381
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
index 568b48c43..e69de29bb 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png b/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png
new file mode 100644
index 000000000..c100a3034
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png
new file mode 100644
index 000000000..a87af0738
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png
new file mode 100644
index 000000000..b8778938f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index 983d4efd5..be1f5e7a9 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -15,17 +15,37 @@
android:padding="16dp"
android:orientation="vertical">
- <ImageView
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_margin="8dp"
- android:src="@drawable/linked_github" />
+ android:layout_gravity="center_horizontal">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:src="@drawable/linked_github" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_margin="8dp"
+ android:src="@drawable/link_24dp" />
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_margin="8dp"
+ android:src="@drawable/account_key" />
+
+ </LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="This operation links your key to your GitHub account."
style="?android:textAppearanceSmall"/>
@@ -111,8 +131,8 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="?android:buttonBarButtonStyle"
- android:drawableLeft="@drawable/ic_person_add_grey_24dp"
- android:drawableStart="@drawable/ic_person_add_grey_24dp"
+ android:drawableLeft="@drawable/link_24dp"
+ android:drawableStart="@drawable/link_24dp"
android:drawablePadding="12dp"
android:text="Link to Github Account"
android:id="@+id/button_send"