From 6565adc5ccf713da73650b19d203831e25446f80 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 8 Jul 2015 15:24:10 +0200
Subject: [PATCH] keylist: show delete as icon in multi-select

---
 Graphics/get-material-icons.sh                    |   3 ++-
 .../res/drawable-hdpi/ic_delete_white_24dp.png    | Bin 0 -> 161 bytes
 .../res/drawable-mdpi/ic_delete_white_24dp.png    | Bin 0 -> 115 bytes
 .../res/drawable-xhdpi/ic_delete_white_24dp.png   | Bin 0 -> 151 bytes
 .../res/drawable-xxhdpi/ic_delete_white_24dp.png  | Bin 0 -> 194 bytes
 .../res/drawable-xxxhdpi/ic_delete_white_24dp.png | Bin 0 -> 243 bytes
 OpenKeychain/src/main/res/menu/key_list_multi.xml |   5 ++---
 7 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index d513e0a7a..758ddc8aa 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -59,6 +59,7 @@ python copy OpenKeychain file white folder 24
 
 # multi select
 python copy OpenKeychain action white lock 24
+python copy OpenKeychain action white delete 24
 
 # yubikey dialog
-python copy OpenKeychain action black check_circle 48
\ No newline at end of file
+python copy OpenKeychain action black check_circle 48
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a9f769475ae98c44086a5498057c799cdc1eb2e
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{Th{y5d1PNA=hW|4Ewf~tb
z9PIip^F(s<V|%L`j#~m9sykVEozEz|Iu^#9=rPC9r6I7{jaSMv<H~}CsTb^<p8Zih
zx1gAX*UEX0quKxc4@{q3uGdcLuAlk;rv>-FKmRW+J}dc&f#K)gg?ihMxz_^iWbkzL
Kb6Mw<&;$SheLUU(

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f5f35558db0965392b15b5d8950261a8c92aab
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1D^C~45R22v2@-!E>_7CM{eR+v
zgY~R6ULP4=Whfl~yJVLAs>BdxJ>K;jR@FB~H~;@Xea5N(zxh7d@H058PdfN2J>(P6
O6b4UMKbLh*2~7YiM=IO^

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..388b5b060af924493b057a63216fe7db75d4435a
GIT binary patch
literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FC64-Fko=L=%?Iw
zv$u;+&1tXu2b~*Nwk`N$?;xkbvPe<$)w&zy|9BUkVz|Zlf5mTGpk6SDXXMMa|9v2f
u@g#fN+oPXnt4Z(ZaQ*pHX6dTRMUVWXo;a(XeY#{ZNU5i*pUXO@geCyi%r-Ls

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fcdfdb55ebcba8d2fff8be03ea3518c137e3464
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawIz3$+Lo)8Yy>yn>!GXc$q3uOx
zabB)cz0QC}ts}W53MuVBD%UsZPv&gw=#W`?Y0ciWQ2$4FyseJx>{`Oj#KIv^yWsd<
zb^!&41_nkD7m4wnX|34#N6cTv0=_gxaj*E+Smb+hj$`D9r9sI`%Q@~%Ssl3i>7S{h
gq0!eBm41aw^UfFNx4vv@4|EiRr>mdKI;Vst0RDqR&j0`b

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d322aa9baba09c58b0058760fb7d53a392b63a1
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgc6quuhE&{od*w9mAp-%|!1oIz
zUAkW?IxdlN5p^sPGLtM@^D{+9cy9DT>q|G5dQ4KuY+ck{{`y~aU3Uxr^X+awlIm)m
zLim6tF)Yw+SYp*L31Z?03ltA1m;Rr_zhgPmvYG>yq8FYs_ibEqHvUn-r*1=DgDFx+
z?bd02*59bTR4g&(=Y(kztIpQ%Z4JJY^zZNE9?f4`+x0ysZP__5=_$iXi`hvQAj>>m
L{an^LB{Ts5t^ZVx

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml
index 77d61788e..26bc9f98f 100644
--- a/OpenKeychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenKeychain/src/main/res/menu/key_list_multi.xml
@@ -9,8 +9,7 @@
 
     <item
         android:id="@+id/menu_key_list_multi_delete"
-        android:showAsAction="never"
-        android:title="@string/menu_delete_key"
-        tools:ignore="AppCompatResource" />
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/menu_delete_key" />
 
 </menu>