From 5fa1677ffac037bcd62b21a41996398976dbcec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=88=90=E6=89=AC?= <1329310186@qq.com> Date: Fri, 7 Apr 2023 16:47:54 +0800 Subject: [PATCH] 1 --- doc/~$泛读报告.docx | Bin 162 -> 162 bytes .../7.5/executionHistory/executionHistory.bin | Bin 307862 -> 363030 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/7.5/fileHashes/fileHashes.bin | Bin 131533 -> 150033 bytes .../.gradle/7.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 26201 -> 52745 bytes src/Notes-master3/.gradle/file-system.probe | Bin 8 -> 8 bytes src/Notes-master3/.idea/Notes-master3.iml | 9 - src/Notes-master3/.idea/misc.xml | 2 +- src/Notes-master3/.idea/modules.xml | 8 - .../intermediates/apk/debug/app-debug.apk | Bin 1042525 -> 1042521 bytes .../dex_archive_input_jar_hashes/debug/out | Bin 397 -> 405 bytes .../compile-file-map.properties | 2 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 4 +- .../tmp/debug/zip-cache/androidResources | Bin 7931 -> 7931 bytes .../manifest-merger-blame-debug-report.txt | 256 ++++++++-------- .../debug/raw-zh-rCN_introduction.flat | Bin 600 -> 592 bytes .../debug/out/multi-v2/debug.json | 36 +-- .../debug/out/multi-v2/values-zh-rCN.json | 8 +- .../debug/out/multi-v2/values-zh-rTW.json | 8 +- .../debug/out/multi-v2/values.json | 20 +- .../debug/out/resources-debug.ap_ | Bin 946411 -> 946407 bytes .../logs/manifest-merger-debug-report.txt | 274 +++++++++--------- .../previous-compilation-data.bin | Bin 13232 -> 13232 bytes 28 files changed, 308 insertions(+), 325 deletions(-) delete mode 100644 src/Notes-master3/.idea/Notes-master3.iml delete mode 100644 src/Notes-master3/.idea/modules.xml diff --git a/doc/~$泛读报告.docx b/doc/~$泛读报告.docx index 9a041463c8dff35a3a6afb1795e36db5540c43f2..575aac4ffc7353a056fe1e0a6422dc1758f9e811 100644 GIT binary patch delta 73 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 diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock index 5cebefdbffe4dba53d339287d131db170e6ebf8d..b65026d6d2e73fed288c2638c8d091f92c5b63cc 100644 GIT binary patch literal 17 VcmZQRux5)(aDJ>d0~j!C0{}6j1Kd0~j!K0st|A1HJ$N diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin index 397e99e2408cfab4413eb48d507664fd1bd0a029..81666bc48c7d6cbcf301306c6be9231e0275c6e1 100644 GIT binary patch delta 13657 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�?^!5sld?xt(!2s)jL_%#0-D?M*ukf}PF@~IXRMY3q`l2%T~x2X zXjP^Mks+7h)my3L$Qgq#55Lg^oBD0xmO0-{ch;Hok*@3D@nHOpd+rZjP-)^vPxsbq zAnskF-@IFzZcQ5+vF$$bLVcH&$K9v3MztWfmMHk%ce_61#6==^HiVjY-&oIf?ph*i(y^rP*IFGy``!lEoo3Wc zJdSSFBM|jzgpGH@!-@khZ%;+&5~wggD!&)s7%>!i|1VJZNi4DHwPE=D>GTBcqj<*n zq-*?L?n^$Q*UT8IJ|(iZ>*uFj&7rqBupW#%r0k^GYR`&yXrj-}6T&*C>kR66mN3!s z+Es)GRZ!gVjrBQkP$xTSJ~B-=$orfqNflQ=ZBnL-Z_qoTqXC=7kNPv_4fT4o!MD%N z?D+HVhpByFv3~b?Q2#~DZdsLKHp-D8Gs%HhUz*uqiQd+GSLj9B&Vib*QZ{t<)xh9I zTIdUX4((s<)U1n@m_HAbYsZ-K%Gb(F#8lh;=W|NkC8P}R95Z>H(4X_`{mSOu&Y@eE zZ2%dX$jDgVj3p(;dh~UwTQ%8~$Rx787fcGPNcx5?x%!e1iHwvzY4^{CUned?=(dem zBr%D8Zc!7(+wl;pq^xQtv~@9PWmr>wa0zc#D*PXxWL!9|;TT=>)=^|@5+jwU1%?b- zrR0stDj$WAOWKnrt4puZ!+l5f_d|$2anK2Bi>E^O=7YoJp!4A&mGa2An79{ zT&}1OHm`m140+F|WOg!lbpv*-h%eH2La1FyZX|Q#@MQSXOR~;5g!)cIG=po)>E!;! zQI6FJ`+Tb$I)l;W9%3q*JLV_>(gE>g3{C()os@gBkbNN^x%5<$GLZlg6J#` z0obfM*o;6c0m}Tc)T^t-Ex27)2g#Hcr1CH#toRNW>a=@F1-)^MvqtMuM%o!J}QS=zqBZ}Og&BZEjAAJ3y7u`%O88UDV zlPEbH_s6rcfd&{mSaFVhaN@zh2}-->A=h3`wsK}aF$9L{RncXuyjf`O(NM90yZEi} z^4$G@JTf(Qpymb)>19j)ox?P zsf=t(XN=ginhBnDn-^e#R~gx#&Ro!W@+ojl?R=%#NPTm`WT3Qi_grQK!&b?M`jZO zKfI@t=mm_C|I1owKlSKqbcTeQ2q`ZwWSXtD^4*U$`iTYpDrBmyivLHU$G>0^Cy>#`mf0BrwKiN z2RG91TLscf_nkQc?Q0p%y`dLh}TD( z+xNfUsv(pH3GH<{N=>7?|GpNvMDflkfhJ=O>v_^BH+ zF2O97zG(E_0K)?7Ncb{l66;faN<3wgEmjyLfyg1^%CpNDbA}BMI_{qNA_Pm=5_11H zZr`$dba+p5E8WudF2TB>MAoSCpB;llhtOzhMz${Jw#dENlIn`3VuX?`FbU3Pv(m4A zNK2u&)G~oYui(bfBI%ZBUfdcqY9^4?E4XHQy+1J2;CFho9$W<4A!0UI)%U`lUq_?S zt{$vIxRr8jW8vmQ%aHZ8C$1|Q=~%t)&u#YBPe!QjCyasmvOnLH!33`2+Hk(3f9k9G8@dp~u@B!p_s zq^pDxOGdn2;NaOe9AVHGp<5x*B?p%6)$^wv1%v z(3t4w?}L!)DGu4;Wd}+^zu%$LKe(NoFXf)Aec!*7wq*W|=02NA$^qt}&hXcc5zT93 z-XQJwiWrtLb$K2)N+nfh*_%Og&1{HNQm7W70Hysq+Y z8B?q*vAOi=^eh8dqa^VnT zB-t0WwRgo*Q!HQ?C_*l;@895gXBu*mDui{K>x}+UI_L26rGFtbT?TQT*(9}sanc!c z>U^q??s3|t|1fCpEGMCdxovyQkmsu3do^Q~&=;J#S<*kf{Yfj@c&`c*m|;cgat>}uh)i|U0) zbqgTw=N6sV)(hkEJ}k{c=xz_~Kc(zS(~*ZpDAVRG@J zWM3s?%yt|2N$cc&x^rkUP~PQ5-pLDktQ_rjEhrI_LoA`WtDGD>%7o}lz7gBa=V;F- zSfVW^?~Zbtjcx1I)T2LI5n7VX_1p|y-n&++<=uwNYNBw>@s;L=>3SzSkasU8W>wsi zCjQIgh07kfe?&UyL}f%3!+rOY@O;sYgvqjC#1>N0&M;E4@fhRG{`u#!ugi^Nu|)e7 zsXWG*>r8$8``3Ya;bBOXUF64q87sN`!Q^U_9YT{flC8`nk|ovL6F@0`*WG0=A7hEl zL!pn;Z3Y|un4d-OmwFn}RbiIsOz+%L8vgY3eRS)vBu9lg=%2L9d(^XnxpX&T6&Xn{ zikBocE~j5#bZZl`lO4j({kt@+6H|73&INj^a!pXjq%)xOfAG9`H zbg85FMqOKQryAYyJ?+;p1Y4C1Q}7XXe=G|2cSCNGtl-oCtZuHq^c!+pmguT6Vv>4_ zIn8PwY2N60pgWf6+$HsD%m|y=k>}c69rEuYl`38+=A><%^1P*W2lAf7DpO7~+!t&9 zcE+{0%IFs0{*j2)x#8M1_PF}XU#rooJCmHMVa#pP8+O#qSyQwfsYi~`!MS=pR~#)9 zS0Z<>sk~bwf7!7z9C}`)m5Q`iJ83$@a8KB&)oXvm(Wh?zS|MV7;LOzncFgcXv*$9B zror{1W@KM+1=Si+6Hy&UA;kFyE^hJ@D4e?ka z+D3{sxrv-w%iLp6?w=WaGLCj;@EqcIj(hjJsAPQh-`({18(<)GX7Syy?##VJdYT>J zLcVEnOK0&5-^X+R`kOxJyqbw_4`zu^R>ooDI_p*%+~b6hk#+gm_DQ8r$6!|!U%Cjz zT}n!p(sJ>=9)x?k^@Q}zy(-fi8E4&Y(YY;;A-70G_Bk@W_)p}NBjbpw-H{PNSQv7M z3quS*1-ZJPD{rFZq{>OC_eP;ioCOx4P}zcl_Mx;P<{jhML*5m>`%2nvq$ZBhhtzO= z?BLz~)R^HSWV^jDU^#lErr4eTA}=-P$7#IRJlUgdk8F6p*AQ~jiA6q zM&klHgbJ*#paK-C+EZX{3T5UcFqxpBW+aWP|11<1=n1M`p~9sC%T%Z`g=!WQ$VSt+ zxUWJ5r(S}JQ>ey)0@L;ul%GPS2@0AcX4XD^ zXxhd^LF7_F3V(8)e;7^IX^Ke5Dijn%ji;5@2;zhw-U&h+Lpyk-4-Eiuj0g&1Xs%1& z|8FsN`<0}%F#2S1Uxu#6KC!fstXL6Di=|`9eIWA~W$sf;Um4lJDAQJwExF4(6)3;F z7V#>=?ql)`Iji=pbC!}4vogBH zQjII*ej)}z_Jn?1prtaYAHs;T&W%0ZwR6$kOL~O{+wL{&T8efHe63ar%jW9*p9UVx zzM-$$Bk=Rej7HOzkU`ARbRqv-$CP}&gr`a<&T9R*VYZ|2!)a))erm(1j+ zIO4E}F*NU-pW|Sztv2~}&lsymTb^@AGT!hOBMpN{voWJ@wz|K1eR%VO*u0|O8j7+^ zsA&$GET@o86Gnbz=KY{xlE{2f`}%J4tSa5s8?7!@+GU-Dc5_Fx58Fbn1oL(?J5Y(^ zM!dz$k5rq=?`w-$2x&8AMCRdlzN`~fjki5G&GwGnyJI(LgdaxiWr@U$kFYpRWM+I# ztMQ~ggjW`Kz-h8PO#A`jcwtdUjLrEn@dFZ$%HlZ5H0SQJY8Zc)t+a_r7zSCA2&y)c zY^r|3sd#y$RXnuw!rGg3wQw`rcZz(DSRH`KDSUYl$r#GVSO<_&swAX|Q!1Q|=!7#) z@}9LrL;~+$3fa7{HiZgaSlr@>2)YvZxp$6e{el-ICcac%At|V=29QFkK10(~d7iZl zbf@vbcEod-d`+}i&BZ~}dIqwo`mk{tw<21s7LjdSv0VK^u29uMx~LjXT!!OSXhF(! zK3EqDdBMGrb|s3SZF(;)uDJo2-JN6?aL+!oM1C+<5c>$M?MY%$S&7L8s>YHUstma# zz6-m-C5dmOFBv-mYf4EDDk~|eMrBb#+Ne5B%w)Vze4WUsY9?tGJhNI0HOcZg@ndqE zL);jM@$E>dM+|8W=Q`>?Lp}%=JxKUStWroaQCUwWWvDE6k!Dole+gs7`z-W9Hj|HT zAoE5cxr7RW}JU1~b}-Sb{zaNK2JhwOU087Fy(yI;xJ506T8F8;s?rJ6Di9 zi2E3VAH{7XcP#gD0WDRLf8?+88Y#Eo3Vzt&Dv1PUwtPS>>gkQ|L28`10UbV@pH=1Z z*)M{u+46Z{*^`vmV$V#;L#hsOOHxE^?Qm;7C+`%0wYy>B9A2!1Toh}FhCP<8CElpS zcgajtmh(t~g4I*sPQob>iRjOVOA_SUtUOaP3j!vJVBJJ{uWV!ZqvNG$-elWJ;v9IB zojr)tUj1TjYtMS{3HpWB6UTR?pQw+YER;k|%Xnkk3^LDUOEW#NDOXMY#s#_Pj~ zh5G+F`?99oqfH-{E~I_VTS#Ls3F3z!oHA%pT*iN6wP%5Di9Q_2pb52t?Ta967txC2 z1+h*Lrv%Y12+Pd>hWiXBj0rcUshR)nbnhS#&(eoonY78OOxnO3PFQwdp$aC8xycm7 z^y*=$V&{VM-P-|*v*nLEpI$_F3O_B}2SCJPu4;?>FvwoawcFy3-)Jf+Z{?q!aCI@) zZj1Y1j8OiQ#I-Z}o3gleTik<)RszO^6JM%EkQAymkV2~Rpec)QdsJt}5WtqIDmledLuqQL}_?lidWCvB3$aSjP z!TvYi-vP0_kh;JI6rNCnMT5x2t(cHVzEicCIBrA6{eeN4h%DU3_uOkcR4^k|@=dDA2Qf@$;cca4y)~w@Wyx;_iKzPRssVa!q%ZsF1 z#BL9|lSvF!+sS&W_K?$5o#o%xNsl7_)_T{%unm0ldB{R>8Ol*yC&!8~@g`}d>JBm8 zi|i2@fyze-N;b+Pe0l(zDH`e zuDnjjcQSMz9~g36-bE3d%9Rg8m?1ep`2(omBqIOr<5R;d!F!XuVwfY$M4<`=CFN?I>&r`vAMpMFLQTj3INVY9>Wg zZH700@DcuCLU<7b5hwy7n-?MZq~Ia8oJQ(7#qD5W6L1I9`b63#+{>EjBl*i(OGpPP zd@g^CKjOzQv;{J@$U{SQp%jHaH1Q(j2k7SU?RgNVCO$n(mBdjMK!B=XZq|rMQxoQC zgVt8Q(rEDIMMw*zpm+d$C#%@+EImeBlad-w|tvv42f*U3%Ul|w()^I;R-K8 zm7xnsBDidqAN<3}@F)DiKjZ_+euBxSaDF>qZ7M$zyPoj5A#cGxUyegRKrAo9ykG+_ zLcT%`il?OMDYku{=sv?ZF$qK!YC+N|Gll9M@~n^>(8h}}XD}<^NfXF;5!RoiJjbjC z`MC2viia2I$_3+{d}oXyoEKqnkcq+)%24!yX7qfLzY+27X5#V!l?M0TBqEtF_-hLr zL^dN2>jjO4ytNIqckx0K{CE+j3~9Uw*+MqF#1!tUHBNC;CX~S`qpD7_$8%Gr=PQ27 zggztIuXt-n0wnL|^PWOJFGAwr8WJ;L_Q;FEoQdo;w|0l^;TKvj`6ow@=$3H$2TpCb zxJLfZd$jJ-;+SEb^WwGi`yLpa`T2}|W3XgzWkDSuIjjmg_lV4OOALo6ZZ?8w!mI2t?K>m$*9-L_i}dahd9OyE&Q6Kl9GH_kFMKt>3MC zZ`I5F`1P|{ojxBSK@7evRpTJFjElIHsU^IluEO))GHQCuIHz|GcJq;NoR1m5^O5n* zKH1pV$AEzv3Fl~xSgVP|fxfx;ov#-@_f?~=uNS`8*MNKbnoy&aaI)45^Ry{AsGrsL zqTf`&IRnhtI>3aB2I}$lz!XdxWVUGr&jZ{wM8-SZCJvQx^H3w+9~z0X{R~*^myHR- z_StlQ=*!;2*?YJZ%XBin(B;_n>em1+GFVaPABmg%4S3$)h=BndTYw(_9-zk7fGWH* zq8aaxG~(ny84m@Taoi}At!xx888}+TG;X!rx&?b-NN_Bc1@i$g43lkL@U5mpNide8lfg*)lOcu1 zm_ep2Ge~sW%(n348V*-F~c00^M`6tbrhp=GUgnl|y{@30Dj!?+n;ZH#5LQiJ9#6(0%IB zE3KhV#CTi*`DMX0!Ym%|@&WHG-qD@@0OZg*P1jwUCpcr6(dgPwYt7|n`dVwe5HOdz z?2m(eQ-A1MS0}>hv4`5$f|df-ffsFA2a?BAcfZJjmk>siCC5o zGUi@3;Kj>L`1FbzBYu+5@>7*9?y4_f=`|yIUXMk~bu;?kkZ~oq<2NLHaKnnHZW__= zmW<18$+q%auL1seTaBIXNEm#l86*CkgQ}k;jQ+U_``wi==B{kZzZ(QtUvI?d1|#lo zFk!!Ydfa}`fH&?%;-4GUXlXQ|>b`{j_q{Ooz8SSmv6$bKgAvUpEN?brbc>8zT9Q%w zK#egEOn8c0#6uY^4|CA}7c(CJMaF)QjF|bzgnq5fHvh-G;Nd4`{L524o_iXF{%tJW zrp7I8UbgBs9vu42h(*uTSpUp~anEJk|9lo|U$mg#OJ4D1UEY3>@-9LhodUl5?kdo# zd~#_=DGab*D20qmGO-hIy%YDU5*`^>GLl+ zb!Q&sd@4K&W|GT!a&kGVTqtLcZ55!Ws}-Ook7F#ly0*O$TH_)$gi|hOOl=D%SD< za+OfcI-b{MJ=CEl!b)x%K(f_FOy%e-V8ZwRDA~tv1pbpwo?xV!k3hn$6HFAp3HV1g zv5D$8gBstAG!kZm>^|2vEhaNw)G0KUU_#`4+L6OD8lzU_Ybe!T^C+IU9lFCXiafwu z%sBu#6!aMfvF0<#u@5=O3z7K{|EGdVpqL()Ky_Iu6sp?OO>R#&t0U8@f0t=?v)!Ta zzp2K4<$N=B<vFaC(58G6unX|QICq;;#ovr&WG z0voLKr5Jp$#PoNM1i%8oIylF##vZuvV zB+QG^bFw10oU{*w+;VE_DrkknM;T3`9U~OIBswb~nO?fUFj5&ZW6>04atf6`6mBV$ z?k;F0mA2EcKxO_add~&f0#;MCfK)V0Q>0QU{E-kyBX>_1g*z#oDn=<%>C`A-4fzHs zmJFIEAQP)&6sasa*D3_EsGz%`wREnXCXH4c*HNkqN(8K@>rTLFe^R7Aq}V4yU<2uU zx+vC37P=IyNLi@s7zH*`sDO`XsT1(}3`J@awLBF9o2jywi&}c|RZSnOTvaZ`k5yE1 zX{UfK^bY|@5TXnr1qk?peN^L9-S1^w$iTxh=z|-6o_UC z*haZ7s1dN8&V0(@xQ8m?*QjcevuQhu#*jm(pEODxeUH^1bPKxFS(Ry&@EcPZeuygks%I xDZ*Mz2LxE@ihz9-KAs~OI$oLR{7MFuH@Eb z_7epWkRpzb!zE^@(gI#u6beX{0ZO|N96?2NpS{*|-u-@i zpMAdfoUUf(zLPU57qX4jf7WA6T_~Bs5E?QV%vs>Z7W(hrT+;TQLwfbEw-^jX?IgK& zpIRJIT#`d$uA<-a!KQ=H)vM27-mHZvw#H9?hW)%CsWWDZEjn$caMy*VzDqMOSKfHb zH~y&J8+i9Q;d6myUP{!b!d)5ryCUd2_?R=FVzpl*6unBX8 z0Bkv2>h#&ojx|rI?L-^|J{$>kCi`6BeK*Y$;#v(EoT=)UlPZ$)n=xy-3RP3gFT{KJ zy2UNxm<0VC4LZylYYj}9MGPw-Ye6I0e@3n6>oSO$tP?`5Xq3Ih_<&}X6=rn2w#>?( zN!7LwYzV%{`Gm|q0R3DE|FR%PDsVwv7%F$_Hgwtb^&@eO-wtA%1_E9#bxq?fIlbUa z4RL6LT3#NSJD#=sQ0yGStRU1nm;Xaz=jitznPA3HeWr753gQpBZ|Ea$6x|Ko);x4t zmU3dO(2E%K!5XcmMsru z_+8X&teQ=9e*und9=dT;)%)g^2s3p6l-YVxU9Z2L7!G-yh@om6x@|S6=fU~aLxrQ5 z$*)4jA})1@2SFk4RsR7)*@U)Wkuei(GO~)wt|E=6?1ECe2L8YUAKqwS0$`z6K=~uHdgX{1&qoDHz%JqS02B0o!q=0futuvtNVsFPa}(amS2! z9sz-a2qg!IZx%j_B6E!(%7JHR@=Z(e2jRbk1cM=~*VTRzZq~c4srxwAs(6s(kn8_y z;O4`eKaP=Cq$Nlvo;b+Y>x(Upz+%PuxBTdm$^4G|abmI-SdI;bx|<9JyIPy>^eL0l z&!L01R1{`nnOqJ}1PaPvMzm(-`1NBL(kuvF+&~$Q4pz~eAJ<~2o})E#o{E8M_q>+t z|Em{6RS^UW71Z4BfwmJF@qfZlSp}s+E;TQw`0)t~-*Xr$?n14Q%QtzVuJ7!4xs@nA zbn7!UoHV_E|6~slTSB`qm(LC_I3hOI{(zxuKqqDw-dVJNtC*yOauA|jB$WB#mD;t} z*i*6l>qT#ZG8Zmo@wH^U<3j#23{_cB@1o!@Nb?wFZI*E`R5Eq8R;k$uPY(zC68<6B zx=JXUXYHn&3=fjiRy&u(xav`Y*Cb(MR zTTY@trUF|}5sJ7p68UpfC0SxINIkjKs%K+IcQ$?gf|N0U7|**X)h1_ONmdSKDh&jS zB-EPE6PyEYT-Qa0A7qKRRCx0tr!J2UIZ-ZwQc*fG^mVIiv->w@@)yAIYT!qG?7cm> z{vjzthw2U@>T$!mypb>Rh(Wuy+bfPq$$F2z^vYYg98*~~1i$~1QajX~YdM~97(-a)4Cb5gC61c7J%QMG#UvitPIx@2m>TUhyq9Jg z;ego@;Vc6(k%^$+F@<8pof2NW615JiRo{WssS$m=XPvZ9Opc_v9!vzi(`ZpJat=eW z%zit2@M(aoNeb?Mo#n&NFg6O%TOx^myy z;(Vv_#uWGAr{ssL<$$i-bXwo;zgl1CxkOQZ?61QyB#@fZeorLOXu}-M_%R#uQ`g)H zuibdliiva-l5jI<*$(o{(UJ;f9_iDG4jPTDD%X6?jKfd8c>-EI)29_DTq@$DWcwoP zjmODBT0yOden-Z5QjwjLfvuT$_(Uj&P_NwS2M>*oMXnsZYt1HG%7)VSX*4_4YA@?q zBVhx;^6~uN0t(W68c|^m!;~>(M;7X$_3@2lz9Y2qkk^$BlXLgpBf_aD^$*lDPu1{p OO|?hFmP{B5i~kP}sA-)5 delta 419 zcmXw!Jxo(k0EOShpdk^A1HN0Ktqm<{`6;(i+9s%o(e_~iAtG*IJ4nPyms(6*F)p;t z7dNO%to5l?%ZuHVc3`MMSEz}`$-#+<$RP3<{E}}u!#O#RmJT&G#CxwiF8i7^n`8Gh zO&!%V@rFUEC`psNqsa8h9EUrUHQo^w3vR_% z_e&N}Rhji9tRJ3;pufwY(3NG(n`6hD;e*e?FP~0(ciQ^cZMU}iLtOVu7Hlj2EHi-t z3IUVZ9^HD}(;}$!u2JZ-gZ@pXf}>P|ioKvDHju%os&enz>E804hZhfSXxf#3|KaXZ z8nImC+wvy$e1efDRUA)8X*;vciNPD}K9dAiB+cP0>tO?5L^2ggF!x;19+lSR=pR8# zF~rqkg3m>Jame7sP@Lwo^V~P%G|VmPujZLKpXT>#MR-`}=5T}Cr8xDHWY_lZg(Rtw uHOqW=OAsh0iCxN&Ts5ez)~vSJgdi2KH~B+l&(9+~*l1;Oa>d#<=A8TO6tA@a diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index ef9fb1a131aa206994f2969504fffa5c96a05a95..82a58304baf3fa6baa3eadef40b69cf42c05a0cd 100644 GIT binary patch literal 8 PcmZQzU~G?iCUp-02i*d} literal 8 PcmZQzU~CWYG&%tQ1^5CS diff --git a/src/Notes-master3/.idea/Notes-master3.iml b/src/Notes-master3/.idea/Notes-master3.iml deleted file mode 100644 index d6ebd48..0000000 --- a/src/Notes-master3/.idea/Notes-master3.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/.idea/misc.xml b/src/Notes-master3/.idea/misc.xml index a9f22fe..5da8073 100644 --- a/src/Notes-master3/.idea/misc.xml +++ b/src/Notes-master3/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/src/Notes-master3/.idea/modules.xml b/src/Notes-master3/.idea/modules.xml deleted file mode 100644 index 5db786f..0000000 --- a/src/Notes-master3/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk index ab52cd48b629170b7000461909ba81acc4c133a3..b4d361fd1dbaf2314e80dfdaf9e8774762d4e5ce 100644 GIT binary patch delta 1712 zcmd^A>pRm60N!lOZGMtUXbs7%EDJFyCOIPKm|KRq%TckyikK<09hY3X_=z@z2(=R7 z(6H*bv@|4(Tr>9~ih9aAp68qo=YKfw^Soc)kMHwdhDFwIMb=47C{uS@!1Y+Tx;| z=J_ctcvjtAZ1oB}Fv8^!20H+rcGM3lw0@Z0;N?j~`*sK+64>S%#}xmap#+ zsE!qL-Hy;lDX<%Mjrsy%sZnbsyzzO9)Z!Kq|EgB3x{SFZZ@Rnyof&+{HCY5=*Ga^n3EJ{+Mt@l>_lF$^)f$1|?fcE~`%O&ocyA40 zzpOkrCy; zeH}P>H2|LNSjn%X%cT5qaUa3z#4b9a%D!6xAE{oU=TurOC<+-LF1{W%mC^2{r?kzkkhGvfp3<`l7BjpsZEC<#a5(-t4g}^RDp%A--uiR{t!TYW-Z3jmdSo1J! zClyb$6CO6;*T$~`VeT)EvgVT0^RQ%z(#Hh1NECTWCF$otfR~@~ecGFjfQ02QK{S5l zJ;w7>L#-|XQm>)lQb9+?4~oS5S(E$Fz>YYFQ;gx5(`G7(V}XP?*2Uad-uPnwrC#me zZ`{;spP`*2x7|eacn^Uq&^?LK94MNsDXLXd>3?nHdvZ4^7lkev@y@zA=dqAi@#`1>iiy1@!OK7M}IA6w!1d92mTyo8&lIG#p6=4JWT)Dl z>W_5l@~NLAv%(fR0sN3B3xXpJrmF4iU8`HB1%tTWVRTSTrelWqCaC!Y(Eq=eM@F-! z-kJ{(G5`6A)G5Fl*4%>xM|zMNpmYkr!Y%ud5RkWm+zN(_0jl88YosbzISnX6JHUu( q;1}3nKN9@WkJJLwHbn5kG&-&)dr-M-lerU$Tv8E?RTzX3FcL<=60jsJ z1*2hUSO%7bo+u$Rw*2hh?a+h_E!pw{VTh4`d$tBj&AHoIlkUgK>VN*f015pf9J-}4Jv8u5Alrp zdugZx4Jh_`FAK{1R47Qk;r7EjsJfPM{9B12jO~})-0$blKeZtHcAp@;^CRzp4)4Md zJf6RLw&Z;D&zakr?ClubF4lIt-c?-*o#gd1y^qo7_-X2%BQ?c&W92vDepTTzA31ok zm>6n}7%Oov$$GA2sr-~v-nk7fw3A>I;0q={2@J1#CBLbfAZ@@IFh0K}FwU8#Gu(U`UuQ6gRpcjwR zlhP-IEgD1zGt?=51a|HnLDI;JJh>mY$fIh}SOJ`t(^D?S1L*LO%Lt`j(u0}si+}CE zA5@!Jp3VE+C;Pdjr5e|~%q4${-n6*Tcbu!Sx3H)eK=tr0VR~x@^ium9qXU=6cbb&3 z%8{Gf^YT?4Pcw@1{T~>RQijDL2-n;_zFG0MUo*kdVxYqK~(<09dr6XGWav!2vDgc6A{QK{B8ZR>aGrJVRznxydZTM8Ku=cb%YI(c8t z{$cN0N+?UHPq7^BF9~H)Jo_%tl1EEi0|Ink54XofSv9>N)O~l76Wla))_vPps`jC_ zMq2*VvAYc=z5001O_6i?My%S4Iw{>4wPyw#QckpF>)2{MzBy8Fg36*&(<#&?H8~}! z5>w2DunhmRQ?sWc=WtlC7XJdTaRwFLsBn?ssT#xX)ZCdPUJ{gFx$WGt6j`L0*%EXk z>kINLdlup*}p+1zcvB1KR=HZ43U!B89_jXuKi92>i^%g|sfXg>S$k&5wG9W{;|Lu>a; zQMH??{1VdnzgGpZ(p7E2gY0zwa~BB{kT2N4{5SzQfHq8>Nyr}TV*WA-9Rf#~>>o16 p{5A<$=zKmV4^TqLG}_jdoePZeaFLMwF?f_MCTIXaV;i*P{sF5SC=UPt diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 56b20fc93f5e4940441f32e9647c0094dc4a50dc..8ed161853fa9d433d52941d7fadf6d2a81f811e3 100644 GIT binary patch delta 37 scmeBWp2|GofOMC$RZM7cYEf~Fp|O#rag0l9adt_5L5zE5$;8XM0Q$WSI{*Lx delta 29 kcmbQr+{--SfN+zmRZMY7X-Z{GQC50#OnH7$_Qcz}0I1*$X#fBK diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 7e63071..c5dfba3 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Apr 05 15:19:48 CST 2023 +#Fri Apr 07 16:47:23 CST 2023 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 36b31d1..653cc20 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 13c8488..47bb771 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 6e03a2d..c3c2d0d 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 25511cd..45e4554 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Mar 31 17:04:20 CST 2023 -base.0=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Apr 07 16:47:35 CST 2023 +base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index ebe91fc5c8e4ccdd927b6f228fbfef6cd1f769b4..582922f3b0efeff215584f652d01e723e9f664e1 100644 GIT binary patch delta 50 zcmexu``dOyxGZPBrHeu)BLl;Y$qBMij7KK#mUUrtnk47Ucww@OoIB&A$vr^w^W-aX F>Hy5X5)=Rc delta 50 zcmexu``dOyxGd+V9RauV7#SGuPfn1HVmvu{x2y}J`y@GM#;cQE 21 22 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +22-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 23 android:minSdkVersion="14" -23-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 +23-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="33" /> -24-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +24-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 25 26 -26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 -26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 +26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +26-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 27 -27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 -27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 +27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +27-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 28 -28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 -28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 +28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +28-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 29 -29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 -29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 +29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +29-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 30 -30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 -30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 +30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +30-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 31 -31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 -31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 +31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +31-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 32 -32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 -32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 +32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +32-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 33 -33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 -33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 +33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +33-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 34 -34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 -34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 +34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +34-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 35 36 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +36-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 +38-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 39 android:label="@string/app_name" -39-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 +39-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 40 android:testOnly="true" > 41 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +41-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 +42-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 +43-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 44 android:exported="true" -44-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 +44-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 45 android:launchMode="singleTop" -45-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 +45-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 46 android:theme="@style/NoteTheme" -46-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 +46-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 +47-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 +48-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 49 -49-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +49-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 50 -50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 -50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 +50-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +50-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 51 52 -52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 -52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 +52-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +52-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 53 54 55 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +55-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 +56-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 +57-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 58 android:exported="true" -58-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 +58-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 59 android:launchMode="singleTop" -59-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 +59-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 60 android:theme="@style/NoteTheme" > -60-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 +60-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 61 -61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 -61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 +61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +61-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 62 -62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 -62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 +62-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +62-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 63 64 -64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +64-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +64-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 65 66 -66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +66-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 67 -67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +67-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +67-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 68 69 -69-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +69-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 70 -70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 -70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 +70-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +70-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 71 72 -72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +72-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +72-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 73 74 -74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +74-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 75 -75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +75-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +75-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 76 77 -77-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +77-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 78 -78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 -78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 +78-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +78-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 79 80 -80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +80-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +80-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 81 82 83 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +83-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 84 android:name="android.app.searchable" -84-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 +84-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 85 android:resource="@xml/searchable" /> -85-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 +85-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 86 87 88 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +88-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 89 android:name="net.micode.notes.data.NotesProvider" -89-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 +89-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 90 android:authorities="micode_notes" -90-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 +90-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 91 android:exported="false" -91-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 +91-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 92 android:multiprocess="true" /> -92-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 +92-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 93 94 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +94-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -95-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 +95-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 96 android:exported="true" -96-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 +96-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 97 android:label="@string/app_widget2x2" > -97-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 +97-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 98 -98-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +98-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 99 -99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +99-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 100 -100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +100-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 101 -101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +101-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +101-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 102 103 104 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +104-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 105 android:name="android.appwidget.provider" -105-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +105-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 106 android:resource="@xml/widget_2x_info" /> -106-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +106-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 107 108 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +108-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -109-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 +109-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 110 android:exported="true" -110-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 +110-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 111 android:label="@string/app_widget4x4" > -111-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 +111-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 112 -112-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +112-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 113 -113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +113-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 114 -114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +114-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 115 -115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +115-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +115-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 116 117 118 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +118-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 119 android:name="android.appwidget.provider" -119-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +119-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 120 android:resource="@xml/widget_4x_info" /> -120-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +120-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 121 122 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +122-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 123 android:name="net.micode.notes.ui.AlarmInitReceiver" -123-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +123-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 124 android:exported="true" > -124-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 +124-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 125 -125-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +125-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 126 -126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 -126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 +126-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +126-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 127 128 129 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +129-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 130 android:name="net.micode.notes.ui.AlarmReceiver" -130-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 +130-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 131 android:process=":remote" > -131-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 +131-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 132 133 134 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +134-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 135 android:name="net.micode.notes.ui.AlarmAlertActivity" -135-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 +135-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 136 android:label="@string/app_name" -136-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 +136-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 137 android:launchMode="singleInstance" -137-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 +137-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -138-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 +138-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 139 140 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +140-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 141 android:name="net.micode.notes.ui.NotesPreferenceActivity" -141-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 +141-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 142 android:label="@string/preferences_title" -142-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 +142-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 143 android:launchMode="singleTop" -143-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 +143-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 144 android:theme="@android:style/Theme.Holo.Light" > -144-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 +144-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 145 146 147 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +147-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 148 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -148-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 +148-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 149 android:exported="false" > -149-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 +149-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 150 151 152 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +152-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 153 android:name="android.app.default_searchable" -153-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 +153-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 154 android:value=".ui.NoteEditActivity" /> -154-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 +154-->C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 155 156 157 diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index e25eb7b70bb70d2d4e387ca30371c7e7fa625935..17cb018899e5d33d7a51e9174f9d276f2eb58d61 100644 GIT binary patch delta 56 zcmcb?a)CwG(J>%|k%55$hAo(Y93Th;;u{lXOBlH(PAO;Pn#{-eA4m!?xiWGA00^21 A&j0`b delta 64 zcmcb>a)U+I(J>%|k%55$h8>uI93Th;;`|PCRZTM002(J B3N-)# diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index d169236..be3949e 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -8,10 +8,10 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endLines": "21", "endColumns": "19", - "endOffsets": "838" + "endOffsets": "817" }, "to": { "startLines": "2", @@ -27,10 +27,10 @@ "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", @@ -51,9 +51,9 @@ "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", + "startOffsets": "764,816,869,922,712", "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" + "endOffsets": "811,864,917,969,759" }, "to": { "startLines": "13,14,15,16,17", @@ -68,10 +68,10 @@ "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "758,1073", + "startOffsets": "739,1047", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1065,1191" + "endOffsets": "1041,1162" }, "to": { "startLines": "2,8", @@ -87,10 +87,10 @@ "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", @@ -106,10 +106,10 @@ "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -125,9 +125,9 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endColumns": "56", - "endOffsets": "782" + "endOffsets": "764" }, "to": { "startLines": "12", @@ -147,10 +147,10 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endLines": "21", "endColumns": "19", - "endOffsets": "838" + "endOffsets": "817" }, "to": { "startLines": "2", @@ -166,10 +166,10 @@ "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index ee1fb7d..97aabf6 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -8,10 +8,10 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endLines": "21", "endColumns": "19", - "endOffsets": "838" + "endOffsets": "817" }, "to": { "startLines": "2", @@ -27,10 +27,10 @@ "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 1630d03..fe6ada6 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -8,10 +8,10 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endLines": "21", "endColumns": "19", - "endOffsets": "838" + "endOffsets": "817" }, "to": { "startLines": "2", @@ -27,10 +27,10 @@ "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 5b285d0..ba55bf8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -8,9 +8,9 @@ "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", + "startOffsets": "764,816,869,922,712", "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" + "endOffsets": "811,864,917,969,759" }, "to": { "startLines": "13,14,15,16,17", @@ -25,10 +25,10 @@ "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "758,1073", + "startOffsets": "739,1047", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1065,1191" + "endOffsets": "1041,1162" }, "to": { "startLines": "2,8", @@ -44,10 +44,10 @@ "from": { "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", @@ -63,10 +63,10 @@ "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -82,9 +82,9 @@ "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "730", + "startOffsets": "712", "endColumns": "56", - "endOffsets": "782" + "endOffsets": "764" }, "to": { "startLines": "12", diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 80170f5ed86fea8c1d6cf35e103f51221175e71b..5253e980352f89f945a10929d1f48507bacf2f3e 100644 GIT binary patch delta 544 zcmV+*0^j}X;W_8wIe>%#gaU*Egam{Iga(8Mgb0KQgbIWUgbcI|FwY5ZIYc070RRBl zmpRW3B7aR$yG{a85bgO2z5se_8wxAq2N)qh6d@6VB?Ngd3nFhq76=3s7q-|a?DJ#1 zGk3S*7aSl2Z+GV8p2rM+O&nWfrp=p+tH4cwSvHrgossc)yoZOKk+ag6E;{C#>ECQ4 z^MQ)u41aVek9LOO*j?-rCE{3chZC%{p`fLr!GCZlN$gqE$(qjUgP9|+mu^}DUE|9N zGz4Z3LGGS>2Pa>*H)UGhQL@-lv0VVU1JgMuwcm8+q$gl+O^{d$2GcEE4HSp)LGO%AFpT#Ugus}t+y8w8KFsVc1V1YvDZJt!*I zmw!+l?+0}OO%CBn?4 zEx@V-xy8T!IGjN-&$Q+7>+wR&e0M(usLyvsKaxx)F8uyfD&>nspQFCJc+4Mt42E8O ziAcip2T)4`1ONa400;m8Kp_AcJ%)lw0k_@I4L1c50RVDkb8mHWV`XzLVRCb00JkL8 z4I`NeZ#hIDX#oHL*q2am4q5@km#c3ML;*sV@NW)71klqB0GH764H}olZw?Tb_0$az i3jhEB000000002umwa#zM*;Jf#BdHF2JBG|0000Dvf$AG delta 557 zcmV+|0@D5G;W_K!Ie>%#gaU*Egam{Iga(8Mgb0KQgbIWUgbcI|FwYP2xKP_}0RRBs z0RR9S005U@Zw?%PRZ+`M!cY+1lkg9G0qkA7Vd2X70Y(TAMM%Wp5`w%-LF7$Hfj~fO zp$nqW2mKiD%xzcvf&+vQ@9xaWJ&zgu8rzo0Op7<>SNzfutSuHBf%MrvD|`xyq1gvLcs*FXH`36+KUfn z4#AS0lmxoQV()cI^C5ilC(xM1t$&4OU-?*rrR5cDK&pYD0@)sZ_~n;lc^cXTLDbKa0}rP~V? z%qI3%B+9oUOikJYEQ*kw|Jwi#rclT+O+J1;-iev-&Zhvi+0N*N6N&hR&zDRlz0t^X z#CsQu`XY~k;EOjNj=NodP)h>@000002mk;;Apjb;)6fk(1rPuLa%FRGb#h~6b1q?W zb7Qw4)(s<>3G%p5+in2>0N1LxEYm;cla8<&-E4k`iom%wliAqMbK4gdfEh0gWI diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt index 8a80d46..00c3013 100644 --- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,255 +1,255 @@ -- Merging decision tree log --- manifest -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 package - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml android:versionName - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml uses-sdk -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 android:targetSdkVersion - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml tools:ignore - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 android:minSdkVersion - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 uses-permission#android.permission.INTERNET -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 application -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 android:label - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 android:icon - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 android:launchMode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 android:windowSoftInputMode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 android:uiOptions - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 android:configChanges - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 action#android.intent.action.MAIN -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 category#android.intent.category.LAUNCHER -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 android:launchMode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 android:configChanges - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 android:theme - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 android:scheme - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 tools:ignore - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 action#android.intent.action.VIEW -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 category#android.intent.category.DEFAULT -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 data -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 android:mimeType - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 action#android.intent.action.SEARCH -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 meta-data#android.app.searchable -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 android:resource - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 android:authorities - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 android:multiprocess - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 android:label - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 meta-data#android.appwidget.provider -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 android:resource - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 android:label - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 action#android.intent.action.BOOT_COMPLETED -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 android:process - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 android:label - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 android:launchMode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 tools:ignore - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 android:theme - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 android:label - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 android:launchMode - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 android:theme - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 android:exported - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 meta-data#android.app.default_searchable -ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 android:value - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 android:name - ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 + ADDED from C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index de3f596c56e613b9749dfe748b2ec5efd1f870ed..cd4959d4ed9cdbbd5d0b177c30b3e1ed797ee8cb 100644 GIT binary patch delta 1493 zcmV;`1uFWmXRv3mxFZPRCM2m3$b(6fz#}jSt8TV@X81f>llUVqf5>;*yeOyaW?rN4q<-}1%oTvhTa4Q)f`EzBS;M|)9I}of20DJ-9$(K%l&T>&E|=~3 zTqghk00cmje5OE?sb?(@q~q>e9xf^X000uf2sFgFMMk_Brr3>?mgk7<0-3o0Df+EQ zu|rEmv!}55*U<_^BealjlN6mIf1O>_C^w?JnHCS}=~1RlS^^Ah`syuxij#|^(uf9@q(0pLc*ciC3JD}d7SwWu9IeFR|#Ygrw|7G=$ zTn2XC<;0UrB`SZZzR_q-Fh#1;0RR912X+n=gpR9G3!vT-EDUGnAH2X(uB+nd6$jm; zf;RvF00kbV&x{v;`dvYzpV(@Wj-C7491V2<0003uRtW{f0RR91F5V_g4iqu~r^}Z> z;Ax>+JOkktc<27ANd2>>c#|EWH6*D7jJy2kh0000BytqtTSkf%A1qJG8l4c}E2Q zld&coBJ2VBp~X32S|u)=lwCe=ExiH&0009}P*m8G9=sj27*9%*?jjP>d+) zXKJBRs&?4tj%pwI_N;pE#wsrmtVCh1*ay+0NjcDg)SXn&TBho4Xw5LZe@44jOno!u zyaCtJ5Z$!v*Y5Sd&Ktg3{og8k)`S8v_mB&d&nPf|V)HZV_+IDOai(LlTc2BS6vGGe zUBGz_^nbd4TH+-3T!GQ)(X9YWbYCp#9At;qQ?QL#We&BPIgo6ZJeH|Od9zfN;UP+~srldmZt ze+{+M9-7s190k$4>lUPZpFiB&X949X`jSZie3jir{(Mutj(l(FsNw|x000A?5Ixz3 z{-z3Q+b0g{1poj5LUeQJL05MGTNXmwSK0(V9|en%T2I1fT#a?l-4(~ANEc?k&U4AN z?Nb7p45}?4;qT-f#V|Z1Vk3(tmE|o*5miEfoB`{~!bl^Hbv$duT`C{EjB7if%(SS z29M`a8Mj{{xRjN1%&3H7R9=(%Dm4(dH@R-`v-F>7<&#MXb|WPv_FKXR|uMmknyvm86Ap$um|atQw2Ltqam!P7VBR%k8_ z{SY9g^_i}0wKV@KtiJ@|Us^T?zwLIPAFNZ)tc2*@-eZB1h7ZhV$6&1yd& z$ufd=4n)A-j0o&#RQcJVKKmYQtCgJTu3CP5_^xsfsksIK000ZHbg}Ub+!dL=^6Ti9 v{X8lxB##S0YS|h#)vbJ>&l>!)SP!jE@K!CV=fnVj0RR91D9Hx1aV$RvQS8Ly delta 1493 zcmV;`1uFWmXRv3mxFZM;$b(7YCM2noz#}jSX81f>t8TV@llUVqe~RpJysK`ud|spQ zq>|vOTqvjPX2^HmyngiP%oTvhTa4Q)g2TRO96Em89&E|=~3 zTqghk00cmje5USO9xg2pq~k!7sb?wx000uWMMk{A2sFePrr3>?mgk57Df+GK0-3o* zv!}2~u|rGv*U<_^Bealjf1O>_lN6mIC^w?JnHCS}=~1Rlij#|<`syuxS^^AhlgT77 z2(nz$3QIe1)RO@vA1qRH(0rX@uf8885r=l&<;0%PIeFfpSwY$w#YecVJD~NCTn6?w z|7Bp!*cg*cB`SYTFh#1VzR_sX0RR912X+n=gpR9G3!vT-EWE%`uB+nd6%1$Q9|zr| zf;RvF00kbV&y4%q91TIEpV(@Wj-3~O`dxJZ0003uRtW{f0RR91F5V_g4iqu~rvu>@ zcxjy2kBP5wlhJmNO=OA2=T z&Kc550000BytkZOX!c}E2QJG8l4f%A1q zld&coBE>mjTI>P(p(QSylwCe=ExiH&0009}P*m8o7*9%)9=sis?jwIMDoeP>d+) zXKJD6j%puLs&?4<_N;pE#wsta*ay)NtVCg>NjcDg)SXmqXw5LtTBho}e@46IyaCr% zOno!b5Z$y|{og9T&Kth#*Y5Q(_mB&F)`S9+&nPf|_+IDOV)HZVai(LlTc2BSUBGz_ z6vGGe^nbd4TH+-3T!GQ)(X9YWQ?QL#We&BPIgo6ZJeH|Od9EpWIrP+~srzfN;UldmZt zf11^D91XS89tF|6>lUPZpL}oWr~&0D`jSZie0)>Aj+Na-{y*H?XW|6_000A?5Ixyy z+b0f&{-z4*1poj5LUeQJL05MGTNXmwSK0(V9|en%S{28nNOQ@x?W!#x;Zp*d3>Rj- z&W&}?-A}@2TqBDnl`uRcV(;V~#pNwW5miEfoB?+bij^acbv*0J!bp=}Dja|Jd6=aP zUt~y>4O6+$?}r%F9yS61S##rbyeDRn*+xgm1uJi-PqwU}4gkyX=OC?XnGWE-rW?lG zA2MVea;~XE5LH~f=kNOiEaoEiOeCZ4w$SHj^Ackf`l!5)uT`C{EjB8|$j_=tf%(RB z%&3GRxRjMq8Mj~A29M`rR9=(%Dm4%qt`rR_u^pFo-+q<1H@R<-`v-KXR|u#MXb|WPv_FF>7<&Mmknyvm86Ap$um|LtqamatQw2!P7VBR%k8_ ztiJ@|^_i}0wKV@K{SY9gUs^T?zwLIPzr@K!B0)vbI%YS|iq0RR91D9Hx1aV$Rv9l*rn