From d6d679997b7bb7d6b10b58c8b1ce0a416ccf9b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 3 Feb 2015 18:39:07 +0100
Subject: [PATCH] Move encrypt decrypt operations in own starter activity

---
 Graphics/get-material-icons.sh                |   3 +-
 ...va => EncryptDecryptOverviewFragment.java} |  36 ++++++++++---
 .../keychain/ui/NavDrawerActivity.java        |   5 +-
 .../res/drawable-hdpi/ic_lock_black_24dp.png  | Bin 0 -> 397 bytes
 .../drawable-hdpi/ic_lock_open_black_24dp.png | Bin 393 -> 0 bytes
 .../ic_lock_outline_black_24dp.png            | Bin 398 -> 0 bytes
 .../res/drawable-mdpi/ic_lock_black_24dp.png  | Bin 0 -> 291 bytes
 .../drawable-mdpi/ic_lock_open_black_24dp.png | Bin 295 -> 0 bytes
 .../ic_lock_outline_black_24dp.png            | Bin 294 -> 0 bytes
 .../res/drawable-xhdpi/ic_lock_black_24dp.png | Bin 0 -> 498 bytes
 .../ic_lock_open_black_24dp.png               | Bin 450 -> 0 bytes
 .../ic_lock_outline_black_24dp.png            | Bin 484 -> 0 bytes
 .../drawable-xxhdpi/ic_lock_black_24dp.png    | Bin 0 -> 636 bytes
 .../ic_lock_open_black_24dp.png               | Bin 615 -> 0 bytes
 .../ic_lock_outline_black_24dp.png            | Bin 675 -> 0 bytes
 .../drawable-xxxhdpi/ic_lock_black_24dp.png   | Bin 0 -> 830 bytes
 .../ic_lock_open_black_24dp.png               | Bin 881 -> 0 bytes
 .../ic_lock_outline_black_24dp.png            | Bin 883 -> 0 bytes
 ... => encrypt_decrypt_overview_fragment.xml} |  49 ++++++++++++++----
 OpenKeychain/src/main/res/values/strings.xml  |  10 ++--
 20 files changed, 75 insertions(+), 28 deletions(-)
 rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/{DecryptOverviewFragment.java => EncryptDecryptOverviewFragment.java} (77%)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
 delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
 rename OpenKeychain/src/main/res/layout/{decrypt_overview_fragment.xml => encrypt_decrypt_overview_fragment.xml} (69%)

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index e5077276e..b26e73c9c 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -10,8 +10,7 @@ python copy OpenKeychain navigation white refresh 24
 
 # navigation drawer sections
 python copy OpenKeychain communication black vpn_key 24
-python copy OpenKeychain action black lock_open 24
-python copy OpenKeychain action black lock_outline 24
+python copy OpenKeychain action black lock 24
 python copy OpenKeychain navigation black apps 24
 python copy OpenKeychain action black help 24
 python copy OpenKeychain action black settings 24
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
similarity index 77%
rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java
rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
index 8407a8ca7..a498d0763 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptOverviewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptDecryptOverviewFragment.java
@@ -35,10 +35,12 @@ import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker;
 
 import java.util.regex.Matcher;
 
