From 9f7f4fd27a02c02b15df613710433dfc35ad8e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 15 Feb 2014 18:04:30 +0100
Subject: [PATCH] Add None-entry to ListPreference

---
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1520 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1032 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1570 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 2345 bytes
 .../keychain-api-library/res/values/strings.xml  |   6 ++++++
 .../openpgp/util/OpenPgpListPreference.java      |   6 ++++++
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1520 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1032 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 1570 bytes
 .../ic_action_cancel_launchersize.png            | Bin 0 -> 2345 bytes
 .../keychain-api-library/res/values/strings.xml  |   6 ++++++
 .../openpgp/util/OpenPgpListPreference.java      |   6 ++++++
 12 files changed, 24 insertions(+)
 create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
 create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
 create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
 create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
 create mode 100644 OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml
 create mode 100644 libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
 create mode 100644 libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
 create mode 100644 libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
 create mode 100644 libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
 create mode 100644 libraries/keychain-api-library/res/values/strings.xml

diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b9118dc0f992fc88cf91375090f1c04fc76e84
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U1I10R^(wm_Psk1${|G
zK~#9!?VC?)6loB~f6wbA2D8MAhrM_TUS?5pkVPa&@DN$Zc^CW+@x$nM5WEL=&0z_P
zNDxn(thelCFA924Fsw;@pFN~{wlmHo^RIiN^aBH7GSgjMZ~fk?uC9SbjT$v-)TmLT
zMvWRZYSidklkK72|5k1ILOJIX2H2j<InQ((m~*bwG2KqcInU&r=la<>tkNV_&UONB
z1J};M3SN_RJ8T+Ttx+8#srdT}@FQ?f(ubV$b4kBT`jk@o;`5V?p7JqmUj**PLM;Gu
zwqHnkJB|$_IjA^M&N+p1eg<v;Nzzr|jqP1Y2gT<L)C#AK8?{}|nFW3TegT$%3|tNy
ze@iLlQ5PtUu?NjbS^@5bbMUeCi@*b5rI%AH(u(Z|z@m>u*mO_QN_kJJC4xeqf!Dx?
z;N6n2Juj&ZtmT}Mv?b}FgyhK1>Veg)?G<1RXalXVL4d-x*OETh?x2*?A@C~poU0Kz
z^MHXF+qYsbcxQWO9NhY0W&66M`?lMXW^89kNcsru*?yi<dNodHjve<o=ZnGrgIL8G
zNjZ-F(e|FC$C5U?)AN`PTD5&&(jqV)TqWR8(ktMh?Y~k=pT@bqG|omDQSb@a4JT|%
zIt=Hi3%AwSOp!!NX`nKoz^a7ktnJkjR`bRA!a3W(W81rB=Zso%jGV>FtC~_e05;>j
zg<iNx8Va{ju>v;A(OMk8_AJ(CwYO|Pvb|^fD2|^cwIai;kD1+8fOTL|Qp<J*Qk-iK
zcw~F4Us*DhJ*Ydg<eX<C{jUMHB1#p}bOdbM-YBwLpW?GuowEY0MKrboVFO2j)rRe@
zh~|kEsI74w)DO2v@e2_-^HB!O0DW;gr3kzZ+y~lmj2stVWUGyo(!{W;46!bCaEr)E
zQQ`K*?UW*LJ@&Ph?HqMi2P<HrSWOhML2)aiaTac8VI}DZs0^!#B31=%)5fYU#7^KA
z8D>!2rixW%h@Exc)C-vsZhzQ*78kl~`%XWsfW8@U(rQ)Zpl;maf=<Kjrlg|bc6pju
z)#9KtaC;XBwSk$y?UL=exY$$_fxux2tDQQqss*tDaa*;0Q_`jG#j<@QX&-nAY}ScY
z?GbbeZkM8uT{N_c4u6V{z<b-z>c(msS!^KZokz8%jM#E)$f?JIrTE{n?fn9=Djx*Y
z?x4t6r`}tYHtC}>Vzw_xx(wU_u1umc`L!U{uL#@+-o$HvkbAeUI)Y9s6eDtqLXqe~
zzO?-;zOx*WQ+%ef2LZJ^Xb`M=6@kEJk*#d+OS&>ltE4L2(v-34*$Irlhia8n6+x;C
ztJ7K*-9_Ml_io#^H-Pis?&ybA(O@66WijNv+bu~8wkyT0O2k%(2Kz8Ai(y+Ok}Abb
z=LM@#n)Y?z)|xg}z3#0FOp4=A6Sqk}7dwGfIOhablC}m4?H(&1-#vj_v_(3&g$)zK
zP3HxxQP0KkL`P+~jWs|Oh!n#Ml{DDL!0m0$xih>lY9vi!lm3b0$*#`x_`vEAcqQo(
zuv3nlNsYfmb-r%9bJH8qR8;3rB>g&-G#}HXZH{LGmw@jAD@p21S#&$67<(CJ(=4K=
z+&7A2?f{SDT%D<suw@CjZM)q)eOp(dcmepH<7tlkzuna}*ayKaoa1;cgpGfP1M728
zO6lL2=9r7d){Pi_+mrNA(r#59$UfQaZOkbyNiy)K?WeI>=UOAEG}M%BzlhL(FX@Br
z=P}t;$^B8UVp7t9?Y|^F0se`|c`E5e^tNm3K%Q_?u_xr5lkK~)C!P3Am6P_prs#9d
zZQFN?LGoVH__e6lPZ4ZS{ig`FC;C%_i5NM|``@Y!jT$v-)TmLTMvWRZYSgGvZTb%j
W*H?WZ49jo;0000<MNUMnLSTXuisT6Z

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..270abf45fdd55510fc885046717a66bd73cc9379
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U1I10TwoB*`5FZ1C>cc
zK~!ko?U*}n6iF0?zf&H`Uda4NNrr$;On?v;j>rh?V1!5riSe&-z9HF)00(4_jAn(b
zl^j?bFv+HX1EXb)wA3NFZS~Hh-R*8?eWQ`O>fWmAZ|*tO&_^GA^wCEj6_Il$=Un-`
zP422^wy(^Q+HO$Njm)i^w{~^gw}CshA4vLW`$J0UM{!z`Y8Nd|wiustUXt_>xC<Nu
ze@ptOPOc_z;0~|@yaJv}x|efa0Z1t!sTNMto3*_n=^pSra_>YfI^BTn2f#C68F&or
zNgCQ#lh<Az6LW{a9`M-qGVm;Fb-MvcAAuuD7r+{@3A_Nda?UCix9HDj8{1`U1Z+i)
zO<+yZh3%uLRVxM!5c**ItEAge@Rse}SkQUSd6H7PNGV;SQvN-4@+-E7z)s}Iz-QnD
z_zn2$Cf>jgU;^v|hqhA`ei8^Q#AzBE+e1lvF*n;zz#*_NX%e-%*+5wbQc4%LPk{sA
zE$|K4khCdj2B$^X#Mn(>1NbKCEpTA_G!VU<+Zv&1BvMMwIgf#J+iQ{*;#32hPm)e-
zzXncIN}h*YR|u6i<t8{?g$*z%7T;7H8*QN6VNyyLKqXGLQ!KO+o5(eTT-RNwDNg^{
z{x>%Nv`cKRWhJJ2dbwCA@=(%?skV3)Lso6C11V1awe3l9^7C@u=mzFlf}FD?Z2?b#
z?GU^2roTu!0^Zpk7bidMi<-vZx*I5PDo!q?WZQoPHor<*0}6ALB%RrQBk82P_%?2~
z6FXhyGONaP6{!tE(;_A55ikN)OZkf$tH4OoqoT!@#qPQ>=;BXYh?MOeNxOm0XW%Tx
zt^(`8$o4?ejM!Zlr$GnUC_2zy^!XgZc4Yfa3>(=VmBelh*bnQ_im5@{&J%*Q6B@8#
z`;(+Y;GLwCnEFf9dJ;lbh}}WXd7M&mfm73tH0T(cMItqpbY8kg+_JqJi*1EdYKx7e
z|9KnRGu|dz>?EFDdZ(B><DEL~Li4&!U~}nhY+rhtIQbb%yvRG1aGGnyJG0Yuu#t2+
zPo$>At`SaMUh0>w!lq6~kyHn#rJE44hrmnVKCpfjHq%$i8aS;-?w3)k^EP_d_BOCA
z>C08vEV>X?;B+5Yk+co`35>gb1INJcz<1m4i<?v%Au4bRQF{-3j~d6F+v%!Li%kWn
z%TJ57idB6wY-7Z#=63dVx(m<VM<0Fk(MKOQ6+Z#skRU%`ApOYz0000<MNUMnLSTZR
Cir5$c

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e3571fa54c171b4555fb6c15a72a33de76fcb17
GIT binary patch
literal 1570
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

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..52044601e4036ee1da50f18550af7cdf9dc458b0
GIT binary patch
literal 2345
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

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml
new file mode 100644
index 000000000..a198d0b5e
--- /dev/null
+++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="openpgp_list_preference_none">None</string>
+
+</resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
index e29794e87..4917b6993 100644
--- a/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
@@ -33,6 +33,8 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.sufficientlysecure.keychain.api.R;
+
 public class OpenPgpListPreference extends DialogPreference {
     ArrayList<OpenPgpProviderEntry> mProviderList = new ArrayList<OpenPgpProviderEntry>();
     private String mSelectedPackage;
@@ -55,6 +57,10 @@ public class OpenPgpListPreference extends DialogPreference {
                 mProviderList.add(new OpenPgpProviderEntry(packageName, simpleName, icon));
             }
         }
+
+        // add "none"
+        mProviderList.add(0, new OpenPgpProviderEntry("", context.getString(R.string.openpgp_list_preference_none),
+                context.getResources().getDrawable(R.drawable.ic_action_cancel_launchersize)));
     }
 
     public OpenPgpListPreference(Context context) {
diff --git a/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b9118dc0f992fc88cf91375090f1c04fc76e84
GIT binary patch
literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U1I10R^(wm_Psk1${|G
zK~#9!?VC?)6loB~f6wbA2D8MAhrM_TUS?5pkVPa&@DN$Zc^CW+@x$nM5WEL=&0z_P
zNDxn(thelCFA924Fsw;@pFN~{wlmHo^RIiN^aBH7GSgjMZ~fk?uC9SbjT$v-)TmLT
zMvWRZYSidklkK72|5k1ILOJIX2H2j<InQ((m~*bwG2KqcInU&r=la<>tkNV_&UONB
z1J};M3SN_RJ8T+Ttx+8#srdT}@FQ?f(ubV$b4kBT`jk@o;`5V?p7JqmUj**PLM;Gu
zwqHnkJB|$_IjA^M&N+p1eg<v;Nzzr|jqP1Y2gT<L)C#AK8?{}|nFW3TegT$%3|tNy
ze@iLlQ5PtUu?NjbS^@5bbMUeCi@*b5rI%AH(u(Z|z@m>u*mO_QN_kJJC4xeqf!Dx?
z;N6n2Juj&ZtmT}Mv?b}FgyhK1>Veg)?G<1RXalXVL4d-x*OETh?x2*?A@C~poU0Kz
z^MHXF+qYsbcxQWO9NhY0W&66M`?lMXW^89kNcsru*?yi<dNodHjve<o=ZnGrgIL8G
zNjZ-F(e|FC$C5U?)AN`PTD5&&(jqV)TqWR8(ktMh?Y~k=pT@bqG|omDQSb@a4JT|%
zIt=Hi3%AwSOp!!NX`nKoz^a7ktnJkjR`bRA!a3W(W81rB=Zso%jGV>FtC~_e05;>j
zg<iNx8Va{ju>v;A(OMk8_AJ(CwYO|Pvb|^fD2|^cwIai;kD1+8fOTL|Qp<J*Qk-iK
zcw~F4Us*DhJ*Ydg<eX<C{jUMHB1#p}bOdbM-YBwLpW?GuowEY0MKrboVFO2j)rRe@
zh~|kEsI74w)DO2v@e2_-^HB!O0DW;gr3kzZ+y~lmj2stVWUGyo(!{W;46!bCaEr)E
zQQ`K*?UW*LJ@&Ph?HqMi2P<HrSWOhML2)aiaTac8VI}DZs0^!#B31=%)5fYU#7^KA
z8D>!2rixW%h@Exc)C-vsZhzQ*78kl~`%XWsfW8@U(rQ)Zpl;maf=<Kjrlg|bc6pju
z)#9KtaC;XBwSk$y?UL=exY$$_fxux2tDQQqss*tDaa*;0Q_`jG#j<@QX&-nAY}ScY
z?GbbeZkM8uT{N_c4u6V{z<b-z>c(msS!^KZokz8%jM#E)$f?JIrTE{n?fn9=Djx*Y
z?x4t6r`}tYHtC}>Vzw_xx(wU_u1umc`L!U{uL#@+-o$HvkbAeUI)Y9s6eDtqLXqe~
zzO?-;zOx*WQ+%ef2LZJ^Xb`M=6@kEJk*#d+OS&>ltE4L2(v-34*$Irlhia8n6+x;C
ztJ7K*-9_Ml_io#^H-Pis?&ybA(O@66WijNv+bu~8wkyT0O2k%(2Kz8Ai(y+Ok}Abb
z=LM@#n)Y?z)|xg}z3#0FOp4=A6Sqk}7dwGfIOhablC}m4?H(&1-#vj_v_(3&g$)zK
zP3HxxQP0KkL`P+~jWs|Oh!n#Ml{DDL!0m0$xih>lY9vi!lm3b0$*#`x_`vEAcqQo(
zuv3nlNsYfmb-r%9bJH8qR8;3rB>g&-G#}HXZH{LGmw@jAD@p21S#&$67<(CJ(=4K=
z+&7A2?f{SDT%D<suw@CjZM)q)eOp(dcmepH<7tlkzuna}*ayKaoa1;cgpGfP1M728
zO6lL2=9r7d){Pi_+mrNA(r#59$UfQaZOkbyNiy)K?WeI>=UOAEG}M%BzlhL(FX@Br
z=P}t;$^B8UVp7t9?Y|^F0se`|c`E5e^tNm3K%Q_?u_xr5lkK~)C!P3Am6P_prs#9d
zZQFN?LGoVH__e6lPZ4ZS{ig`FC;C%_i5NM|``@Y!jT$v-)TmLTMvWRZYSgGvZTb%j
W*H?WZ49jo;0000<MNUMnLSTXuisT6Z

literal 0
HcmV?d00001

diff --git a/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..270abf45fdd55510fc885046717a66bd73cc9379
GIT binary patch
literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U1I10TwoB*`5FZ1C>cc
zK~!ko?U*}n6iF0?zf&H`Uda4NNrr$;On?v;j>rh?V1!5riSe&-z9HF)00(4_jAn(b
zl^j?bFv+HX1EXb)wA3NFZS~Hh-R*8?eWQ`O>fWmAZ|*tO&_^GA^wCEj6_Il$=Un-`
zP422^wy(^Q+HO$Njm)i^w{~^gw}CshA4vLW`$J0UM{!z`Y8Nd|wiustUXt_>xC<Nu
ze@ptOPOc_z;0~|@yaJv}x|efa0Z1t!sTNMto3*_n=^pSra_>YfI^BTn2f#C68F&or
zNgCQ#lh<Az6LW{a9`M-qGVm;Fb-MvcAAuuD7r+{@3A_Nda?UCix9HDj8{1`U1Z+i)
zO<+yZh3%uLRVxM!5c**ItEAge@Rse}SkQUSd6H7PNGV;SQvN-4@+-E7z)s}Iz-QnD
z_zn2$Cf>jgU;^v|hqhA`ei8^Q#AzBE+e1lvF*n;zz#*_NX%e-%*+5wbQc4%LPk{sA
zE$|K4khCdj2B$^X#Mn(>1NbKCEpTA_G!VU<+Zv&1BvMMwIgf#J+iQ{*;#32hPm)e-
zzXncIN}h*YR|u6i<t8{?g$*z%7T;7H8*QN6VNyyLKqXGLQ!KO+o5(eTT-RNwDNg^{
z{x>%Nv`cKRWhJJ2dbwCA@=(%?skV3)Lso6C11V1awe3l9^7C@u=mzFlf}FD?Z2?b#
z?GU^2roTu!0^Zpk7bidMi<-vZx*I5PDo!q?WZQoPHor<*0}6ALB%RrQBk82P_%?2~
z6FXhyGONaP6{!tE(;_A55ikN)OZkf$tH4OoqoT!@#qPQ>=;BXYh?MOeNxOm0XW%Tx
zt^(`8$o4?ejM!Zlr$GnUC_2zy^!XgZc4Yfa3>(=VmBelh*bnQ_im5@{&J%*Q6B@8#
z`;(+Y;GLwCnEFf9dJ;lbh}}WXd7M&mfm73tH0T(cMItqpbY8kg+_JqJi*1EdYKx7e
z|9KnRGu|dz>?EFDdZ(B><DEL~Li4&!U~}nhY+rhtIQbb%yvRG1aGGnyJG0Yuu#t2+
zPo$>At`SaMUh0>w!lq6~kyHn#rJE44hrmnVKCpfjHq%$i8aS;-?w3)k^EP_d_BOCA
z>C08vEV>X?;B+5Yk+co`35>gb1INJcz<1m4i<?v%Au4bRQF{-3j~d6F+v%!Li%kWn
z%TJ57idB6wY-7Z#=63dVx(m<VM<0Fk(MKOQ6+Z#skRU%`ApOYz0000<MNUMnLSTZR
Cir5$c

literal 0
HcmV?d00001

diff --git a/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e3571fa54c171b4555fb6c15a72a33de76fcb17
GIT binary patch
literal 1570
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

literal 0
HcmV?d00001

diff --git a/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/libraries/keychain-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png
new file mode 100644
index 0000000000000000000000000000000000000000..52044601e4036ee1da50f18550af7cdf9dc458b0
GIT binary patch
literal 2345
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

literal 0
HcmV?d00001

diff --git a/libraries/keychain-api-library/res/values/strings.xml b/libraries/keychain-api-library/res/values/strings.xml
new file mode 100644
index 000000000..a198d0b5e
--- /dev/null
+++ b/libraries/keychain-api-library/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="openpgp_list_preference_none">None</string>
+
+</resources>
\ No newline at end of file
diff --git a/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
index e29794e87..4917b6993 100644
--- a/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
+++ b/libraries/keychain-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java
@@ -33,6 +33,8 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.sufficientlysecure.keychain.api.R;
+
 public class OpenPgpListPreference extends DialogPreference {
     ArrayList<OpenPgpProviderEntry> mProviderList = new ArrayList<OpenPgpProviderEntry>();
     private String mSelectedPackage;
@@ -55,6 +57,10 @@ public class OpenPgpListPreference extends DialogPreference {
                 mProviderList.add(new OpenPgpProviderEntry(packageName, simpleName, icon));
             }
         }
+
+        // add "none"
+        mProviderList.add(0, new OpenPgpProviderEntry("", context.getString(R.string.openpgp_list_preference_none),
+                context.getResources().getDrawable(R.drawable.ic_action_cancel_launchersize)));
     }
 
     public OpenPgpListPreference(Context context) {