From 2511db0e318a08e66ff6a0d7365ac09791e23856 Mon Sep 17 00:00:00 2001
From: JunZhang <jzhang3@cobo.com>
Date: Tue, 2 Jun 2020 16:01:32 +0800
Subject: [PATCH] fix some ui issue (#18)

---
 .../cold/ui/views/MenuHidingEditText.java     |   3 ++
 .../com/cobo/cold/ui/views/StatusBarView.java |  47 ------------------
 .../main/res/drawable-xhdpi/update_guide.png  | Bin 18896 -> 8091 bytes
 app/src/main/res/layout/add_white_list.xml    |   2 +-
 .../main/res/layout/manage_coin_fragment.xml  |   2 +-
 .../main/res/layout/password_input_modal.xml  |   2 +-
 .../main/res/layout/set_pattern_unlock.xml    |  12 ++++-
 app/src/main/res/values-zh-rCN/strings.xml    |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 9 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/cobo/cold/ui/views/MenuHidingEditText.java b/app/src/main/java/com/cobo/cold/ui/views/MenuHidingEditText.java
index 7085710..177be4f 100644
--- a/app/src/main/java/com/cobo/cold/ui/views/MenuHidingEditText.java
+++ b/app/src/main/java/com/cobo/cold/ui/views/MenuHidingEditText.java
@@ -18,6 +18,7 @@ package com.cobo.cold.ui.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.text.InputType;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 import android.view.Menu;
@@ -61,6 +62,8 @@ public class MenuHidingEditText extends AppCompatEditText {
             MenuHidingEditText.this.clearFocus();
             return false;
         });
+        setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        setTransformationMethod(null);
     }
 
     @Override
diff --git a/app/src/main/java/com/cobo/cold/ui/views/StatusBarView.java b/app/src/main/java/com/cobo/cold/ui/views/StatusBarView.java
index 75fcf6d..c61f4f6 100644
--- a/app/src/main/java/com/cobo/cold/ui/views/StatusBarView.java
+++ b/app/src/main/java/com/cobo/cold/ui/views/StatusBarView.java
@@ -18,36 +18,18 @@
 package com.cobo.cold.ui.views;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.graphics.Color;
 import android.os.PowerManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.LinearLayout;
 
