From 23b1f6d7e557e344dc28b2c689312faa511e493c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 13 Jun 2017 02:22:00 +0200
Subject: [PATCH] tls-psk: add "more info" button

---
 .../res/drawable-hdpi/ic_live_help_24dp.png   | Bin 0 -> 551 bytes
 .../res/drawable-mdpi/ic_live_help_24dp.png   | Bin 0 -> 370 bytes
 .../res/drawable-xhdpi/ic_live_help_24dp.png  | Bin 0 -> 596 bytes
 .../res/drawable-xxhdpi/ic_live_help_24dp.png | Bin 0 -> 905 bytes
 .../drawable-xxxhdpi/ic_live_help_24dp.png    | Bin 0 -> 1200 bytes
 .../src/main/res/layout/transfer_fragment.xml |  44 +++++++++++-------
 OpenKeychain/src/main/res/values/strings.xml  |   1 +
 graphics/drawables/ic_live_help.svg           |   4 ++
 graphics/update-drawables.sh                  |   2 +-
 9 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_live_help_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_live_help_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_live_help_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_live_help_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_live_help_24dp.png
 create mode 100644 graphics/drawables/ic_live_help.svg

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_live_help_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_live_help_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bb1015d4a6a33b2e7c759f33b76c1b0ce511c46
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10i;PpK~z|U?Uz3<1VI>wpA%6jT;~W8AArXF=@kkzqNZ`a0u_4=
zM<Jo3^C1*!6e1!-bP5qVr;x~<W)(A=8*6WOc4syx8^7dD-rbq~z0bb8JDY)jWke<5
z0%!rQ<!AxtKv5TF2zXBc#2*b{&|kbK0B9Z<(4{v}Ue@}dAfSS#VH4N~%0R!23UGjU
zEIJz2ndA`N?q^^k#A8y<iSlv$7Y21GN=;xExC@zc3(TS4DI=gm1*Q+!0bYR@pf1mO
zP)7;;f5{=d%_U`SJz#uW8LvcmIsW2FI`p9AO9A7{N`4>Lyf-!ud_;`9N*?=$lXNIb
z$4Xv~d$Dbx6WZ@Z4p@t8U=!#RSOmW0@fI-MEub4<0kK8_Yyj&?jBEh8Ko$6u$5o(~
z)XWCZ6>u%{Jg{eCW&`L_$!8Eh*~GE|)KKyfQ!^Vto3wugyQXGoER06VBv1{pD(5ix
z+&yKoL#b<(^tV7>tmpt05Nk`?FmD9x%Q~ru*j=Wzb3Fs5bYXNf3Ot4seFDa97BqqC
p3QQ-cuEKcop#B7mr!g7X(>EkM;Ooq5eL(;K002ovPDHLkV1lsj*VX_4

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_live_help_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_live_help_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fe39101844874be616e99d61fb6108c3cc05648
GIT binary patch
literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Uvd%8G=
zcy!*KYRGlSLBKV>XDL?|+ef~82bKsmMO3h5dw-O>cjVL|>j?FitOxxrC`}fabT+R{
zSlXV4<=Oc?cTY|@uwRoU=)q$NPJtH;p6$;nk61OV(_lI#l>K1c$7sf+gk>N6RIf`4
zc<QN0Csv-DZO4#&a_W75yXT#p23Ib+`1|IiXvuA12>HtP?bDvEx_O)1tUu~ChBqIV
zED*adQ;|_~uA%jZ9@~851LE<QGqM=`8DBWN#!uJXG)ecs;=0#yjMr8%1vTH_p_(#(
ziW_UmZ}lSwP8BdL<?BjwpYE2cxOVpMH1CDdH`!tvCttl-w^Dx>-}ar_%9maNz0Tn2
L>gTe~DWM4f4jYZA

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_live_help_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_live_help_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db50954cb6f570b8a12a40f6a9dccb9bcf2e1375
GIT binary patch
literal 596
zcmV-a0;~OrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10ntfBK~!jg?U_GI!$26ufBu=2N_Q0;REl*LCqY-gh}NMvIf|>_
zq}1XEPzMpgQCfFDK}%B<+DV5rP~Ij-?~==1AP?NoHuv1~OL}kKv{0&4DV1u#BQOH~
zavmd~1MHcG-v$N_g3HkdHcbE?JP03+R#M0%1;7ZXXhPdk0917+nVzjK&;;th`gGK%
z@AXpnYD;&4F>nbiD?FEh1~BmrU<{mUc%K<SSOvH+@W1i}pv(N%W(#N&7J{UDz5;yt
z0MLvH-;X&iuAX1}0B|7YwH3$8dVc5wfV@|z+K!<(wvrZL)r2f2ursM@whcXt*EO4q
z>6Exd#(?=sbgwbrDZmgo68<~DPZ0nD;8=K9flo~zCjb-RMEGt19|m4d02;z`4R|y3
z${nCb*e=XUb(8ZBK(-j?DgAN>kS#{5XaKUs__hI{dL}laR(SssZsM%`fNXl9B&9t8
z3n}kjD07tnu4Qu%$W3QuPZa(NlmM=!0!aI;o4OU4QIPb33g9K>qFL(6WYRwV{K2tn
z0uVuT2rpsY!2`nQ2jlR%y3q)Cn^!1ZEdt?f_(&=U@54umgD6b+NV5>u!pmO`veY|a
iL-z{YSzM=-Q~d*OyT~^at6a_i0000<MNUMnLSTY4s`e-V

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_live_help_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_live_help_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac256838ae879d2feeeffa974697cad847cbd5bf
GIT binary patch
literal 905
zcmV;419tq0P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm001mY001mY0i`{bsQ>@~8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10|rS%K~#90?VCSq6hRn=AMZ2^k}EAV5k*iN5z)qvAR&;-(niF>
zKe4n_!4IG!_yrW~B!!igNH~M>UtuL;j1jTTot2na>}`<a-kI5(cV~BR=YeS^n|Xix
zWR|&^+dw1|i9{kzApsVF6`&7n*QE7<E^rN)QnxZ-7Wi0!oAqt)fCI{INSF*cS$m7}
zOuA8lo6>GqH3h9y;D)qY*X71{IST3l(~j5Hg+9=+UF0fg+b@gAI<N#h2iAa%LH{gp
z7?=kZfP)3qcfEfr+S7XjxD2!%YPW#%z}EtDsG%9^8RI>!9n#r0(Sq)g&WLeo0rwU2
zsG&7;eB@-b(3?qW_y+lo?kd;;ekkNp!#Bu9!`KOM9e7Q;^t$ewE-B<v!zaWy<ke~h
z_+a>5)4r)qIx}l8=z%b1f>}=1O#7yXp4rs!32{ysb1}yl(!OcVGn*PdA&v=S=Gos#
z`=;Zb+0^g}A+27$9Aor^F{VAUS=sG!ktfp4<zY+c*Z5pzr0@btd=mQAPX>pni=Zb$
z|Jk4^4EQ|fzU>Y2GVi<PP@^n4pOGJ<Q@~%(@zp3p&KKl^vOT~ng&Jyvma_&NGUR!r
zR7Z`Fa@K((hAej#YpD@R&L(iekmI&;JvBne*&;opm$+F#O*KLYdTOYDfmC2)1^oez
z3boG+eqKafHHsGWLa5s&Jr63Xu9d26HI{__IpB22Aj4EekaXU&5H!UIsv_v8(0?*$
ziV;*r&@Z8XU(ggIDEsAw3@OKNU~dU^cL;H!=t9wdfU&8{BUV|WAPZ5Dg(%2E6l9?)
ztC+OhmcF{h8Dt>}vJeGXh=MFcK^9yE^$SfA;7D`?n=Ti*3X<Ngs54IY<SIydyQ0oK
z)*LJW-c$VHeW<od`u)BtGfal0Rbaoen;oV|U-0gd?;XRkTMt+Uu28_t(M03x<6FT~
z2gXOz#LLMTM^a<tWaN?5I5`<Ek{T-~!z8Kkaxz9qigJedUs7e{xcpmoD3(djre6Yg
fO3o6AM8fb7n<Rq{evvtf00000NkvXXu0mjf#<7<#

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_live_help_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_live_help_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d4b0f3fcc7a77704e6d320d60324d52d6ff56c7
GIT binary patch
literal 1200
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zSo47}<C$#>n}LFoC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6Gf^>lFz
zshIP2u5Wg1s7Tv<6<<9wEv~g4EKx2CZ?SN{R9Fxou#s8t4|{6{S6_4KGK=XeSV}Kt
zUX;J!=xgA5<(yKln!utPixLh@^j){iw9VoMC(Erle+$3edOffDI&*f(rtg*Cf8Sfb
z`P@G91c|mpFcLg3@qu##)0W1&dh5+L@SI^dpZ-CArq~C`4bA&BqrS?&J7^wp`E*9q
z0Vm#vcf*QB_#PHFx|-~@TlX}BCHc#@)8`Vm^4f@Jr`5k<NYE;b*<Q?2p<NcxHF3R4
z&r8v`UfB!N3nuwKc-T_7_kh}mj57^W7|Mi?JxO5R!4<<kt>N~8`0C?w%zjMi4bvO1
zH@J6cmn^A}a(!vOJv2e6Lc{5C-~-<TU&r+pOT|8!8}wEed#4Iiu;0*H5j{t!JA&EG
zIBOomKaC}^GA~*GFvy5sux+Y-zkxw3i&ygVcS*;8GZp%#e9(Q+%Jl1aV?E1tMIi5`
z(4+4a{spp+JUZf3|6D$o`9L|wf1htueVs&vcvQEA&?0r_bJi?p9#ws4KP!BBetmR?
z?xQDSHSFaNLyig<$Q!160F_?1dhwHC9m||zv&4H7{{5NG^jc7TdqO<-cay97*6pDl
z_5T(fs9N-*W#7L^&wq#*Ofbj?3LS5$yn6C)hvhTN`(C{}>pz|O+X7ZpR>J*b`=g4v
zzxnt5tKr@;+v0noOJ&sZ%QL#Gn~HzS>F6FTX1~b!o^jHjcb5M`1Vu$lsu_ysJy!2p
zv0}k&<{ON9)&HK=a4POR`FEw`Dkr@ob%GY_Ep8oa3-Qo?RJyRZdvWf%_4^M0-&o3U
z-Ek{}(e>>uvBo$4GBoaTyb-s+e8Sz^T7BCt@~?7z@R8xIzS8BUcP|;l3aua4>}lEa
z(^mX|Ro?REe$G3+^Mz&|xoB3qe_O$^UlPaPD(WuvmdSnm{dG{owe&`N?$<)@w|~Sw
zNdF@q<<GQVD?`}*_Mg~0v75AhHLjn!rE_s^-3i`V++DwpT;zMe-M`Q7j(3PMQ$~_?
z)xqLFG9P?66)iK87|d;tOJ9AQpTw};=J<KBz=@q|Y#Sb0{wom_oe7i;jgC05|NM%@
zK&D-dbggxl-wkmQ?}_JcEq!q;-C^+thAA6SQRbu4hWFe8y}SH2q&FCeVIWP$Et^+&
zIM>GevF^LQ^!r4i1NofERjnEMK}<9JB`#~nXctZjyi{km>~^-aMd;z{8g{xH7A(8!
zqwB6L>6HJyQ2koC#vl2a6XY+x{&wq_?WgY9^%E}I3Z9<wQ)o_E?xQ-6SI$EJQayz$
z#4SJH)8EnOrYzVrQ{MBOz?nZTMJ)->t}pT9NUKu|ax(aAEG*nKQ{TmdBW<5SsN#&D
ztrY=4sYJfE3lX1#>!$7r{vo&B_oMU!=2Tr!&J{fSKba@4#_TVXIk0qL@O1TaS?83{
F1OQnJ8S?-D

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/layout/transfer_fragment.xml b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
index 9dcd62602..ccf8956e3 100644
--- a/OpenKeychain/src/main/res/layout/transfer_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_fragment.xml
@@ -57,25 +57,35 @@
 
         </LinearLayout>
 
-        <Button
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:id="@+id/button_scan"
-            android:text="@string/button_scan"
-            android:drawableLeft="@drawable/ic_qrcode_white_24dp"
-            android:drawableTint="@color/md_black_1000"
-            android:drawablePadding="8dp"
-            />
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
+            tools:ignore="ButtonStyle" >
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
-            android:text="@string/transfer_scan_explanation"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:id="@+id/button_help"
+                android:text="@string/button_more_info"
+                android:drawableLeft="@drawable/ic_live_help_24dp"
+                android:drawableTint="@color/md_black_1000"
+                android:drawablePadding="8dp"/>
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:id="@+id/button_scan"
+                android:text="@string/button_scan"
+                android:drawableLeft="@drawable/ic_qrcode_white_24dp"
+                android:drawableTint="@color/md_black_1000"
+                android:drawablePadding="8dp"
+                />
+
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 0f34c3b77..95072395f 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1890,6 +1890,7 @@
     <string name="identity_context_forget">Forget</string>
 
     <string name="button_scan">"Scan"</string>
+    <string name="button_more_info">"More Info"</string>
     <string name="transfer_scan_explanation">"To transfer your keys, establish a secure connection by scanning with either device."</string>
     <string name="connection_status">"Connection status:"</string>
     <string name="section_transfer_keys">"Available keys for transfer"</string>
diff --git a/graphics/drawables/ic_live_help.svg b/graphics/drawables/ic_live_help.svg
new file mode 100644
index 000000000..5765a9dd6
--- /dev/null
+++ b/graphics/drawables/ic_live_help.svg
@@ -0,0 +1,4 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M19 2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h4l3 3 3-3h4c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-6 16h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 11.9 13 12.5 13 14h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"/>
+</svg>
\ No newline at end of file
diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh
index a0954c8cd..2a3ac39dd 100755
--- a/graphics/update-drawables.sh
+++ b/graphics/update-drawables.sh
@@ -22,7 +22,7 @@ SRC_DIR=./drawables/
 #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 
-for NAME in "ic_send" "ic_cloud_unknown" "ic_cloud_off" "ic_wifi_lock" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
+for NAME in "ic_live_help" "ic_send" "ic_cloud_unknown" "ic_cloud_off" "ic_wifi_lock" "broken_heart" "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
 do
 echo $NAME
 inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"