-public class DecryptOverviewFragment extends Fragment {
+public class EncryptDecryptOverviewFragment extends Fragment {
 
-    View mActionFile;
-    View mActionFromClipboard;
+    View mEncryptFile;
+    View mEncryptText;
+    View mDecryptFile;
+    View mDecryptFromClipboard;
     View mClipboardIcon;
 
     @Override
@@ -49,13 +51,31 @@ public class DecryptOverviewFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.decrypt_overview_fragment, container, false);
+        View view = inflater.inflate(R.layout.encrypt_decrypt_overview_fragment, container, false);
 
-        mActionFile = view.findViewById(R.id.decrypt_files);
-        mActionFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
+        mEncryptFile = view.findViewById(R.id.encrypt_files);
+        mEncryptText = view.findViewById(R.id.encrypt_text);
+        mDecryptFile = view.findViewById(R.id.decrypt_files);
+        mDecryptFromClipboard = view.findViewById(R.id.decrypt_from_clipboard);
         mClipboardIcon = view.findViewById(R.id.clipboard_icon);
 
-        mActionFile.setOnClickListener(new View.OnClickListener() {
+        mEncryptFile.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent encrypt = new Intent(getActivity(), EncryptFilesActivity.class);
+                startActivity(encrypt);
+            }
+        });
+
+        mEncryptText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent encrypt = new Intent(getActivity(), EncryptTextActivity.class);
+                startActivity(encrypt);
+            }
+        });
+
+        mDecryptFile.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent filesDecrypt = new Intent(getActivity(), DecryptFilesActivity.class);
@@ -64,7 +84,7 @@ public class DecryptOverviewFragment extends Fragment {
             }
         });
 
