diff options
author | Andreas Straub <andy@strb.org> | 2015-07-10 02:56:44 +0200 |
---|---|---|
committer | Andreas Straub <andy@strb.org> | 2015-07-19 22:23:27 +0200 |
commit | 3d339460889644c859d932eb3f2e324bd5696707 (patch) | |
tree | e78c64e213b8b8483063c1bb13600d8122a88c5d /src/main/res | |
parent | 35714d3d08d287c5ded125c356835fb70ab342b7 (diff) |
Add key trust toggle to ContactDetailsActivity
Can now toggle IdentityKey trust
Diffstat (limited to '')
-rw-r--r-- | src/main/res/drawable-hdpi/ic_action_done.png | bin | 0 -> 1320 bytes | |||
-rw-r--r-- | src/main/res/drawable-hdpi/ic_done_black_24dp.png | bin | 0 -> 177 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_action_done.png | bin | 0 -> 1197 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_done_black_24dp.png | bin | 0 -> 130 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_action_done.png | bin | 0 -> 1546 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_done_black_24dp.png | bin | 0 -> 188 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_done_black_24dp.png | bin | 0 -> 227 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png | bin | 0 -> 277 bytes | |||
-rw-r--r-- | src/main/res/layout/contact_key.xml | 10 | ||||
-rw-r--r-- | src/main/res/values-v21/themes.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 1 |
12 files changed, 13 insertions, 0 deletions
diff --git a/src/main/res/drawable-hdpi/ic_action_done.png b/src/main/res/drawable-hdpi/ic_action_done.png Binary files differnew file mode 100644 index 000000000..58bf97217 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_action_done.png diff --git a/src/main/res/drawable-hdpi/ic_done_black_24dp.png b/src/main/res/drawable-hdpi/ic_done_black_24dp.png Binary files differnew file mode 100644 index 000000000..d4c06072b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_done_black_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_action_done.png b/src/main/res/drawable-mdpi/ic_action_done.png Binary files differnew file mode 100644 index 000000000..cf5fab3ad --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_action_done.png diff --git a/src/main/res/drawable-mdpi/ic_done_black_24dp.png b/src/main/res/drawable-mdpi/ic_done_black_24dp.png Binary files differnew file mode 100644 index 000000000..5e5e7cf2b --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_done_black_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_action_done.png b/src/main/res/drawable-xhdpi/ic_action_done.png Binary files differnew file mode 100644 index 000000000..b8915716e --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_action_done.png diff --git a/src/main/res/drawable-xhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xhdpi/ic_done_black_24dp.png Binary files differnew file mode 100644 index 000000000..64a4944f7 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_done_black_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png Binary files differnew file mode 100644 index 000000000..c9c017410 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_done_black_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png Binary files differnew file mode 100644 index 000000000..2f6d6386d --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 79b9af620..a43f8083b 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -50,4 +50,14 @@ android:src="?attr/icon_remove" android:visibility="invisible" /> + <ImageButton + android:id="@+id/button_trust" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?android:selectableItemBackground" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_done" + android:visibility="invisible" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index d1679f928..78deb772f 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -18,6 +18,7 @@ <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item> <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item> <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item> + <item name="attr/icon_done">@drawable/ic_done_black_24dp</item> <item name="attr/icon_group">@drawable/ic_group_white_24dp</item> <item name="attr/icon_new">@drawable/ic_add_white_24dp</item> <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index e314f752f..d471e54ac 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -14,6 +14,7 @@ <attr name="icon_download" format="reference"/> <attr name="icon_edit" format="reference"/> <attr name="icon_edit_dark" format="reference"/> + <attr name="icon_done" format="reference"/> <attr name="icon_group" format="reference"/> <attr name="icon_new" format="reference"/> <attr name="icon_new_attachment" format="reference"/> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 5c67203be..afdc3e809 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -18,6 +18,7 @@ <item name="attr/icon_download">@drawable/ic_action_download</item> <item name="attr/icon_edit">@drawable/ic_action_edit</item> <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item> + <item name="attr/icon_done">@drawable/ic_action_done</item> <item name="attr/icon_group">@drawable/ic_action_group</item> <item name="attr/icon_new">@drawable/ic_action_new</item> |