From 8ce837dbe4d8a2e1e69d581a7c877719558209e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 5 Apr 2014 23:07:49 +0200
Subject: [PATCH] Rework menu items

---
 .../main/res/drawable-hdpi/ic_action_cloud.png    | Bin 0 -> 450 bytes
 .../main/res/drawable-mdpi/ic_action_cloud.png    | Bin 0 -> 335 bytes
 .../main/res/drawable-xhdpi/ic_action_cloud.png   | Bin 0 -> 538 bytes
 .../main/res/drawable-xxhdpi/ic_action_cloud.png  | Bin 0 -> 760 bytes
 OpenPGP-Keychain/src/main/res/menu/key_list.xml   |   4 +---
 .../src/main/res/menu/key_list_multi.xml          |   3 +++
 OpenPGP-Keychain/src/main/res/menu/key_view.xml   |  13 +++++++++----
 OpenPGP-Keychain/src/main/res/values/strings.xml  |   4 +---
 8 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png

diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..3daa641317f3c138f855636663f3fa6fa037a7ad
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzWJyFpRCwC#m%UEIFcgJDU?B@bJD^Bi
z7_t&6>QGiz=FB_;47>pw6EDzrC~Ib>NSV7PQo3|y=3L2@P!uV~jemyoNmo{WoStJ}
z+qY3f2qA<JLWnOe=K4@k6xpB4uCD8!;0-`@f~G{=Ba*@62Jr<WZIA{aeud^`MEH;`
zOnloiaA_!hf#yv^ypX49+Vy>ZuwfuJ?DwoG{zN&Py}_DsmqKdv-wl4NLP+0yaKBY+
zrE!u%NQZnxgbsIz+mZV>h&8^uM4B}&QfO&uJ#H|&rL`1NsdF0rEV9Q3(rK^z@|C7|
z8JR~%hwB4kJ_8UhJI=;ob&$=LLTamf^-$s*5pwudQzc2PF`Yh;_4Xtuy((9X4J<qt
zo2#kxjid0%&oR)3?rzFJ6@bR0u>tG=(s}DqyzD@`vuYvKC!LhTs+LI{kNhVF@i1F8
ss{X`WyHNk1a)J;-2qA<JKl}<X0M|ZEuI7q=CjbBd07*qoM6N<$f&rAlIsgCw

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..266d4c21fc7acb72dd1f2864790f3a72286f8aeb
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GA3a?hLn>}1B}lL?P7vv7Vr1)Cl4W3K7S?Pue~xYSH|e`F
z3|nr9dss3Wick7bs1WDc={%!jiw&d4&jpcuOw$}<TrLYVuvHo|rgA$3G96(H_?Mip
zB1YjDqmIi8Lj@;aCb4#Vwjl0CzDl1=krR_7cPZ4)bZ9S_D9Yr}n|Q(E*&>Cm)`e+r
zjxKGG?0<UB;fz=7nsZvJs->@getv$xvxwnB(S+5(D<iHooGE6rdSrb;@O!5x^C1(h
zFNYS)Q-0B~-9)F7)0$yMt^?l=S7mk^MKfu?<&DZ>3EG<^Ij1xo3h@#SS-HdQpa#%?
e4QdPu2N>cmT9-}pyyXJ)JcFmJpUXO@geCx|<9SN}

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..0769899fdbad6ee962f025d9b90c6afb6968c9b6
GIT binary patch
literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzyh%hsRCwC#n5|F4Kp4hLw+S$a8q!cZ
zgMg%}2n+_nEV_0U{s$}xW_EfOjh>;&u(exK%nV`%!*k>?%a+`&*WF$B{E|0amiBh<
zbMMz01cVSm2qA<JLI@#*927@Q|3I3i{k5+aMNzC;EdZR3a2dcZVJ91IDPivrV%9nV
z;Jk4BUh#Gz#K>kubPPM6<8rI<h=`PnIF3K6s`{}ZKxp{nvmG8yV2@r$fXw+}jU`SI
z1xrN1V&4LE4XraUw8m75c@10d9&^|X^`dmH2x8MOTdKV-qAOe}6wV2Rm^+aI^2F{8
z9mttt;k+@GGA4>(WT}4T8-^@<UBIFUwNkIUW7sFM-=E7iW{XJf<85yO!1)KwVW(-b
zIs$~6&gYIf{}%;y(x9W^d}gTMH-Q+W0(6D1#^wMB@NBW-tFnZRb%v!-(fPy!=l_f1
zliaV-8gT4cdmNe;z&9e*C}^ty%2BH%fGjGjHmal(0iT}vwlpokM0HUIC=s=01&}W;
zM;?eE_Bn3keE=q{Z%kZMeC)~p?mgE|9`>qw`dX9VmI0~nQqJo*P6#1{5JCtcgb+f=
cf$}TB08H;|XHn#;nE(I)07*qoM6N<$f_nq&Qvd(}

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png
new file mode 100644
index 0000000000000000000000000000000000000000..f97084dbe5414f08e68aa9e9a37dd92c67ca71f0
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!nn^@KRCwC#+bwS!K@fo9b<&U{0cNKj
zC`n)<xx^)vVq6+hP}BZ~1_$;xB(&7Ur9qa83XT*w(vg}JxU@6vB#ojdsc-i_cJF<p
zm8~fDIWxDrGv|wQ00000000000000000000f*AGf15GBALLSC43j5JU#!ANZa=F})
zfM$YzAP=u(9LdNY`BhECm5x-BG3vqDek$W&%a>~Kzeo}mB%prqXBK=PIwL;DJR3$G
z1%ECN(?D;xu_UZW!2bnb&-z*5x78$kh;b(Dv>g2727>Qw<9;9G4A^Zk_%}hy8al){
z&+~OvRo5{k;8}~unpu6{q&HTkK6C<%?;c;4t8!3#fCS*Yg#@Sz3GS86INj)vA1QNn
z<1VeQSS6bPtM|`Z`kP7{CtEIer6q5j+#Von^XnSTR_(pOj<r|gbu;;_zhoczo>~?3
zJfeN^)cTa95|FvLOs!u@s}G3G%=#7*(4lu$O~us*Sk<E?U=iUSaDVC4{$&wG0_?i}
zyrp`-EhkMTU^ig!b<=tq;fDK^Jt<8~DNP&c4|W0tf9{&O$krE!z1@WEi<PNMTVqY+
z$TRr5)}Ifc8rryjmpHzLyj<a%fcXH<{)gxl*H0n70P<aejt1Hv=t*~G<#sm-u#z)#
z!!-`ksQJu*!lCf3{(KUU5&zppt=m3e;4)i|TTj4>*!wqXB%oup6JX8Anh@SLYMtx>
z3u6CA*+~NQ_79dKxAwWEB}5f;=`#fr;I#^Pe;-g))z3W7zsb{=Zu?t7Vy8EBeeN^?
z_mc2J#{PhUf8qNk!S9TdretdEd8(HxwDMcn{^xp^fIEq}xf%8_k--0OfB#XC{s#a6
q0000000000000000O+IN0t^6qG@}XQX{WpZ0000<MNUMnLSTXbnOpt<

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index b75f4e9a6..9f285388b 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -2,7 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
     <item
         android:id="@+id/menu_key_list_search"
         android:title="@string/menu_search"
@@ -37,7 +36,6 @@
         android:id="@+id/menu_key_list_export"
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_import_export"
-        android:title="@string/menu_export_keys">
-    </item>
+        android:title="@string/menu_export_all_keys" />
 
 </menu>
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
index 50f83026c..087521177 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
@@ -5,14 +5,17 @@
         android:id="@+id/menu_key_list_multi_export"
         android:icon="@drawable/ic_action_import_export"
         android:title="@string/menu_export_key" />
+
     <item
         android:id="@+id/menu_key_list_multi_encrypt"
         android:icon="@drawable/ic_action_secure"
         android:title="@string/menu_encrypt_to" />
+
     <item
         android:id="@+id/menu_key_list_multi_delete"
         android:icon="@drawable/ic_action_discard"
         android:title="@string/menu_delete_key" />
+
     <item
         android:id="@+id/menu_key_list_multi_select_all"
         android:icon="@drawable/ic_action_select_all"
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
index 105368cbb..2f5697a0f 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/menu_key_view_share"
         android:icon="@drawable/ic_action_share"
-        app:showAsAction="ifRoom"
+        app:showAsAction="always"
         android:title="@string/menu_share">
         <menu>
             <item
@@ -48,9 +48,10 @@
             </item>
         </menu>
     </item>
+
     <item
         android:id="@+id/menu_key_keyserver"
-        android:icon="@drawable/ic_action_import_export"
+        android:icon="@drawable/ic_action_cloud"
         app:showAsAction="always"
         android:title="@string/menu_key_server">
         <menu>
@@ -64,13 +65,17 @@
                 android:title="@string/menu_export_key_to_server" />
         </menu>
     </item>
+
     <item
         android:id="@+id/menu_key_view_export_file"
-        app:showAsAction="never"
+        android:icon="@drawable/ic_action_import_export"
+        app:showAsAction="ifRoom"
         android:title="@string/menu_export_key" />
+
     <item
         android:id="@+id/menu_key_view_delete"
-        app:showAsAction="never"
+        android:icon="@drawable/ic_action_discard"
+        app:showAsAction="ifRoom"
         android:title="@string/menu_delete_key" />
 
 </menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index cd280d7b7..a57063441 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -78,8 +78,6 @@
     <string name="menu_import_from_qr_code">Import from QR Code</string>
     <string name="menu_import">Import</string>
     <string name="menu_import_from_nfc">Import from NFC</string>
-    <string name="menu_export_public_keys">Export all public keys</string>
-    <string name="menu_export_secret_keys">Export all secret keys</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
     <string name="menu_create_key">Create key</string>
@@ -104,7 +102,7 @@
     <string name="menu_encrypt_to">Encrypt to…</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_add_keys">Add keys</string>
-    <string name="menu_export_keys">Export keys</string>
+    <string name="menu_export_all_keys">Export all keys</string>
 
     <!-- label -->
     <string name="label_sign">Sign</string>