-        mActionFromClipboard.setOnClickListener(new View.OnClickListener() {
+        mDecryptFromClipboard.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 Intent clipboardDecrypt = new Intent(getActivity(), DecryptTextActivity.class);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
index 035bed412..d82e1c246 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java
@@ -40,10 +40,7 @@ public abstract class NavDrawerActivity extends MaterialNavigationDrawer {
 
         // create sections
         addSection(newSection(getString(R.string.title_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
-
-        addSection(newSection(getString(R.string.title_encrypt_text), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptTextActivity.class)));
-        addSection(newSection(getString(R.string.title_encrypt_files), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptFilesActivity.class)));
-        addSection(newSection(getString(R.string.title_decrypt), R.drawable.ic_lock_open_black_24dp, new DecryptOverviewFragment()));
+        addSection(newSection(getString(R.string.nav_encrypt_decrypt), R.drawable.ic_lock_black_24dp, new EncryptDecryptOverviewFragment()));
         addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new AppsListFragment()));
 
         // create bottom section
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0888c6173dfb99c04a6b473a889af14221e5eee2
GIT binary patch
literal 397
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1Oo#jtEY=&h{y5dgayI^2^@(UX)97V(ghUn3k0@B^6Z!R=loE=t&%6{iNxZw9|ZC^
zc<fRyDBd*{NZx07Ceb6&gJsuS?HT`BG@ONIuwE<cbrjTFbfQ33$E<ye!avrsUZt)T
zMu*D_A|?vFQM7n7k6(;m_1=P{4Q(PkA5At?uzqASZ7_97=s4bRRJv`E;~O4f$$QBv
z&N&~H15~B+n$?6-Ie7ez<X)(r#8cIOd%=H|LxIf-9~7PC1?(1GS-{K_lOUPbc6f^9
z68`DNi_R#d?U2z<Ws^Mgv`5qUg@HkdL&Nlk8cR2Rn~}&QU?=H&^NQIE<*lcbFL|A?
oyTi6oFg9&JyVT)h21X1F4?amch^d5M28I%Yr>mdKI;Vst0PLoQegFUf

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 8ac075245b3205d6b846e33515a55186910541f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 393
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1Oo#jqo<2wh{y5dgayI^2^@(UX)97V(ghUn3k0@B^6Z!R=loE=t&%6{iNxZw9|ZC^
zc<fRyDBd*{NZx07Ceb6&gJsuS?HT`BG@ONIuwE<cbrjTFbfQ33$E<ye!avrsUZt)T
zMu*D_A|?vFQM7n7k6(;m_1=P{4Q(PkA5At?us&U>#g-FrIKZT1ZlcoR>YkJi-a3|5
zDTi|}xGdsnJlMH|x5|H#<NHEsmOuv{g#|?|k}AgoI9fJMkxJp$ZQo~bBOvVpYemZZ
zrDqn{d!(AVvdwLlE@?Ar&S_Z4EcE+Gf@|iQlLk+i7k<e&wQQTC{K`<diD6FP9-4LZ
kzA*Z2dqKjiZ6YJXB17xj;jG%9fFZ=->FVdQ&MBb@0FL8_g#Z8m

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index fc019db7231123c40ecc49eab07dc0aa9e853866..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1Oo#jo2QFoh{y5dgayI^2^@(UX)97V(ghUn3k0@B^6Z!R=loE=t&%6{iNxZw9|ZC^
zc<fRyDBd*{NZx07Ceb6&gJsuS?HT`BG@ONIuwE<cbrjTFbfQ33$E<ye!avrsUZt)T
zMu*D_A|?vFQM7n7k6(;m_1=P{4Q(PkA5At?uzqASZ7?-S=s5mBK%R+hqp?p)MgK&e
zjR*T3rsnM6o#in_(ZE7*yW@LLqZhV$%?ex{j4UC22F*_-xEced1vS4}`1FD}oAfE3
zT@3wiHcyfK!oKp%vJ(r63!2Xbq)p&8C~-)dFR@0W*Hp5tMq!Ga@69V_FO;{QQoiJM
p!tM^+M#0#${p?bQj~N&-Fa&G5T;0f`Qw|I!22WQ%mvv4FO#q-Uhb#a9

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d18d4b6674ff9ba25eba82a469fc8c9590dcebbb
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kJ`
z+tbA{#NzbX3*KCZ3`ANV+OJ#KZ!79m`^Kw4)2WdC)>?~<)gEkKZO0=WbJk0We7$$E
z@pG$+!Qq??4i>*PNw2J1K2)^asI!ZW(JZj=%Ii4A#=A)3l2G9m#{-Yswmdj@nC;P@
zNzo?K5yg(exBG2tcj>v9mq}LF^L$fTa^<4}qe3^kCPSsoijyZS|6JC0ZM?T;`}+lp
fj9;n7&sKNqcz4m;V&^BIGZ{Qx{an^LB{Ts5$J1t}

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9e6d0f0ac399af82349f6c24c5023d45518ec75c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kJ`
z-_yl0#NzbXNse5H3<O-`tM)jpycW$V=T$xPSVzjjl%ID!R_0FH7IaXO!^g;e@^{W0
z0rn`SM(*FLZ`E5qRJ2%}yRVlwMS@4P+-0u#mX1y9%Q}kV1U}5zr&aMGCf%Xk&b;gW
z*_;B6iPt5ncExg7i)Q?}_2Xt%TQ3W*9^b5_0_6*lY`oW8g|l>IL+>55-*R=Y`|(LP
juCLhWdGJER{NvomCGr`R8W(Q^I+elG)z4*}Q$iB}@8@Rt

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 1df91994c3a91d1f4a63efb050576d219447170b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kJ`
z&(p;*#NzbXNzq(~3`AV~ckOXnxpucu%#<?YUcr;?lg@v1_tLElS@~eEfW)MeXC;}W
zugq(7c;K`B*$+WQ8#zV3r?-zzm1<u2ur1?r8)Kk<R=dShUdH~JAxG!B-&6Rq?0D<4
zUv_8Y+J$O67cTGTPCUKd|4r?g4HFk0Kk69FlgAj9av>+ybm38>OHYLV9FDk~U9zUL
jwpVPn$r<J!m9~sc`wRZrU645kbSZ<UtDnm{r-UW|nbB-F

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856c70df33a0ebcc5a91d47f797a97379ec0725
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00C-AL_t(o!|j&eN&-O?hd&omvMuQ)V(BrWyF$7!2@Ibq
z=piD*kS-#62`i0=km@!JS4nTCo7tt+{WH!CLA1YfwR;Y~Z#ZXW82B$L(WJ$I88Zf)
zb4<ym{Sohoxp<>)$K2s`!90i)9CN@=`w3m{m_!i9%?Ygf)F=W_q|Q_L|Ilo-LGQ09
zM=~zgGV?02T55)?FE8X=o@KV74`@k?T5Pr<vuFB%fgEjo6IPib5WMIEW(Wk`#C#ut
zV4A+m)3gGRV(=w*l{Uc2IsNN^IBnBmoOu5vh0i6Pn*Ha}=0OZq5FKrMfuKEaS6Bdy
zW3B~t`K)IFgy94W`8mh|DSBX^HC(FnO^``P=$?(Rra~{VP8+ZnsjAus%)crW0gmno
zwLj#Y$k(p@A@`_+HJd!zpMju96&II-6nl}~+59%m0p@_Qk)NLpxHSUYWS4jhwO>Ua
oY^kimqs?e(^AQ(n_PKsr-{5k8d)mVqKL7v#07*qoM6N<$f+h&fMF0Q*

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 9cd0501004b56e414c2a0b92577c3ad65fc71272..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=14Fw
zFj{%KIEF+VemnJ`*I@?{SN_;75x-=G{>+PN@!Ie8LHS5q+k->v1zs&uP;$IG&1;g=
zW=U~Br=)Zbqsb+gEAywHzGJ*+rgdZSN<r>vE-5K4Hbtjbc>k8(C;0zYccl3<=6C&P
zKJQCT;MchQKJxRaeN7wW{PMOYo)TzKG``pM{(71F?DPLR3teY^(3$GrX}ZdF<L{3X
z%^t?CDlR?{6y-DZRm>{>XAK^5YpXcKWdu0v&M-<c9gJF?FTla~_vvp}zLSi**kS}H
zW!;yLRcEO<`=&l>_Vc~jO&q;%S(`#_6}B=R`O1)3VJx-2xM4HfAJv%Y5!nuw4_6(D
zVm>qrNL&IDllCz>vOXy1|8PU}*0j@h>sB7`njsON_<qtG26a}I+W%jewHxC3HPpA|
p=1&#8qO$F8!Jo8m>-=K(N1QZ@-aRd97cgiUJYD@<);T3K0RUj_vkm|N

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index ae48a3bf71a1db8d672c906c5d6efb8f12a701df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00CS{L_t(o!|hb<N&-O?JxLguy+%mSqY@ZCRnS93hOzV`
z!e<clhY%u5^;ZhlK>uvxFeAI}9p`H$qB$3Yo#ULd-s`!*f58d5=pn|MRg8OFvy&2W
zg%6}V^^SHq;uYK$#AV$u)*D&*Z;UWzpIHm<=18dtnyB)#Dr?T`_PpgcTG{(2)N)K6
z&w_aqwod47-@aDh>X-_)<8IIs5>1lr2=>n1AQq#gn{bL1=V$H)Yc4QS@)ORl+zsSE
zMTMb;=P^1k{=NZ)OGH>I_m8R)JfdMH|79&M>(j&{a+cpze^>6PV6Y_Cf;keL>kLvQ
zqst6=FXSK?5D7O<tnG@<CY(xas$bpvzZmULtiM5i{Vh!IRjiYGuptj}PcP*Uxxq#&
zxj8P%pTWkW&w9VW10k=x7q)3I@W(N+63#r5o9KVR!0Uw#5}r-0ZOzFDDiUieu1a{o
auj2=b)lyc8`WsFF0000<MNUMnLSTaT?aCbh

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49d420e0b12568c3b8a16db4377cfde1fbae142
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Hz#L_t(&-tE}WD+FN}!0~VSG4_C5$zLFnAAf~7D!FV9
zZX$nxwB;zjR{0y0a<CV7ZTXR1A>}5D<;++yPR7jcurp(yeZ})U$9bOKPjBz@&NQI$
zucDC=(qt)6q)34*YYfw12Gd502b_SsXP(wtbH*qHVm|Vg(b{3^*!ULnk!k8`!`TYO
zad6nI1*v>@UdWLlLyniSXY2B3$G_kiNt)fKElhAxQZXt!S>B`k${h7&H4UVA^Br%&
ziA(u7<6qV#eWW?LYw#iTG7G+YN$9E^@tvLe3iwM;^^goG?O7sOv3k-|y&?n3x(gIN
zllAogyt?&!GN8{1%Y~{xckAzDKt*?fOsM)@xBgiM^m!(>L)GtiIuxWJ1qDYFvm9ZE
z{vfNAHiyh$#pQHzS~ZF{Pw0rZJ2D&xhdhnZL9=2U2Z!nCpd(SxL3EHU3VQs>kjtck
z6r>;p{aMfxi}Yb((a%zZ`&|fhMVGIun`@JxrxFf856|X6i-DcX=0JUcodf1T!C%J-
z1-aQD*g0qpv=rF6Y7S)6UDnrYa_k+h=_%pdn0|HGEHglY1cR)G+#P+}D@Z{KQcyKO
zzwUR;p(toSI%q}|G!-3WaU#Y!j`PzKI>-xg+T;GIwwUIC$0{D>eWv2=j)sOtwc;Jw
W{bhWT-u(Ok0000<MNUMnLSTXf3LN+V

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index 529a7724b1a9ce7a69375aa931cd820172b9fd49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 615
zcmV-t0+{`YP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00G}gL_t(&-tE}SO2a@D2H+ohbED$6#U~QGEQp)p!d+?U
z0~9Iv0AdB7L2zd`?xoNRy`Uoa0$RH+X-XYeiIZm9WMWQI>6uyPkogF6CVv9(*s766
z9u2fGh6xj6v~Z1Mq~gIGppFTIVt(NQ`%!aFFjiu$`GG=om;`RuVyxLfA{x%UFOGn~
zT@)nu)0ty{CYl&v?z(nEzjvGqzMzO*`|2Lf@U~P@pzSPqD=$z((p8f}9p8@aP1tdD
z2j_HUUC}|R(H(;m-^*M&&LyIwGVj<sNe}$HRDDDPYDh~IJ*&^9>MI&h%U-~gI%{<U
zEbRIx8qjZt4SdzV+V!6_Ak$u;>8t+HuAgm2IC+qE5rY`SAobWm6+IZf1DV$}&_xBA
zpqxWIhena-2)STShlV2{Fhp7(R3+mG2$c0fJyK9dA7qe%rura3aEkoto(y6TgBbK*
zKvqQY6D=YDEk~5~(SjVLiYV)%1v#jy87;^`J<VuA4l*>O#rA=^N>DpKP(=wU#Rtk@
z<l^+>Y<nPw;Swhs_p2j=GCG)IiZ)6f-&_2)XApxJ#Go+mxpBW^x}>1CKBz(pD(Qn%
z(ITwb5AxH~9WBD+WP^5v6)nQs%H9!$2M->^;|He*@J0#Ttjz!b002ovPDHLkV1lne
B0CWHV

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index cf149aa37f1f964b9dc2d7e0a58e5cbf5c974bba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00J9HL_t(&-tCz?O9Md=$N!p_2x@E-to#Umhad=+0kH}8
z63GV$60l0EU~ekH&Vbm9U=s2miXe6hz6z@(CdRdpJMVIj>|S;*M0ch+?q+X)H<{V{
z?*&jcVKz0==rC51zzUWT1@Ml0lyQzT^v3Zhi^$;(%*J1_iv_=NHt=E#qxln({=o!r
z=nA9xJ_7#WoN(bVFdX}VWX(<wH55@q4L!@X1Nz!APk4<K=Jc!c*uw2VM3T0%jHTR1
z7C}o)2swP2%A2s`aweQj$GDUUDNBVDHmy7E)9jhnr4S9!x~X=8L*VZW(QEvZObY-d
z499tVy2f^qcNi(rF7+qw8am6l0s4CU1r5+|ht;^^Z}j+Qnx8DHA3bu#KiG_vYR2V`
z$4&*~g)`)fDIf(zYct58f)2MJ8|EF9v4e<LoFz1+p%}e^xVP-k;4m=M5f%r^kl`>e
zq{V?Mq(CL{oomN?@o`uiv!Xyu+J;-`o@!xKKnh3!O+Jt&QAU&&vi2B*62)CwFfaQM
zk->Hn#Z6j}17!rI1vyYfOj_{VbF{a;y+m=87XR>V-xN6O3sAxK?9uqvp$Hn5lCF-k
z?SVMz130m9E{s1}N~44pTDZdYko^{U+bfZ;fE17d`h!5ue=>a-v<{O#Z(BS=P0~a(
z#eoW>KprHDowShURWBbst<pjsPRwg!HEAIWg-4<&Q>KjAz5!Sa+ehngaHIeL002ov
JPDHLkV1hMEAEN*O

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db080df4eb8fbf2501c9e2f7c35d78b6ce8aa966
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00Op2L_t(|+U=XaPZU8E$3I8p?y&SnqiAd(5Ta;dq%p*Q
zLK9nxy8s1&2I-CTfOi;j4W*IfqLI!J{{V6!7YL9jLag*k?^khaVXnB@+vRo{c4p0c
zuif|Z{p`M(H?unnVq#*tt&a(o*rH5@CQT}o`M@il&}YB+J1p}P$HUKf!)<%T-(a1l
zr}(xv$Z_39`7f!QE57Z&d106Me%|#gzU^<hVvGE%d=4z%!Qm4FcHI5#Q1TrdKHBgU
zyo=|UA_WQ*Irh9}&HT{qChHsX%5*u%0w-OseQr|z%`P*~ALcv?qn`z;uIqns%^bkG
zOU?;nz7Y>Nb;Ycj>$+;&`p)3FQFl30qUzi-1F-BWp0S?d9#T^xUz=I7scW9Oo?{o4
z$Ws#015CJPp5Ev5q^pb`M-Q;1NSF^4tv-Xr=mEAA3Bi`h_mt@O(F2r~t{c>Tbj0sP
z5761dih<*|m39`nb@qTl;P_2tn-jTp)^I*>{DzW200ck)1V8}n26#lCBO0OKK=kSj
z4#_dDSNwqMeqFY=$dlG5|7*nZ|M`wCgbgF|9UO9cYTq&DEgfSaZxBGso4X^U00$Qb
zXcz^k>uy-ly8sA)00@8p2!H?xKpX*f$uLBcB*SDW#S5Uyl#(Su#`S5>T7W7~yJngU
zg<t?+$}?9s4gkA8xe_79LgWA$-)z(N0}T0Q8?hfC>6<Mj0GAFh?3-=Wet@iRwpsfD
zN<Jq~670pHk$F#~Gx6xeH72`edPY4ii@6#ZrH~TLgpzM?IbC9!5mKZWWi~|Z%Z5e(
z1V8`;KmY_l00ck-K<qzs9~uSNzc@h7D8S0a0mf+=JZ^Je$B7|x2W~X|-;`#@i2N_4
zbe)<@laIKNTCD1m-yREV9E9AM2b(zeS<zGbVq#)qV*kJW1+a$g*a`LwEdT%j07*qo
IM6N<$f^+b0X#fBK

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png
deleted file mode 100644
index a0fe0156f98a55a9e4ceaa68ff85521643c0396b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 881
zcmV-%1CIQOP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00QYrL_t(|+U=V^Z__{+#-FA%q)26eG8778>Qa?b2@rGm
z4j}OX=vvW*FM#NdOI(z1fW!i7C#(t~78nphsajA7jSvIvgn&3gK87lT&#~{$clKS>
z_kAZfe$UVEeE*&(1t=(vcZ?O#W(7A;$2H7h22%ij;Rkl{9s%AVa=k+?Vh!KHQnHIj
zxZtk%X>6dMDt?e58aV5s{JS_5iXY?w?zkm>0#BvI5Aq34xFY`)HkIWwFucU18@<1k
zOFjd`3;nk+t_|R)j^{6UgSYsAF2-?Y=pA#I#-{D5JFI8hxX&$@vsguE=)JdX%0D+`
z<@t@3lz}mURs2cZ|1;(7loA^WIUUSrR$Re;qQ<kg>+;*ySIi2lE}_d+^>E$}z*=JP
z%uCf>#b2)Sp$++!#F=MBy7mEAxnIbkQV=&2E06q|UQG<6>-qaJZ`8SK5C5cV`&j4x
za;y9|@SN*IwPW&SuKHQ|0H0z4J}cLMi`9QDe+bRQu3F0Vt&G-60ho$i9V*u!#I8=~
zm6886Sk)YYp_$ey81Wzg0w4ea7?oIpk3EFBzk!g=5W8q#(X9AMGz%9V&j>zh=H$OF
zS^iOOn?h(>k<Y-;Ff;a<wT#4bLA(krTU<ECa8DngZguUeiy6ho-l|1_P&ARn08F_;
zFBG3gM+pKT00JNY0w4eaa1vnPp$qZ2YKN<M=JU|<9yibP3^$nOq2)ZT0{~4ek82%Z
zNzdb|KF|ClUe@!t_9yXP=JyOcrk`itQf7N-p~odlsU4lnPuuPT1eu?{a(@ypBFb1s
z7e-+t^HTx5LY`;5!5X%Q$`5dIGys4ad~P5`@TBBB0&p}J*0F;gdT8OX#MpOcBh&9N
z+Q<li00@8p2!H?xpsW!8ZnV#tbXKaqQ2z~dtafl)A0V&_V8BCXdEDZEZnI#b7kp~~
zhW@`P&EpoGfusq|<#CH2Jf1oEagSTHbX5;cK|w)5ajfG%jitLmT~2x900000NkvXX
Hu0mjf&(Vg`

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png
deleted file mode 100644
index 7460e0894f9679b2343ff000acd2c3bea1f0d4f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00QetL_t(|+U=V^Z__{+#-Fydq)26eG8778>Qa?b2@rGm
z4j}OX=vvW*FM#NdOI(z1fW!i7C#(t~78nphsajA7jSvIvgn&3gK87lT&wuXDclKS>
z_r1x9U;Fu;-~01e2|z({ykn$<YmVXu>bQnE%wP(@FZ{qR-Xp*}M6P$pMXcdFSVrsO
z5iYnZei|F-XNn)R5DlDlQT|;V3dIlF0q(dZejHDw#ShvOoNz_{DQqgsXJB}VNjG|b
ztB`yKh8OxzVN4sq&#dP!c!Rh2fG);xCiRRtOk>mb&`s;vHtuuN<t$dwNj>+rP5I|i
zW}e?z$ta9*tm04N{GS<5r;^x6$mw7{H{%NS6FHu}RhM73zG7CGbqQTAtB3P;0M-)4
zGcT2Q6@R(Rhc@JoCiXll(zy?~%>7a}m4djLn0e&q^oc|nT`%5`MWfCgd-x}v+s8Wh
z$*t<2z;mt-)wao(x$I}v1AK}J_^h1&EtdbW`VyLn9krD6TRB&&1Yjz5bf}zv5IZ_u
zeF^dFscJMe^R=IVBS8QJKmY_VEU^S1dk71^fskz>cG1A1S@DyJWvA>G!AH%U{MQxB
zKWf{i5SmuxGcYvF)IPJ;BJo%d&qB)<Cyo)^(+8+qo%`xyMp1;Aum})}2C^7{DQD>V
z45j<gR)PQsfB*=900@8poCFwn=u$kc+U83AC2Z0|%X?gA=B2OB1+zS~oX2$lpsD3?
ztphCSd0f@|nIFW<dLGyQAl}P;&#+_qe&#J@zK0fiT(Xqf(aHU`?LI(|`|T_D2k|1J
zoN07n7#1==6TmCwe#S3Y!*;6t04Ik70I0#|3MqmoCEpQ%qp`4#9rVyc3y&pg-<gF>
zzr$!DBLD&*00JNY0w92@Li~&KK4;QdrTRksC(yCl!EJqjz$$<N51r?6%m2B}f{9-6
ztpOPNe^ZvnExQGhCbW>pEx&j?bMoUJw`}RE9-4xJf`Z~$$A3v0$;J4_lf3`{002ov
JPDHLkV1izPl4$?{

diff --git a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
similarity index 69%
rename from OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
rename to OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
index c3e31bf11..465fd195e 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_overview_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
@@ -12,7 +12,44 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="@string/section_decrypt_files" />
+        android:text="@string/section_encrypt" />
+
+    <TextView
+        android:id="@+id/encrypt_files"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_encrypt_files"
+        android:drawableRight="@drawable/ic_action_collection"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <TextView
+        android:id="@+id/encrypt_text"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/listPreferredItemHeight"
+        android:clickable="true"
+        style="@style/SelectableItem"
+        android:text="@string/btn_encrypt_text"
+        android:drawableRight="@drawable/ic_action_copy"
+        android:drawablePadding="8dp"
+        android:gravity="center_vertical" />
+
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/section_decrypt" />
 
     <TextView
         android:id="@+id/decrypt_files"
@@ -32,15 +69,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
-        android:background="?android:attr/listDivider"
-        android:layout_marginBottom="8dp" />
-
-    <TextView
-        style="@style/SectionHeader"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:text="@string/section_decrypt_text" />
+        android:background="?android:attr/listDivider" />
 
     <LinearLayout
         android:id="@+id/decrypt_from_clipboard"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 23b549660..e01f1c049 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -62,6 +62,8 @@
     <string name="section_decrypt_files">"Files"</string>
     <string name="section_decrypt_text">"Text"</string>
     <string name="section_certs">"Certificates"</string>
+    <string name="section_encrypt">"Encrypt"</string>
+    <string name="section_decrypt">"Decrypt"</string>
 
     <!-- button -->
     <string name="btn_decrypt_verify_file">"Decrypt, verify, and save file"</string>
@@ -82,9 +84,11 @@
     <string name="btn_create_key">"Create key"</string>
     <string name="btn_add_files">"Add file(s)"</string>
     <string name="btn_add_share_decrypted_text">"Share decrypted text"</string>
-    <string name="btn_decrypt_clipboard">"Decrypt from clipboard"</string>
+    <string name="btn_decrypt_clipboard">"Decrypt text from clipboard"</string>
     <string name="btn_decrypt_and_verify">"and verify signatures"</string>
     <string name="btn_decrypt_files">"Decrypt files"</string>
+    <string name="btn_encrypt_files">"Encrypt files"</string>
+    <string name="btn_encrypt_text">"Encrypt text"</string>
 
     <!-- menu -->
     <string name="menu_preferences">"Settings"</string>
@@ -584,9 +588,7 @@
 
     <!-- Navigation Drawer -->
     <string name="nav_keys">"Keys"</string>
-    <string name="nav_encrypt_text">"Encrypt text"</string>
-    <string name="nav_encrypt_files">"Encrypt files"</string>
-    <string name="nav_decrypt">"Decrypt"</string>
+    <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string>
     <string name="nav_apps">"Apps"</string>
     <string name="drawer_open">"Open navigation drawer"</string>
     <string name="drawer_close">"Close navigation drawer"</string>