-import com.cobo.cold.R;
-import com.cobo.cold.Utilities;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import static android.content.Context.MODE_PRIVATE;
-import static com.cobo.cold.Utilities.PREFERENCE_KEY_BELONG_TO;
-import static com.cobo.cold.Utilities.PREFERENCE_SECRET;
-
 public class StatusBarView extends LinearLayout {
 
     private static final String TAG = "Vault.StatusBarView";
 
-    private final SharedPreferences sp;
-
-    private final OnSharedPreferenceChangeListener listener = (sp, key) -> {
-        if (PREFERENCE_KEY_BELONG_TO.equals(key)) {
-            updateBg();
-        }
-    };
-
     public StatusBarView(Context context) {
         this(context, null);
     }
@@ -62,37 +44,8 @@ public class StatusBarView extends LinearLayout {
 
     public StatusBarView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        sp = getContext().getSharedPreferences(PREFERENCE_SECRET, MODE_PRIVATE);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        updateBg();
     }
 
-    private void updateBg() {
-        String belongTo = Utilities.getCurrentBelongTo(getContext());
-        if ("hidden".equals(belongTo)) {
-            setBackgroundColor(Color.parseColor("#FFC700"));
-            findViewById(R.id.passphrase).setVisibility(VISIBLE);
-        } else {
-            setBackgroundColor(Color.TRANSPARENT);
-            findViewById(R.id.passphrase).setVisibility(GONE);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        sp.registerOnSharedPreferenceChangeListener(listener);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        sp.unregisterOnSharedPreferenceChangeListener(listener);
-    }
 
     private boolean isDryCell() {
         boolean isDryCell = false;
diff --git a/app/src/main/res/drawable-xhdpi/update_guide.png b/app/src/main/res/drawable-xhdpi/update_guide.png
index 70fc17cc32441d85bc94978c3e447171dd25e0fd..da1ecd3fe3a701529e950b4091aeeac6b230a5dd 100644
GIT binary patch
literal 8091
zcmeHMXH=74lcyI25mD&`!M}(oh=SA*L=Y4eq$^brL8*a2Ae4ZW&L3$ikOUQ_Bhp)f
zQliwTgd&6}krqk}A@q=a;`{D?*|T5XJ!kivJ^LXi&vWnGdFIZYnfsfWMC)tjqI+ca
zaB*>oUa~N?;o{=<<>KNwDI@@lkUP(w0se%8EpCKzah<%(`EkP$u&Z2LpsSZm&)Y@h
zFOh;$T$#^D>1g5ZzY{cX+`n*N(84hA{SW)&N3RCpoPz6lT5R5_#lN|CBdQ2iW8Zx5
zoPGDUdD2VlTu+USYzawn?9HBoceU?JKK6Z-`a<_)DZb^#mCW)ZM-?oFDgIAy!IM?~
zsy1sUhK3B@eurNh4V{^so!H*AkPwh{CmUpLPLg8=X!$KutMlKAQp3|zU2QKnRb<0=
z``yOQ8tpQ#z=b{)X2(y0&()V@t#t9hi&Vvyq(NjNNQ~e2@&Zp=l>g$4O%I&H7#kZq
z6E$T@qYeFav+kaKQ(*s#EiraCicS|CUz3WP4vpN4s~4X;F(3xn@X!mR+R<oV4otLo
zncvVkV?)LBTRWd7wBWlv>!YrIt+LUE8-=ahzQIT)`uKHG<{Bf{M@I`PkjBA}!4!(s
z<_nh>I;pyVxH0uvD+Wbbh2dZk#il2hRnZfG)JZ`@Q~mr1V9Cg3RZ!BPm;djTzAHTj
zts&DrA^qcI)DM)_f=U(krdte?7>ls5u8hGO^w>MP+9Qu(uU~GmeJxof1Kk-=fo#ql
za&(~=CNLY^BMJ@aKFHyxEn>H|3=LhDC+jPc7;tw)N$d7w*(uD1An<XuqS5MF3*sKm
zr|nd|U0LQ+ToajAhS%S`eOp6DDrOWC%X-1i4LNlk9mIkpM~c<*xZ|~a-RlaYO*Pn8
zK@CZ6`CE#&4$ZPztKX(CfOdnWWn@mQr>5mlzJ2p%V`C~NdjwA6M$a@u88ac<^6);E
z>yu+Dy)}b|XB)nq=zdcWPz1%0<2%eEzNx2Gv8LT~f}&Xq(`#a}@BAlfOAv>5MuT?m
zMDBjdSRwKX-ozD&`ns9wP03~K)3|okzD+mu)?1Jytvn!{Ze|Gk?Gd^BDI;Vg=M+(a
z<b2Nm_`-0N#-M_c3roQm?33m=QB-3ROKs<V^+lk7VVWJW78OmKq~-<B0t+lNo$SfY
zw=OWRKGR3krlw0ey?iv&R~?+pFW2Av<M~6n|HkhNV)nPvay9Axn_rg3%Qj)HDW99=
z#e5x7PE+YV6|wdK(ba~BV@lyEhMq(@GUl0HSB;NccIxKpuV1fu6A5_F_`_AN7xZdG
z`AE>~BU8^H=*il<w%U0p2pWa#JnW0xR37l$8#v<nwd?8Bjk74Q@{s0Q0ucsASMu(w
zb?ke-aFwSkzsV;Drri>8xB&Gm;#>6Aa)oo5_@}U#;3LXXc0sN5i%pB~drQrO1||$r
zT>`Zn`k43hD^EKPmc)f4Sj>@G9{HB~xzvkQg08d-ED~0`HTz0J;*LGR2EDcVHf8~_
z_&z>%l`BzL%h-lT^zSTV-lKmJxGw!GuXe9!mn_(cI$UWwJZ@2xRBtB1ni;;cHxV9<
zdj4EhW3bPToeze7WXpOa^1Y}reHetJq@4jwwbHrf&KGw~n6h#xdT?MMr{tA+Z?bth
zg5uF=%G00ktm9v7G`vp?H=lf<Y%0OO{AoJKp#F#CNfRu!N3E<Fj|R!elq!Kh;tM|L
z$Tx=YUlw7q?NdTp-nUs>A;4kV+xc;<NA1Uk(-pe~`<22096lf|B_%6tVZ^aPwgCqi
z>&oKKj%mV&2iUoHLOkGh&n)QRa7C!vj1ZJh%b~^6b$%G?9`?id&_Y7!Lj>i`RpJTO
zXBE`xt+>7W=eQ4Lq}T_@@reMYE-TD<KDFjqD-L3kr3<k^uv)~K2x@!$dA38lp71JH
zl0D;;>^VEJosCu47%s@&G2GSkwU>R&V0{3QyX%=1eqRQDeOWv2G5@F_*x0i!nwBOX
z3Qe<TC`(AVk`727NmGP01-UaLQyiB;@&(SHd2xyaUL_u>BjpVr%@m^|->Ex%qyO5U
zktVOGB<dqE#|;Ji!(K=^K@75Ledv>0@=}!e{Ki|0jxjz2S7&?^qMTmT7FDKrM||BI
z=`$goktQzkJCuhs>zV8<m!eiseX+YDfO)wYbqSwiXpGsunX-3zvbheCP+fGY!-?Xe
z^p%;@GO7lS?jB1yoxs<eP9l!Y%F+Eg#-iwa2YgQF3^)l06d13UIK>Z#&N@A>_eRrq
zRZ!3J%tu~HOWE;|-ct3J8RluV)GTU3XxsO6yoaOUgDaSA>vE%o1-~oTuGKGdceff=
z#z{ic9^{`c=4%!seUTRJq&8JZ4xn*KkI(-_h&kp^u%KTy(D6h}qxV6X;~WzoQmhdw
zBk9omOh+^>cFOZo%(06+;`37CT9GD~!%7JKd9#7+E7iQp7bUK;3dCn4baI^agOq-h
z!bOzS=8SA<ptM82wn|UM7Qfp+T5%Cvnp)??z%NTs+k#W@8G^`(_~o<onaZDCk9p*w
zX}y{1;W}pisbyAaH%jLR#{EPKX8Z3IqJ?3g#Dw7>XJY4YbK?pLoV$N~>*J24eVd@?
zEVNwn$sI0$qC|PPQ%=_tBsq+;tA2`ND?G`)_lDslcl`GLKeLAgg>tFUjG3-`p2;pT
z0>7vNo?-#YgqYjJY)1#NJ8$9-tu_nn>(hn?(;~o6&OHE_YVEx@buXlv$GtM<>uDiA
z8Aa820gKC+8`ieDDgg_1#)`c0cg`~}DOrj`-Kc3#x7t-il;W3_nfK}vd7}r<1s4__
zoAfN3)E|B0ck_ZRaH>P`fu5E(^FK6X9q&$fo%m^F8*No!*z{}sK5%Cm*$8S6{P3G9
zus|)gvWALAaStH|?lA!w$Ex}S1C9`4-s~F-R`ItKXHd+K9aGn@-CkeHi(-rvB{=e2
zb#vzXei5^MMgDz8M#e=2CqDL1L6D1`qF3jE^GIy`Sm<*dONjb_$Z^R<+F7WFy1JcR
zL1|kM`6*~3>5y7!_9_t1h&SS)scAw!;Mp`{*y2WlpU%jwG)U;y>il19QbYJ;cI#(9
z=L>m4Fm&RfAU^GjyyA^T%dek-zB_$ZzoR{FnokkN7+sAnjfV=?W{8`EN?*BD8IRAc
z4akzaPmX_9=bZM1K_kW$CdQNhdnalxFj@XMGt-jg<iR<jq^4l7Sl|knr)9eGlyj+t
zMwrIAT8_<EDd<{1(jVw7!}AC1UtiA|pl$*&=D}{j?RH@pI!SjVJ{f-QZU;ZDtYM7W
zD(KmVsz6D@cu4puyM<Ar_|F#j_S&kL)<xOs`)Mk<x)S0XPin%0qWlAgpsF+i=@iuZ
zokD;i5D~m`4IZ77m@|@e9zreVzdOL)CpDkIAQfzf`G$N=R3#iC@G9QV)&9z$$QfA4
zNj-EAKK3)N*vc(YYWUSdmT3MS?7`}m*OLNL&}Ako-k%Q<moGj4%o3l{JnloaZ_%y~
zP+QQKgdOm4dS)#4ECD7Lmuz8<0RcWCqoxIgvbqw^%F-t51D4Ocw362))Zt`-Qx&xC
zd+l@QPU#I;{yqh-$Itl9Pv-j3po<-qZ0y&jVOZ;txVC}dKprrL>ZgO3)4g^(k+>T3
z>J<??@ATyyJ@)=BAcUXTU6^r2>jy#{mg>KL*c4ukEAxup7KAu;>6^$?(w*#a5v#s+
zA5+u221>lJa<rKPYSRg!;GW|JHyFT8T=wmQlCW0j+ei3piqcT^RO-9QGqhhBQkP7f
zytLjEdK$0^>>b6C26-zkx~XDcFqH3wURW_j+2Lz7PulP9d%7QGL4K0Z&973KSK#W)
zwAT`iFrNPVO7H2=Vn&|$qMBpHi>TbCvt7t2>aR<JEX;YH{+C0v!|Lq>@HHmK>$smD
z@Qr)@A5QrHum4NhxJeH}E;JaynM6nSb|9&3#4W0#+@<L&8|1+i7Q0LP4nXrP8vBuJ
zI6#5>+K;o&zZJZ>iPKfPhBk5qz<fa(go$R)r6a=4Cz(}j@5m9H%+eSccaTl1O3$LD
zus*!sm6z2CQkT^UIKjcag%1RCw~y5I{Qe!>1V8~fG)g`F$`z5VT;+;wbMxNsKYunx
zIS`U>3viH^&X1w=J2%-<anXFu+_|`=fC{9Du@Mg`jwlOp3EUEM9T(yi5sDA|REMiK
zdmVpK81}$a#`meQ&PgRv0^gtbuBzrx{@X0>q5Aq&)oJR${98!uQXPt%J6(H^SjvGy
z97seBdJaHdeKlx!c=#9O!t(~rm_?_sa7yplWb$5x1}FgAvjEI>{6d){dneZAS3tYs
z{yCeTxvR8Ov}S6>G-Q{_z7!mkV{S_K0<j~QgE#rkn8?00*Ep6&_o2W@3&Z8lx9c_-
z9XgYv#PPWEn!lCPgc$gXla9Naq8-y~?g;byQMCYOHh>J&A<SB(=;VH}g`M$6AlR9a
zE|%x#B4ke=7ce5AH?xt3>zg>~NOvn*Z%7hxrKz*)@!_QP=hW(M6Hhx$EiKrGaa}Si
zVchBX<mqAoeFAQ4V4-&j2V0uJ;b-Z74}3M_u>@odfD<*MWhFO)4u?WKtVI?@^!JIx
zQdzi=;VOI;YcoAI;!6X3hrxcevs#oZ(+uy=L!l}idiFjCLp`qx?xA>0HaUEGd#&K+
z(2nlD6DZobsi%eQgQAOj06uO=qP-6bvGaYdpVl@vo~+B>$TKfZPZ@xV&I9rPU2&A0
z!KoLGsY3MoxLN&?-^X~{k|}#_$=8B4nw1^iq|->w%irG@y<p}HBx!%#ni?8<xqPAg
zZ?CsqKq7_;lN|)zn2@lIk%bxu?*^FWqruU-G|Bx44-Z}zS@8HkQRtb=4|R>Ej9vN=
z8s7Q)ku!UdD=L=FsR^q#LA(O-F#tN8{9ZoX=|(x(z|Hdi(J-bx-G<(L5Ypd`{0<Tm
zusDyAUCC)^t7~09i*p=~nOWbSqI0#W5JZ#Vj@-T`e!MKJ%C^d#$qLYM^oDsumh9x#
zFh5cZ(|=QXZmB~jo4r+-N`xR;ZOYSyskobFO>4WvvNAHSZ;gY%)(E)<8@)txSI4bo
z$4t8$vZhy9Xso{EVpq~xVKM~PKY^4-53=ELZhq6}TBPnqPd`CAyW;eWc1iB?r59!B
z&<^{cmLKT!zekk+-e8bl#CQkt??T*PoIvgr%;vH*T~3UY>N>}K+`F3RP>Jzkwt8*6
zX*v{Yy0(tny>e(oDsr*0{j&bl&gd#Rt02?Lu`pd1KPx`7!H|}RgqJrvLbY`rqqiR=
zFuMEm%8=;rk9%X@WUI|VcGntuklTdrCc*$~3y!MlmQU6*mMWW(yyLD)e&Om`pPN@Y
zNJdBeb(o%bb{R-das|Ve%Ljz=rGHC+9mGVlImt!Ui78Jj4sN&~#ovF|8>9Tj0JR&k
zIn95kTYOOxNUZ&Q@XtLD9#H#@IC_T7D4)71v+h6cFr1pw7xSC(ZE&474j)K9ecril
z&5kDJ*IDd!L<8o4pADTk{z`OwMafuvKH>%_cc1*~*g{FBN}1!~YtnDs>&_9XO?E#q
zY3gM5XRA`Zkj3_5pFuipHVMA*dsicjjyk7NN#2=Al&FXmX@69Ah5)tJs3#JYx*6-|
z@r_FRWG)sDs=VC&*eWllnY+9WUlaKLDm#9+b33+a&jLtc^G=wDMz;i=R!vgx<nENZ
zm9It+|HX!l3ziLfX)t$2*=z3d`ZTI6#`$Jbzq$j~eY*u$_EJue->a`0z7;gHW`?H~
z&|YUIgqlXo7DCY5b)$DA8|<IRVnzU)x_6SE2Jc%MN~jTDSPF+e_Sl)++;^ZGDN(i{
z6g8ipe_))U^qn5XC0%=lP%WnK@Cnz_K9H<|yzR$~5+{WwM&QkI>fzVI6Ls;U%0@WC
zvRGW;-D#0#8LKNsZ9m**oi4fiN}9_V?~n#celpDRDeGKke3#C(gf4~ccFba-A0V=?
zQpwA5)_k9O__zPlZGBl{4vpO)@vVE#yCIn>0Z1X^19y2?J%zaAkeCuyhSBb(#?eMe
zV~9na*p@ST<95>;I_9+teIOiL^i3_3ML){>>+faLY#iI&{Zg<77h>?d$$y0oO6vg7
zTW??Hkge_aJ(5TC_I}6(`GzG0Sq8W%j#Fq7UR5&7r^(8@=8W%-4aPdC<0cyJ$J5=n
zmg2E%-~GJ389};jCWq9&me{`S={<Wkl{9Hkg~M)jcL#I_@Ge2eymPbR<lqa;vpWrB
zc5EaiRVOE!JhD%0Fh-pqscN$IsngV}0S@HC(>bEDJwrowdO+DFSAn1KFoU_!YaY~C
zNd4G}-o2~buvub-L@b923P<_BsgZF9YiYH+^ZUL<)ER)mZ70{=F;V3Txh}I@M{5Uy
zRS0<gW(aYxl}B{xK#L6(JwES+&zZ*Vh4IwX)DR1#Q1D=`PXQa<vSr&1`GOn#`rKao
ze9_Y=h-Cagp^^2Rsg!T}Ki+;u_{4hii!KpTH$%ne<nE;CV(gnWk?K4J7os05@IF!!
z-3;^Eb>Y)b&+RWP)c(iR6HUR|3k@@aW*El1`;WuthIg8TU<%AVh>A>m#k#<Lbh7cR
zX4F*YL`}7(;4fkYhqX(Jo?^o$V-~1R<g&1PU`kBOH$b^ekY&lON@UCimZN}0HdPo`
zE#VLuY3Y*Pu|E>I_}4v{7#>!e^PY5bl$bM}GQKt6*97p&-FPlXZDnK}T8%69ao%^(
zM4dFzc3oobHZb@0r}{FoQW$my7`{gOvupewnU(o2j+{nJ;MzIZEl7xJd&ben=XjG(
zMUsqJC4wGte2My8lHmN$iM&rH3T-bqH1pnqdyb^K{n?ln{LAaYBZ7Mh@d#~>o^mbI
zP4@kRtoIo&qAHieDpJo{sBNT|v+>q)OyN30?+>Xh_TL{JTjLiO7yZN7F1o_aRU@1=
zP12#pv{eL0**XAwI0DRB;|yM3S#u=BwEfveh1>Zm?FWx5droua#&>uh%@7D+W(1|H
zqy!a9<kxT7`ud796v~)YNYhC&o^`~vzQ6x?xny>*O)ltQ{J@}DCZ@$x^B`kZN^=;3
zY*Qk924p2=-(rVe#bhQ+!wfSez4px|{Y12Wp>X66FLu9EQ4f;IA${jlDIVf$=9fGE
za5({89U=Kjgd_KoH5=4rmgy1c&Cylh6N!R0f&<}Q>lu!^8ZNZmPs??y?B(uN`NmOy
z)R0Eg;*-bI83DjXo58IedrnsQ|6%jf_{hIMUa!LRV{S#>&f_plNASy!2qoxA6Y^93
z5KaMv>Hm1NahGkz9#kTv{B!2&ZD3VC<Vml@gy7*4R4Qo)wVnlF#h5V+w^~)>%NG#b
z?$$yH$8^VwV#ATW&XZGH1j0K<_ZV$bt{uji`Xw>(Jo|vLvZo-vz`4Fpp7Plg<9uSg
zT*Mdk;Nibk+57KQ1^<8Tzg$rLKcYJ38)LBwx20{qzfI-m@DwC~cDvU36%%_6;FQp!
ztf-OHl&mQD;_*RwJ)3I<hVxNcgJFKdubVX5J&JkSe4=+sNM2sJ>z6k@P4$hq<|+Vh
z%7_gHIvBP^S%Wz?fom~(z1l@tVn<u7j6p5YyBEfRJg&{AN1gn;2DmC)YO+>{{_A_^
z-0R1<|7Xr(Xd0`zR0~v<|2QH528&oGdtk{EP2Rl|1*FEi-!Mo$%ynAp?$()FL>Q1{
zDD_J^V4OXOrS{X4@&-LXUPv8?rL~YxK{h^!39x#3QWMZsViV!cH=07cBRysZLgs#a
z;FPRYv5h<h6M(wxpb9`I21rp(0M!?3ltIXC0`4TCSZD=EA{>%25k>mZKt-M{VPyvi
zZTqEo%d;VH)EfNCJl`GlTouSk6V9G|007Lvk;2cPsok6-Nsrl~csDXi>m185nMpnj
zputkSJdtc`tBUF`BzHx4QRlu;XEof~CUx|0R#Z|(qUa1C{(>ug9iBuNydLTch}`0s
zUua2nEMv-Ttr;vIUr$eS_^^B~{@PKuYhAsi8xRw|P0Mt!12~kIWDlZ6!aQGY8O9#-
z`Z=_;RKZhVYG{e?Epa-JKfBQ(2DWP(;z9Tz5Y5p)8R)9+l%kq8ZHI5w@>Q~Y&3L6x
znzYh&T?q1*1#{)ZH@7QNw}Fb8rdN3}g)urWUN#Sam0VWYl;SP1uA1L%;|+uT^;2xF
z8*A=7L5CrEwzjsRkQxvP8#5;M!}<KWh2eI0O)xkp7B+caSn+Lyw=4y}IZjs?t@9hJ
zr`$NdZY<|pY(=b0ml`kPUJ@6i0SyTUPQy*#>PQ;MtTxZ6IEbHQ##9{-%lDd;8|<DE
zS&|Uk4~qT$fjZj=+ow2Om6WGMa6Le-)!mZSNc@<&y_U_|UK4FsezJQgxokr(?Nl{0
zymdn_-Sx)R(^GTzb-fM3?{@Cd$0lliP52@}0C`$2u2y@6N^1L25eg23-jmqt@F3F7
zuFVJ^t0LVC>=H@$YT2^B78KrwBe6#2Sq*U+11)Nh9051w1D^TDWEy%JOcuEfcI-h&
z+r53X{N27w4|_y2=&+BJ9CNIlQ8g=mwQ-a;frs>NGgqjfpdc*KTFT>}!wZo@um@9r
zUG2-WoIOxj&5v)D78tjwoIOGi4NkQF5lvl)>}(9(Wf}%9X;EC{j=H==kiFU-sbje-
zO$1LK?JlT(SqXfgs?jSK-}Fbo^V%EarqJaBg&YZfM61tmww1izwxK~Ox+Jo#6EJD0
z^EJU1jQien@JPGoP*9aUP8H@dNXa8_Tx6+~Er?d>#%$GU%qRgqpKL*ft^E2NG7S{S
zk)QrDi3cjpKdNh#-7?s7Par2bp4V9SWGy9~_WnLr7k#p5(Y4ysjDvoA+^<}7c$Mmg
zV`vZpzhtnt#n{$en?Um!;#Te1<&%79wQKyJz2<sS5a!SwOI3sQlyry#-`3YfAlNk3
uyuenZu7fO8U+(+>ddrTbQI3~4*-*YYZRgZoDWKcVb;<0SX{CwB{eJ^{hFr%0

literal 18896
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

diff --git a/app/src/main/res/layout/add_white_list.xml b/app/src/main/res/layout/add_white_list.xml
index 4335ac9..c700801 100644
--- a/app/src/main/res/layout/add_white_list.xml
+++ b/app/src/main/res/layout/add_white_list.xml
@@ -72,7 +72,7 @@
             android:textStyle="bold"
             tools:text="ETH" />
 
-        <com.cobo.cold.ui.views.NoSuggestionEditText
+        <com.cobo.cold.ui.views.MenuHidingEditText
             android:id="@+id/name_edit"
             android:layout_width="match_parent"
             android:layout_height="60dp"
diff --git a/app/src/main/res/layout/manage_coin_fragment.xml b/app/src/main/res/layout/manage_coin_fragment.xml
index a6b223d..5926972 100644
--- a/app/src/main/res/layout/manage_coin_fragment.xml
+++ b/app/src/main/res/layout/manage_coin_fragment.xml
@@ -57,7 +57,7 @@
             android:background="#000000"
             android:visibility="invisible">
 
-            <com.cobo.cold.ui.views.NoSuggestionEditText
+            <com.cobo.cold.ui.views.MenuHidingEditText
                 android:id="@+id/search"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/password_input_modal.xml b/app/src/main/res/layout/password_input_modal.xml
index c0d7c3e..06237c8 100644
--- a/app/src/main/res/layout/password_input_modal.xml
+++ b/app/src/main/res/layout/password_input_modal.xml
@@ -73,7 +73,7 @@
                 android:text="@string/factory_reset_hint"
                 android:textSize="12sp" />
 
-            <com.cobo.cold.ui.views.MenuHidingEditText
+            <EditText
                 android:id="@+id/input"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
diff --git a/app/src/main/res/layout/set_pattern_unlock.xml b/app/src/main/res/layout/set_pattern_unlock.xml
index 4e91d50..a67c4d0 100644
--- a/app/src/main/res/layout/set_pattern_unlock.xml
+++ b/app/src/main/res/layout/set_pattern_unlock.xml
@@ -63,6 +63,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="34dp"
+            android:visibility="gone"
             app:step="2" />
 
 
@@ -74,10 +75,17 @@
             android:text="@string/pattern_unlock_hint"
             android:textColor="@color/white"
             android:textSize="15sp" />
+        <TextView
+            android:layout_marginTop="10dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/pattern_lock_hide_track"
+            android:textColor="@color/white40"
+            android:textSize="12sp" />
 
         <TextView
             android:id="@+id/hint1"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="16dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/pattern_lock_hint"
@@ -89,7 +97,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="35dp"
+            android:layout_marginTop="10dp"
             app:aspectRatio="square"
             app:aspectRatioEnabled="true"
             app:correctStateColor="@color/colorAccent"
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 680e9b4..355e97c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -318,4 +318,5 @@
     <string name="dice_rolls">骰子生成助记词</string>
     <string name="dice_roll_guide"><![CDATA[请注意:<br><br> 1. 至少投掷50次，才能生成助记词；建议您最少投掷99次，获得256位的随机熵值；Cobo 金库不限制您的最大投掷次数。<br>2. 建议您使用<font color="#00cdc3">赌场级骰子<font/>（六个面向上的概率相同），操作过程中确保骰子在空中得到足够的翻转，且避免总是从骰子特定面朝上进行投掷。]]></string>
     <string name="start">开始</string>
+    <string name="pattern_lock_hide_track">为防偷窥，解锁时将隐藏轨迹</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92c5129..d445418 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,4 +342,5 @@
     <string name="dice_rolls">Dice Rolls</string>
     <string name="dice_roll_guide"><![CDATA[How to use dice to generate keys:<br><br> 1. Roll the dice at least 50 times. Roll 99 times to obtain 256-bit entropy (recommended). There is no limit to the number of rolls you can use.<br>2. We recommend you use <font color="#00cdc3">casino dice<font/> to increase the entropy of each dice throw.]]></string>
     <string name="start">Start</string>
+    <string name="pattern_lock_hide_track">To prevent peeping, track will be hidden when unlocked</string>
 </resources>