diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-12 21:04:18 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-01-12 21:04:18 +0100 |
commit | 3bbff31d4720e51c69033addc50aaa6f2da2de7e (patch) | |
tree | 12626537b0cf03e3032ae9b73144fa14d0c46661 /OpenKeychain/src/main/res | |
parent | ea72b29f2dbdef8104701d7eee6b35112078716e (diff) | |
download | open-keychain-3bbff31d4720e51c69033addc50aaa6f2da2de7e.tar.gz open-keychain-3bbff31d4720e51c69033addc50aaa6f2da2de7e.tar.bz2 open-keychain-3bbff31d4720e51c69033addc50aaa6f2da2de7e.zip |
add dns button to linked identity selection
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/drawable/dns.png | bin | 0 -> 2043 bytes | |||
-rw-r--r-- | OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml | 37 |
2 files changed, 36 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/drawable/dns.png b/OpenKeychain/src/main/res/drawable/dns.png Binary files differnew file mode 100644 index 000000000..69d0a4fa8 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/dns.png diff --git a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml index f9c28c5c3..37757ce64 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml +++ b/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml @@ -66,7 +66,42 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="0dip" android:layout_height="match_parent" - android:text="Website" + android:text="Website (HTTPS)" + android:layout_weight="1" + android:gravity="center_vertical" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:id="@+id/affirmation_create_dns_button" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <!-- separate ImageView required for recoloring --> + <ImageView + android:layout_width="60dip" + android:layout_height="60dip" + android:padding="8dp" + android:src="@drawable/dns" + android:layout_gravity="center" + /> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="Domain Name (DNS)" android:layout_weight="1" android:gravity="center_vertical" /> |