From f2921400c2ae4ef7848bdb7e23f0101bd690508b Mon Sep 17 00:00:00 2001 From: liuyitao <2371837061@qq.com> Date: Tue, 9 Jan 2024 14:47:15 +0800 Subject: [PATCH] 1 --- .../8.0/executionHistory/executionHistory.bin | Bin 527919 -> 527919 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.0/fileHashes/fileHashes.bin | Bin 157233 -> 158083 bytes .../.gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.0/fileHashes/resourceHashesCache.bin | Bin 22135 -> 22271 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 53645 -> 54383 bytes src/Notes-master/.gradle/file-system.probe | Bin 8 -> 8 bytes .../023468cfdd0b71d4098903b9070e364658e2fbcf | 9 +- .../c182d0c9c237ea8a46a92ccaae9bb5c751923a88 | 3 + .../compile-file-map.properties | 107 +-- .../debug/mergeDebugResources/merger.xml | 45 +- .../compile-file-map.properties | 107 +-- .../debug/packageDebugResources/merger.xml | 45 +- .../compile-file-map.properties | 10 +- .../mergeDebugAndroidTestResources/merger.xml | 10 +- .../mergeDebugAndroidTestAssets/merger.xml | 10 +- .../merger.xml | 10 +- .../mergeDebugAndroidTestShaders/merger.xml | 10 +- .../manifest-merger-blame-debug-report.txt | 664 ++++++------------ ...-merger-blame-debug-androidTest-report.txt | 59 +- .../merged_manifest/debug/AndroidManifest.xml | 3 +- .../debug/AndroidManifest.xml | 3 +- .../debug/raw-zh-rCN_introduction.flat | Bin 600 -> 592 bytes .../debug/out/multi-v2/debug.json | 273 +------ .../debug/out/multi-v2/values-zh-rCN.json | 45 -- .../debug/out/multi-v2/values-zh-rTW.json | 34 - .../debug/out/multi-v2/values.json | 186 +---- .../debug/AndroidManifest.xml | 3 +- .../debug/out/resources-debug.ap_ | Bin 946375 -> 946359 bytes .../debug/signing-config-versions.json | 2 +- .../source_set_path_map/debug/file-map.txt | 16 - .../debugAndroidTest/file-map.txt | 13 - .../debug/stableIds.txt | 188 ++--- .../logs/manifest-merger-debug-report.txt | 232 ------ .../stash-dir/GTaskClient.class.uniqueId2 | Bin 17115 -> 0 bytes .../stash-dir/GTaskManager.class.uniqueId1 | Bin 18982 -> 0 bytes .../stash-dir/MetaData.class.uniqueId3 | Bin 2462 -> 0 bytes .../NotesDatabaseHelper$TABLE.class.uniqueId0 | Bin 336 -> 0 bytes .../NotesDatabaseHelper.class.uniqueId3 | Bin 8801 -> 0 bytes .../stash-dir/NotesProvider.class.uniqueId2 | Bin 9502 -> 0 bytes .../stash-dir/SqlData.class.uniqueId1 | Bin 6016 -> 0 bytes .../stash-dir/Task.class.uniqueId0 | Bin 7724 -> 0 bytes .../stash-dir/TaskList.class.uniqueId4 | Bin 8180 -> 0 bytes 44 files changed, 336 insertions(+), 1751 deletions(-) delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskClient.class.uniqueId2 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId1 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MetaData.class.uniqueId3 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId0 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/SqlData.class.uniqueId1 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/Task.class.uniqueId0 delete mode 100644 src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId4 diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin index 4818343c86f1213ccba19bed9cafbf074af31db9..3a03776c24a74d0bc0c1b75905e5d6da7fccbace 100644 GIT binary patch delta 5401 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 diff --git a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock index 74bc4158ca93ffbcfbbc5992ba18946020c07f3b..c103938a9c011ca75ac4ea295db6272343da3da0 100644 GIT binary patch literal 17 UcmZS9sA`STSt<8 literal 17 UcmZS9sA`STS8OON;_{N1`6bBU73i4VI5lwA$*;GY>%R@xuvCINx#a9)Z#2O)p50tVZ zaD`7$-XJPL*zD1Xq5-VN(5OhQ$?-uDo5bcQ8hpeD5_@Ov)im06&(ZnK_uc>hesfsUy)BMoQZm?pll|~(J4yHjvl6k=Av8C<7>m{{c&wQk0@@8|dUy>~I;#Z<+?#j($)1#8j8k$D*EQyYJR>ikur>tIq|UVQx|8 z%$x2uiWMvC5_fl>WI-2m<%0v(iU}EWFIn7CGx>e9<|!VG+C(jfHu=uJeJi$C&RAGZ zB3Exe@}E2TCzYwRE$&Z@Ez0q)uV1`kJilD=#KHm@Z{N~AB}wuNdk8kukn3;~c|ap$ zz_$k3L-;f_ia6_jV$reW`ik?Cbt(62kKcFL*YA4d^!%C?%=sQwO#BIt5nQaLz6P*H z;2pl%o1(0Zn$2y#cQfw&=9UWDJl+DHPea~Tq}c`V^`~?hDi=`dhHxj2hem%iiZqEI z0lhO252a3=bSo6&mLwiJ*qsQT(`A)l1RbMV9G=C)f$6ebKMdMf+zgH5INl-rgQ||q zp#}XOx^>rlf3P1-Yf8uiml?8?e*cS_^haORq;L6EO$kL(O$DSJy#@3TQ|NF;Q=#K6 zxl6-EY_oNFJD4mAjg;d)N z>5O`zk&y^JloGe$Tj@NgBG_}|mb4e{eT*(ah70v<0}~}d0Gma0R0L2n%7s)$J8UX>N+W4uo1lZyK0u3U>^SbuppSPI+ij#J z{tUpfpFlgKL(tF22&yPqOQu<%B)kjxj7sq8OzM)0D;dSZQg?Z{gkWsFiDm;KX9=yK z1WqtA!(B#NP)5_N89!%=LhQSlYPC3t(Z{%u(Wl@TLlw=SWu%1+Mgo{##0q`MRvw6v zCs){x+qO{8{e*aIvz6|cbnLQ~#)F|gmOkxB=%PgS6WNPAxW~yRdOOg>(XK18bCxXA zBXT}bgFvZk9+zfOXB`aH(Z+J31y6`;DSUX`yL*^)TJ8x?4neQ6L#^ibhflC0;=~x#%$_Y2PQ`Q;aLe8 z{sGqH0KBQ@yho76Y>|!kf|NaEI-4Sv)Z-n6Drnh*lBK(cpa_u5T5=CGjQYX2m%I#` zBBE2_$Gzm;N@y3(1o@Goi=kX2E22B0lhI{xDwE5P84e+g6tI!eO5CtpC3cq~6(UwK z#b8@O8`t1jB`R@s1&ZcKBGwMhR>_Ij(eN{)Q!u3(c@HO9`kiKB1?XdPYNl0_K_}6_ z!G=J&n%FjIVDvR~69U&7R3tUI4y`q^ZCnGsS}8w7TobmbqGZNuMu%}KBl4{gB%8(^ zhugJO+XCbFQ921>jN0*vYU*+jmonOcI~WyUR710c;2TW+_Ci`6b*Y0xj6R3!j5=|D z4G&)X(0a1H?fUWD5f_c{Se!bi-A5qiw3c;|D`(d(qZ(;8zbk>u=?zN z3)_m$kp2bgQ8@Y}gqsvBXgC9xt&kEvXh#l;j8D~`<&(EC>nGyYc688&^U#=-7p$dC zIufG8xl!VtE>yHVnmrZ_L{vS zB5Xx=i^VTz$t;qmZw#YTq@Q<>{Qcr^lUTl3`S`SbSX)`oJkZ zs3doLl|F+Dun8?=iV;*1s0JHf`G9wuf;-pq6Shsxf+NQqm)GR-9l1I0k~2*D4si>i z&ACkIN#N|qjJ^{2ZHstpu5#VTqMPY+S)&cGhrCuD!m0vNvexZw_TO4QchKe%6U%1c z@KyYTp!r{Jt4u4k@H+80e$jyDG)opy|6y)0cq%Oiz;`NHH>B@koL)h`D(P#>JxO|P s;n4Zgi?q*OfXXQxkNYd=Z7=BjWRd$F*vaUx&_>9XG^T%c(Vo2j4S*JEeE{}2S^JBcE0p5|F`hmzWiHX+AZEkkX*H;bvGEHGWNi*120{gHS21~?K-;eoRz4+_Fh1LU8O6(_2 z84SdkopWtE8)Vm}446|$e5n1*zg`rU39z-2C}gFOabe7wC#?^|Hr5ywd(-|8=jQfV z-)1E?{`S;@*QK*WF)7tRCphB#olN!$O>-#GH_vZQzj6Da*3XI!ww2Gfe=DcYz>g^; z$uB$Sn;&4C$%qM-qG^$!Wyp##D(IR?#<3~a(l9)mD5#Gyj$`vYU9=}pLBG5!L*gv1 z@*Kq)Ni{U9RKa_*nB0EGJ088#uAys^QHj2PxjD^Rqg?&;_bD|Ob{t(KbNUW(vw2R} zu0P1hd+R|?KEI#l^u3jj2YG=k;0>_iWbd09vE1JVX z_A%QdM!mA$e~Y5|8MG^pl6*o(@}u<9dH;qb4x^&>t)E6PCROOq(f$HOdp(YL37z;G zKF>E^%SX%@jESgaZ+hW$6at7DA)TY!6C?7iYjRfK=)D} z$6JqKLB2f1W(iv_vIO}u==5z?UgFbqouoF5{ET~M&9+PtbP)@m=UNtRhone!3GxnM zNT=+a8&l~&cPOyhMT^|DXS?uzj(#WUOBBV4yr;n>$kPdPHuvt)kSfWEf(JyG?BrfN zhv;reeYg^DR3_Wwg1%_onA7s2eW=^K@3jK4ac}Gw4SgmOGZbUIo>vvtC~QxbEMtkW z+r6k?CIZ%?U(z0s7liE)9V`-QpQMqyMCd#8SxFk*DybcJq@oVise?yFx;caO<4Y#Bkj7X}4Wra|@OMjG#I%+Gnn%N2QREj0% z>_TLkF^cXi9;EIh>xR@4{Gw0bkqlJh|F($DW%P4!o>lfL{ zzW(RMk~}GOb4}CMZuR5z*a=JDU~e1!#WKnssO$>Q|0D8piM}64C!%*fD|1IK4>S5p z^yCtsn)|lLFZg!`Lvk1sUe=DkOv;T~)&{aGO1r+DRE#IJE=!>aXATm(+P-fGfwM-h zu-jBa8~5uqaGOrj0ZGR(@|1qi+@>S2%n@`9uh!}{b(=mwgQQdVi=?~s9_3#A!s+w_ zg1YHCLH^TGG}oxm&I9@maQi<4mwr1aZ%^RvJFJV5)qFG{geFvT2mW*EDoIszPqh_2 zb!0tDARrxMp5{pfJcl$%OW-`DKk?iFeHcBYzfIhMO>{T7r@%Herg25!5C$Y&Lreo- zP*4;WOPYXPl72-yYpmK}1F^CvzB}kRA`XkmAJIAQShX#O$qFMI2;PDV&3qvEHQW~z z(uU*~k`!uphaBbIGx&iVWq$&;xA2mOsMwayvk9q1r=%VXGD3VSImq0G^x+S!+-+zH zz1+kX5n4{o&4QdXRZ4!AEp%gx@KQwUC9S3Xl3t;t zRg7+gZK3d2i0vK1%QhU7)QGE+RC=dX!L)bz(t_e?Z#~xsJ&rYtg#I(^6%;lFy^`W- zRU4ldmOuw`6{KeBC(0d`i2V0>tS~E`+Ad}!qdSv(3QNJTq}hmFENo9AOHwMebO?n5 z7vC3NUOIS0zy=1&WLLx|wh;AVLiVYMc@I5(e~y00?C$Vt(Wayg9j_iCM&ib%PV%tU z&`FjDY32{f`(x36j{F^8`H^T`I!~gtfIpKavoYbk%d#LqKU3jYk!2jG)mm2po`oo8r0Svouf^A)<>w|?#*B2 z3m66BY|5VRObN(=ik44~Rh%JEkbG|1$!`^-87ns`{t(}2uz+{7qlX#a zWOjc(qYd5R-N~7jsRkBMKQaG#&a6;xUq+DCXu23WKRGVq+S=Yd!$b1kxosIB6#$_8N$>yw delta 48 zcmV-00MGybtpWF}0kAX}0c*207^wrZ_8TAsvo0WK0h6sEkdsv+Qvn&VA@~=eFb=ap GNHz}6d=Xy& diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3828e6bc953f18059ef2723b352b5f90bb5bb03f..9047c7ac3fe76c0d59b411cb417c876fbd398c8b 100644 GIT binary patch literal 17 VcmZSXJN$gYF`e@v3}C==1pq&l1-SqK literal 17 VcmZSXJN$gYF`e@v3}C?03IIPw1!@2Q diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index f95008babfcc1490a2f24611876b8433534c6a45..653527836b62e7188fccdd3c2aaf6a4195fcd4e0 100644 GIT binary patch delta 958 zcmXxge=O8t90zdUJEuRmeIFT)Io)yGMP_wp-PvSp*`{75MALmlDT$qq8Q|tS9{(L>}&+~qsN3CTpw=rK!I7B!M zz;@6@yOVu_b33&F*M{t7HJ(Ttn+b_$D7K6Gia&OyMCv+v%=JC5@)? z9lZLh?XZOyXrao7itwy1eyL@v>e^pN256&T?}+3$Ou8N zId`lECo@rj5D>sLlo>l>mp0OB3`IqvOa@8J*)K>lQt`YDS%Lr|nulMXXs+Ig#?h$V zciN=;kgaqv6T35-4wf-VcSC^DH}DmWrU=9i6*&T?RH`cB%gCOMoT=(t zr8pT3)5XyYZVA$d4V)tmqrAt%1Ynn;LN~=*Ev~3S2OIz0GDlaBerOFCQ=nbUgYC_7 zk;fJOmi~om6}Nofy{N}VT9vl$R01A23m2QEz;hzMQei2q#&``TNU}+5xJ#34#7LW| z9d=5Rg~zA+Pt*?LkEZmyhkDn{AIKez{e-i1aOf!yc$?drcn^zNG@8>PJM0+R-y&iG zi8aWNs$3t!b?eA3b0yHpwn&C3ZZI*?*W$0nTejVXxM7EYaj|y?ZpeqVx@0oz$YpC% zq6OO?IHgm8M9ZK0@ujskjH@sqLW=TU-f$w*>QqE^vmBpHL91Ry-hLAq+$1ccjZ$k} zyBQ!aMYNsLJ$nfUAHk5L8rae^0IrWL$~iG=F-}`xLQDz#Vvv(8$D6+0eEchBA@b^d fPcXPLJ%4g9DjESS6q@{*fXZY!yqEnED&?%d6hdUq delta 256 zcmaFAg1L7w^9BB7mj3qmI!S|C38;{t=pnF}Q*&s>-|S!j{RhF*BbrF zp|%E_53Z?Xn;f*+VDqfa-x)Wr+#0|*In=Fka@Tf`&9AoaWCS{8qv8UQ&9!F)SOHy0 BX)OQ% diff --git a/src/Notes-master/.gradle/file-system.probe b/src/Notes-master/.gradle/file-system.probe index daa45123fcecc30927a307561e4a30ddacab81a4..53223b9e86aeb5e0cb25a17227fa6ca408c94aa2 100644 GIT binary patch literal 8 PcmZQzVC;GGQKb?93JwDZ literal 8 PcmZQzVC-48Y5M~J3C06` diff --git a/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf b/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf index fb72d00..108576c 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf +++ b/src/Notes-master/.idea/sonarlint/issuestore/0/2/023468cfdd0b71d4098903b9070e364658e2fbcf @@ -1,6 +1,6 @@ > -java:S1604t"(Make this anonymous inner class a lambda(Éãî +java:S1604s"(Make this anonymous inner class a lambda(Éãî V java:S125">>>>>> liuyitao-branch -#Sun Dec 10 23:29:21 CST 2023 +#Tue Jan 09 14:31:37 CST 2024 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat @@ -195,7 +94,3 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index f11ae84..d4217a2 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,13 +1,5 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch -%s --%s --%s @@ -15,25 +7,11 @@ Messaging Email -<<<<<<< HEAD -<<<<<<< HEAD - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关è”内容，点击新建便签。访客模å¼ä¸‹ï¼Œä¾¿ç­¾å†…容ä¸å¯è§...新建便签æˆåŠŸåˆ é™¤æ醒创建æ醒已过期yyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«ç”µè¯å‘é€é‚®ä»¶æµè§ˆç½‘页打开地图新建文件夹导出文本åŒæ­¥å–消åŒæ­¥è®¾ç½®æœç´¢åˆ é™¤ç§»åŠ¨åˆ°æ–‡ä»¶å¤¹é€‰ä¸­äº† %d 项没有选中项，æ“作无效全选å–消全选文字大å°å°æ­£å¸¸å¤§è¶…大进入清å•æ¨¡å¼é€€å‡ºæ¸…å•æ¨¡å¼æŸ¥çœ‹æ–‡ä»¶å¤¹åˆªé™¤æ–‡ä»¶å¤¹ä¿®æ”¹æ–‡ä»¶å¤¹å称文件夹 %1$s 已存在，请é‡æ–°å‘½å分享å‘é€åˆ°æ¡Œé¢æ醒我删除æ醒选择文件夹上一级文件夹已添加到桌é¢åˆ é™¤ç¡®è®¤è¦åˆ é™¤æ‰€é€‰çš„ %d æ¡ä¾¿ç­¾å—?确认è¦åˆ é™¤è¯¥æ¡ä¾¿ç­¾å—?确认删除文件夹åŠæ‰€åŒ…å«çš„便签å—？已将所选 %1$d æ¡ä¾¿ç­¾ç§»åˆ° %2$s 文件夹SDå¡è¢«å ç”¨ï¼Œä¸èƒ½æ“作导出文本时å‘生错误，请检查SDå¡è¦æŸ¥çœ‹çš„便签ä¸å­˜åœ¨ä¸èƒ½ä¸ºç©ºä¾¿ç­¾è®¾ç½®é—¹é’Ÿæ醒ä¸èƒ½å°†ç©ºä¾¿ç­¾å‘é€åˆ°æ¡Œé¢å¯¼å‡ºæˆåŠŸå¯¼å‡ºå¤±è´¥å·²å°†æ–‡æœ¬æ–‡ä»¶(%1$s)输出至SDå¡(%2$s)目录åŒæ­¥ä¾¿ç­¾...åŒæ­¥æˆåŠŸåŒæ­¥å¤±è´¥åŒæ­¥å·²å–消与%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±è´¥ï¼Œè¯·æ£€æŸ¥ç½‘络和å¸å·è®¾ç½®åŒæ­¥å¤±è´¥ï¼Œå‘生内部错误åŒæ­¥å·²å–消登录%1$s...正在获å–æœåŠ¡å™¨ä¾¿ç­¾åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç­¾...设置åŒæ­¥è´¦å·ä¸Žgoogle taskåŒæ­¥ä¾¿ç­¾è®°å½•ä¸Šæ¬¡åŒæ­¥äºŽ %1$s添加账å·æ›´æ¢è´¦å·åˆ é™¤è´¦å·å–消立å³åŒæ­¥å–消åŒæ­¥å½“å‰å¸å· %1$s如更æ¢åŒæ­¥å¸å·ï¼Œè¿‡åŽ»çš„å¸å·åŒæ­¥ä¿¡æ¯å°†è¢«æ¸…空，å†æ¬¡åˆ‡æ¢çš„åŒæ—¶å¯èƒ½ä¼šé€ æˆæ•°æ®é‡å¤åŒæ­¥ä¾¿ç­¾è¯·é€‰æ‹©googleå¸å·ï¼Œä¾¿ç­¾å°†ä¸Žè¯¥å¸å·çš„google task内容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸å·åŒæ­¥å¸å·å·²è®¾ç½®ä¸º%1$s新建便签背景颜色éšæœºåˆ é™¤é€šè¯ä¾¿ç­¾è¯·è¾“å…¥å称正在æœç´¢ä¾¿ç­¾æœç´¢ä¾¿ç­¾ä¾¿ç­¾ä¸­çš„文字便签设置å–消 - %1$s æ¡ç¬¦åˆâ€œ%2$sâ€çš„æœç´¢ç»“æžœ - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關è¯å…§å®¹ï¼Œé»žæ“Šæ–°å»ºä¾¿ç°½ã€‚訪客模å¼ä¸‹ï¼Œä¾¿ç±¤å…§å®¹ä¸å¯è¦‹...新建便簽æˆåŠŸåˆªé™¤æ醒創建æ醒已éŽæœŸyyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«é›»è©±ç™¼é€éƒµä»¶æµè¦½ç¶²é æ‰“é–‹åœ°åœ–å·²å°‡æ‰€é¸ %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本åŒæ­¥å–消åŒæ­¥è¨­ç½®æœå°‹åˆªé™¤ç§»å‹•åˆ°æ–‡ä»¶å¤¾é¸ä¸­äº† %d 項沒有é¸ä¸­é …，æ“作無效全é¸å–消全é¸æ–‡å­—大å°å°æ­£å¸¸å¤§è¶…大進入清單模å¼é€€å‡ºæ¸…單模å¼æŸ¥çœ‹æ–‡ä»¶å¤¾åˆªé™¤æ–‡ä»¶å¤¾ä¿®æ”¹æ–‡ä»¶å¤¾å稱文件夾 %1$s 已存在，請é‡æ–°å‘½å分享發é€åˆ°æ¡Œé¢æ醒我刪除æ醒é¸æ“‡æ–‡ä»¶å¤¾ä¸Šä¸€ç´šæ–‡ä»¶å¤¾å·²æ·»åŠ åˆ°æ¡Œé¢åˆªé™¤ç¡®è®¤è¦åˆªé™¤æ‰€é¸çš„ %d æ¢ä¾¿ç±¤å—Ž?确认è¦åˆ é™¤è©²æ¢ä¾¿ç±¤å—Ž?確èªåˆªé™¤æª”夾åŠæ‰€åŒ…å«çš„便簽嗎？SDå¡è¢«ä½”用，ä¸èƒ½æ“作導出TXT時發生錯誤，請檢查SDå¡è¦æŸ¥çœ‹çš„便籤ä¸å­˜åœ¨ä¸èƒ½çˆ²ç©ºä¾¿ç±¤è¨­ç½®é¬§é˜æ醒ä¸èƒ½å°‡ç©ºä¾¿ç±¤ç™¼é€åˆ°æ¡Œé¢å°Žå‡ºæˆåŠŸå°Žå‡ºå¤±æ•—已將文本文件(%1$s)導出至SD(%2$s)目錄åŒæ­¥ä¾¿ç°½...åŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—åŒæ­¥å·²å–消與%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—，請檢查網絡和帳號設置åŒæ­¥å¤±æ•—，發生內部錯誤åŒæ­¥å·²å–消登陸%1$s...正在ç²å–æœå‹™å™¨ä¾¿ç±¤åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç±¤...設置åŒæ­¥è³¬è™Ÿä¸Žgoogle taskåŒæ­¥ä¾¿ç°½è¨˜éŒ„上次åŒæ­¥äºŽ %1$s添加賬號更æ›è³¬è™Ÿåˆªé™¤è³¬è™Ÿå–消立å³åŒæ­¥å–消åŒæ­¥ç•¶å‰å¸³è™Ÿ %1$s如更æ›åŒæ­¥å¸³è™Ÿï¼ŒéŽåŽ»çš„帳號åŒæ­¥ä¿¡æ¯å°‡è¢«æ¸…空，å†æ¬¡åˆ‡æ›çš„åŒæ™‚å¯èƒ½æœƒé€ æˆæ•¸æ“šé‡å¾©åŒæ­¥ä¾¿ç°½è«‹é¸æ“‡google帳號，便簽將與該帳號的google task內容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸³è™ŸåŒæ­¥å¸³è™Ÿå·²è¨­ç½®ç‚º%1$s新建便籤背景é¡è‰²éš¨æ©Ÿåˆªé™¤é€šè©±ä¾¿ç±¤è«‹è¼¸å…¥å稱正在æœç´¢ä¾¿ç±¤æœç´¢ä¾¿ç±¤ä¾¿ç±¤ä¸­çš„文字便籤設置å–消 - %1$s æ¢ç¬¦åˆâ€%2$s“的æœå°‹çµæžœ - -======= -======= ->>>>>>> liuyitao-branch 短信 邮件 @@ -91,9 +53,4 @@ 郵件 便簽便簽2x2便簽4x4沒有關è¯å…§å®¹ï¼Œé»žæ“Šæ–°å»ºä¾¿ç°½ã€‚訪客模å¼ä¸‹ï¼Œä¾¿ç±¤å…§å®¹ä¸å¯è¦‹...新建便簽æˆåŠŸåˆªé™¤æ醒創建æ醒已éŽæœŸyyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«é›»è©±ç™¼é€éƒµä»¶æµè¦½ç¶²é æ‰“é–‹åœ°åœ–å·²å°‡æ‰€é¸ %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本åŒæ­¥å–消åŒæ­¥è¨­ç½®æœå°‹åˆªé™¤ç§»å‹•åˆ°æ–‡ä»¶å¤¾é¸ä¸­äº† %d 項沒有é¸ä¸­é …，æ“作無效全é¸å–消全é¸æ–‡å­—大å°å°æ­£å¸¸å¤§è¶…大進入清單模å¼é€€å‡ºæ¸…單模å¼æŸ¥çœ‹æ–‡ä»¶å¤¾åˆªé™¤æ–‡ä»¶å¤¾ä¿®æ”¹æ–‡ä»¶å¤¾å稱文件夾 %1$s 已存在，請é‡æ–°å‘½å分享發é€åˆ°æ¡Œé¢æ醒我刪除æ醒é¸æ“‡æ–‡ä»¶å¤¾ä¸Šä¸€ç´šæ–‡ä»¶å¤¾å·²æ·»åŠ åˆ°æ¡Œé¢åˆªé™¤ç¡®è®¤è¦åˆªé™¤æ‰€é¸çš„ %d æ¢ä¾¿ç±¤å—Ž?确认è¦åˆ é™¤è©²æ¢ä¾¿ç±¤å—Ž?確èªåˆªé™¤æª”夾åŠæ‰€åŒ…å«çš„便簽嗎？SDå¡è¢«ä½”用，ä¸èƒ½æ“作導出TXT時發生錯誤，請檢查SDå¡è¦æŸ¥çœ‹çš„便籤ä¸å­˜åœ¨ä¸èƒ½çˆ²ç©ºä¾¿ç±¤è¨­ç½®é¬§é˜æ醒ä¸èƒ½å°‡ç©ºä¾¿ç±¤ç™¼é€åˆ°æ¡Œé¢å°Žå‡ºæˆåŠŸå°Žå‡ºå¤±æ•—已將文本文件(%1$s)導出至SD(%2$s)目錄åŒæ­¥ä¾¿ç°½...åŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—åŒæ­¥å·²å–消與%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—，請檢查網絡和帳號設置åŒæ­¥å¤±æ•—，發生內部錯誤åŒæ­¥å·²å–消登陸%1$s...正在ç²å–æœå‹™å™¨ä¾¿ç±¤åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç±¤...設置åŒæ­¥è³¬è™Ÿä¸Žgoogle taskåŒæ­¥ä¾¿ç°½è¨˜éŒ„上次åŒæ­¥äºŽ %1$s添加賬號更æ›è³¬è™Ÿåˆªé™¤è³¬è™Ÿå–消立å³åŒæ­¥å–消åŒæ­¥ç•¶å‰å¸³è™Ÿ %1$s如更æ›åŒæ­¥å¸³è™Ÿï¼ŒéŽåŽ»çš„帳號åŒæ­¥ä¿¡æ¯å°‡è¢«æ¸…空，å†æ¬¡åˆ‡æ›çš„åŒæ™‚å¯èƒ½æœƒé€ æˆæ•¸æ“šé‡å¾©åŒæ­¥ä¾¿ç°½è«‹é¸æ“‡google帳號，便簽將與該帳號的google task內容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸³è™ŸåŒæ­¥å¸³è™Ÿå·²è¨­ç½®ç‚º%1$s新建便籤背景é¡è‰²éš¨æ©Ÿåˆªé™¤é€šè©±ä¾¿ç±¤è«‹è¼¸å…¥å稱正在æœç´¢ä¾¿ç±¤æœç´¢ä¾¿ç±¤ä¾¿ç±¤ä¸­çš„文字便籤設置å–消 %1$s æ¢ç¬¦åˆâ€%2$s“的æœå°‹çµæžœ -<<<<<<< HEAD - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index e6ae87c..400847a 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,105 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -#Thu Dec 21 01:11:49 CST 2023 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml -======= -======= ->>>>>>> liuyitao-branch -#Sun Dec 10 23:29:22 CST 2023 +#Tue Jan 09 14:31:38 CST 2024 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png @@ -195,7 +94,3 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch diff --git a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index f11ae84..d4217a2 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,13 +1,5 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch -%s --%s --%s @@ -15,25 +7,11 @@ Messaging Email -<<<<<<< HEAD -<<<<<<< HEAD - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关è”内容，点击新建便签。访客模å¼ä¸‹ï¼Œä¾¿ç­¾å†…容ä¸å¯è§...新建便签æˆåŠŸåˆ é™¤æ醒创建æ醒已过期yyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«ç”µè¯å‘é€é‚®ä»¶æµè§ˆç½‘页打开地图新建文件夹导出文本åŒæ­¥å–消åŒæ­¥è®¾ç½®æœç´¢åˆ é™¤ç§»åŠ¨åˆ°æ–‡ä»¶å¤¹é€‰ä¸­äº† %d 项没有选中项，æ“作无效全选å–消全选文字大å°å°æ­£å¸¸å¤§è¶…大进入清å•æ¨¡å¼é€€å‡ºæ¸…å•æ¨¡å¼æŸ¥çœ‹æ–‡ä»¶å¤¹åˆªé™¤æ–‡ä»¶å¤¹ä¿®æ”¹æ–‡ä»¶å¤¹å称文件夹 %1$s 已存在，请é‡æ–°å‘½å分享å‘é€åˆ°æ¡Œé¢æ醒我删除æ醒选择文件夹上一级文件夹已添加到桌é¢åˆ é™¤ç¡®è®¤è¦åˆ é™¤æ‰€é€‰çš„ %d æ¡ä¾¿ç­¾å—?确认è¦åˆ é™¤è¯¥æ¡ä¾¿ç­¾å—?确认删除文件夹åŠæ‰€åŒ…å«çš„便签å—？已将所选 %1$d æ¡ä¾¿ç­¾ç§»åˆ° %2$s 文件夹SDå¡è¢«å ç”¨ï¼Œä¸èƒ½æ“作导出文本时å‘生错误，请检查SDå¡è¦æŸ¥çœ‹çš„便签ä¸å­˜åœ¨ä¸èƒ½ä¸ºç©ºä¾¿ç­¾è®¾ç½®é—¹é’Ÿæ醒ä¸èƒ½å°†ç©ºä¾¿ç­¾å‘é€åˆ°æ¡Œé¢å¯¼å‡ºæˆåŠŸå¯¼å‡ºå¤±è´¥å·²å°†æ–‡æœ¬æ–‡ä»¶(%1$s)输出至SDå¡(%2$s)目录åŒæ­¥ä¾¿ç­¾...åŒæ­¥æˆåŠŸåŒæ­¥å¤±è´¥åŒæ­¥å·²å–消与%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±è´¥ï¼Œè¯·æ£€æŸ¥ç½‘络和å¸å·è®¾ç½®åŒæ­¥å¤±è´¥ï¼Œå‘生内部错误åŒæ­¥å·²å–消登录%1$s...正在获å–æœåŠ¡å™¨ä¾¿ç­¾åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç­¾...设置åŒæ­¥è´¦å·ä¸Žgoogle taskåŒæ­¥ä¾¿ç­¾è®°å½•ä¸Šæ¬¡åŒæ­¥äºŽ %1$s添加账å·æ›´æ¢è´¦å·åˆ é™¤è´¦å·å–消立å³åŒæ­¥å–消åŒæ­¥å½“å‰å¸å· %1$s如更æ¢åŒæ­¥å¸å·ï¼Œè¿‡åŽ»çš„å¸å·åŒæ­¥ä¿¡æ¯å°†è¢«æ¸…空，å†æ¬¡åˆ‡æ¢çš„åŒæ—¶å¯èƒ½ä¼šé€ æˆæ•°æ®é‡å¤åŒæ­¥ä¾¿ç­¾è¯·é€‰æ‹©googleå¸å·ï¼Œä¾¿ç­¾å°†ä¸Žè¯¥å¸å·çš„google task内容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸å·åŒæ­¥å¸å·å·²è®¾ç½®ä¸º%1$s新建便签背景颜色éšæœºåˆ é™¤é€šè¯ä¾¿ç­¾è¯·è¾“å…¥å称正在æœç´¢ä¾¿ç­¾æœç´¢ä¾¿ç­¾ä¾¿ç­¾ä¸­çš„文字便签设置å–消 - %1$s æ¡ç¬¦åˆâ€œ%2$sâ€çš„æœç´¢ç»“æžœ - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關è¯å…§å®¹ï¼Œé»žæ“Šæ–°å»ºä¾¿ç°½ã€‚訪客模å¼ä¸‹ï¼Œä¾¿ç±¤å…§å®¹ä¸å¯è¦‹...新建便簽æˆåŠŸåˆªé™¤æ醒創建æ醒已éŽæœŸyyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«é›»è©±ç™¼é€éƒµä»¶æµè¦½ç¶²é æ‰“é–‹åœ°åœ–å·²å°‡æ‰€é¸ %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本åŒæ­¥å–消åŒæ­¥è¨­ç½®æœå°‹åˆªé™¤ç§»å‹•åˆ°æ–‡ä»¶å¤¾é¸ä¸­äº† %d 項沒有é¸ä¸­é …，æ“作無效全é¸å–消全é¸æ–‡å­—大å°å°æ­£å¸¸å¤§è¶…大進入清單模å¼é€€å‡ºæ¸…單模å¼æŸ¥çœ‹æ–‡ä»¶å¤¾åˆªé™¤æ–‡ä»¶å¤¾ä¿®æ”¹æ–‡ä»¶å¤¾å稱文件夾 %1$s 已存在，請é‡æ–°å‘½å分享發é€åˆ°æ¡Œé¢æ醒我刪除æ醒é¸æ“‡æ–‡ä»¶å¤¾ä¸Šä¸€ç´šæ–‡ä»¶å¤¾å·²æ·»åŠ åˆ°æ¡Œé¢åˆªé™¤ç¡®è®¤è¦åˆªé™¤æ‰€é¸çš„ %d æ¢ä¾¿ç±¤å—Ž?确认è¦åˆ é™¤è©²æ¢ä¾¿ç±¤å—Ž?確èªåˆªé™¤æª”夾åŠæ‰€åŒ…å«çš„便簽嗎？SDå¡è¢«ä½”用，ä¸èƒ½æ“作導出TXT時發生錯誤，請檢查SDå¡è¦æŸ¥çœ‹çš„便籤ä¸å­˜åœ¨ä¸èƒ½çˆ²ç©ºä¾¿ç±¤è¨­ç½®é¬§é˜æ醒ä¸èƒ½å°‡ç©ºä¾¿ç±¤ç™¼é€åˆ°æ¡Œé¢å°Žå‡ºæˆåŠŸå°Žå‡ºå¤±æ•—已將文本文件(%1$s)導出至SD(%2$s)目錄åŒæ­¥ä¾¿ç°½...åŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—åŒæ­¥å·²å–消與%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—，請檢查網絡和帳號設置åŒæ­¥å¤±æ•—，發生內部錯誤åŒæ­¥å·²å–消登陸%1$s...正在ç²å–æœå‹™å™¨ä¾¿ç±¤åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç±¤...設置åŒæ­¥è³¬è™Ÿä¸Žgoogle taskåŒæ­¥ä¾¿ç°½è¨˜éŒ„上次åŒæ­¥äºŽ %1$s添加賬號更æ›è³¬è™Ÿåˆªé™¤è³¬è™Ÿå–消立å³åŒæ­¥å–消åŒæ­¥ç•¶å‰å¸³è™Ÿ %1$s如更æ›åŒæ­¥å¸³è™Ÿï¼ŒéŽåŽ»çš„帳號åŒæ­¥ä¿¡æ¯å°‡è¢«æ¸…空，å†æ¬¡åˆ‡æ›çš„åŒæ™‚å¯èƒ½æœƒé€ æˆæ•¸æ“šé‡å¾©åŒæ­¥ä¾¿ç°½è«‹é¸æ“‡google帳號，便簽將與該帳號的google task內容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸³è™ŸåŒæ­¥å¸³è™Ÿå·²è¨­ç½®ç‚º%1$s新建便籤背景é¡è‰²éš¨æ©Ÿåˆªé™¤é€šè©±ä¾¿ç±¤è«‹è¼¸å…¥å稱正在æœç´¢ä¾¿ç±¤æœç´¢ä¾¿ç±¤ä¾¿ç±¤ä¸­çš„文字便籤設置å–消 - %1$s æ¢ç¬¦åˆâ€%2$s“的æœå°‹çµæžœ - -======= -======= ->>>>>>> liuyitao-branch 短信 邮件 @@ -91,9 +53,4 @@ 郵件 便簽便簽2x2便簽4x4沒有關è¯å…§å®¹ï¼Œé»žæ“Šæ–°å»ºä¾¿ç°½ã€‚訪客模å¼ä¸‹ï¼Œä¾¿ç±¤å…§å®¹ä¸å¯è¦‹...新建便簽æˆåŠŸåˆªé™¤æ醒創建æ醒已éŽæœŸyyyyMMddMM月ddæ—¥ kk:mm知é“了查看呼å«é›»è©±ç™¼é€éƒµä»¶æµè¦½ç¶²é æ‰“é–‹åœ°åœ–å·²å°‡æ‰€é¸ %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本åŒæ­¥å–消åŒæ­¥è¨­ç½®æœå°‹åˆªé™¤ç§»å‹•åˆ°æ–‡ä»¶å¤¾é¸ä¸­äº† %d 項沒有é¸ä¸­é …，æ“作無效全é¸å–消全é¸æ–‡å­—大å°å°æ­£å¸¸å¤§è¶…大進入清單模å¼é€€å‡ºæ¸…單模å¼æŸ¥çœ‹æ–‡ä»¶å¤¾åˆªé™¤æ–‡ä»¶å¤¾ä¿®æ”¹æ–‡ä»¶å¤¾å稱文件夾 %1$s 已存在，請é‡æ–°å‘½å分享發é€åˆ°æ¡Œé¢æ醒我刪除æ醒é¸æ“‡æ–‡ä»¶å¤¾ä¸Šä¸€ç´šæ–‡ä»¶å¤¾å·²æ·»åŠ åˆ°æ¡Œé¢åˆªé™¤ç¡®è®¤è¦åˆªé™¤æ‰€é¸çš„ %d æ¢ä¾¿ç±¤å—Ž?确认è¦åˆ é™¤è©²æ¢ä¾¿ç±¤å—Ž?確èªåˆªé™¤æª”夾åŠæ‰€åŒ…å«çš„便簽嗎？SDå¡è¢«ä½”用，ä¸èƒ½æ“作導出TXT時發生錯誤，請檢查SDå¡è¦æŸ¥çœ‹çš„便籤ä¸å­˜åœ¨ä¸èƒ½çˆ²ç©ºä¾¿ç±¤è¨­ç½®é¬§é˜æ醒ä¸èƒ½å°‡ç©ºä¾¿ç±¤ç™¼é€åˆ°æ¡Œé¢å°Žå‡ºæˆåŠŸå°Žå‡ºå¤±æ•—已將文本文件(%1$s)導出至SD(%2$s)目錄åŒæ­¥ä¾¿ç°½...åŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—åŒæ­¥å·²å–消與%1$såŒæ­¥æˆåŠŸåŒæ­¥å¤±æ•—，請檢查網絡和帳號設置åŒæ­¥å¤±æ•—，發生內部錯誤åŒæ­¥å·²å–消登陸%1$s...正在ç²å–æœå‹™å™¨ä¾¿ç±¤åˆ—表...正在åŒæ­¥æœ¬åœ°ä¾¿ç±¤...設置åŒæ­¥è³¬è™Ÿä¸Žgoogle taskåŒæ­¥ä¾¿ç°½è¨˜éŒ„上次åŒæ­¥äºŽ %1$s添加賬號更æ›è³¬è™Ÿåˆªé™¤è³¬è™Ÿå–消立å³åŒæ­¥å–消åŒæ­¥ç•¶å‰å¸³è™Ÿ %1$s如更æ›åŒæ­¥å¸³è™Ÿï¼ŒéŽåŽ»çš„帳號åŒæ­¥ä¿¡æ¯å°‡è¢«æ¸…空，å†æ¬¡åˆ‡æ›çš„åŒæ™‚å¯èƒ½æœƒé€ æˆæ•¸æ“šé‡å¾©åŒæ­¥ä¾¿ç°½è«‹é¸æ“‡google帳號，便簽將與該帳號的google task內容åŒæ­¥ã€‚正在åŒæ­¥ä¸­ï¼Œä¸èƒ½ä¿®æ”¹åŒæ­¥å¸³è™ŸåŒæ­¥å¸³è™Ÿå·²è¨­ç½®ç‚º%1$s新建便籤背景é¡è‰²éš¨æ©Ÿåˆªé™¤é€šè©±ä¾¿ç±¤è«‹è¼¸å…¥å稱正在æœç´¢ä¾¿ç±¤æœç´¢ä¾¿ç±¤ä¾¿ç±¤ä¸­çš„文字便籤設置å–消 %1$s æ¢ç¬¦åˆâ€%2$s“的æœå°‹çµæžœ -<<<<<<< HEAD - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties index 8c8e814..1528ef8 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -#Thu Dec 21 01:11:50 CST 2023 -======= -#Wed Dec 20 23:43:26 CST 2023 ->>>>>>> liuyitao-branch -======= -#Wed Dec 20 23:43:26 CST 2023 ->>>>>>> liuyitao-branch +#Tue Jan 09 14:37:56 CST 2024 diff --git a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml index 7e45ea1..51a8ddd 100644 --- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml @@ -1,10 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml index 427033f..90bce7d 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml @@ -1,10 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml index 898bd97..7b7c7ff 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml @@ -1,10 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml index ad74ec9..aa1f577 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml @@ -1,10 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> liuyitao-branch -======= - ->>>>>>> liuyitao-branch + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index c4de947..054c44b 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,257 +20,6 @@ 20 android:versionName="0.1" > 21 22 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -25 -26 -26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19 -37 android:debuggable="true" -38 android:extractNativeLibs="true" -39 android:icon="@drawable/icon_app" -39-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -40 android:label="@string/app_name" -40-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -41 android:testOnly="true" > -42 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 -43 android:name="net.micode.notes.ui.NotesListActivity" -43-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -44 android:configChanges="keyboardHidden|orientation|screenSize" -44-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -45 android:label="@string/app_name" -45-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -46 android:launchMode="singleTop" -46-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -47 android:theme="@style/NoteTheme" -47-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -48 android:windowSoftInputMode="adjustPan" > -48-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 -49 -49-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 -50 -50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 -50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 -51 -52 -52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 -52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 -53 -54 -55 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 -58 android:launchMode="singleTop" -58-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 -59 android:theme="@style/NoteTheme" > -59-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 -60 -60-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 -61 -61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 -61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 -62 -63 -63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -64 -65 -65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -66 -66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -67 -68 -68-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 -69 -69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 -69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 -70 -71 -71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -72 -73 -73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -74 -74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -75 -76 -76-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 -77 -77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 -77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 -78 -79 -79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -80 -81 -82 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 -83 android:name="android.app.searchable" -83-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 -84 android:resource="@xml/searchable" /> -84-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 -85 -86 -87 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 -89 android:authorities="micode_notes" -89-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 -90 android:multiprocess="true" /> -90-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 -91 -92 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57 -94 android:label="@string/app_widget2x2" > -94-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 -95 -95-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 -96 -96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 -97 -97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 -98 -98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -99 -100 -101 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 -102 android:name="android.appwidget.provider" -102-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 -104 -105 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 -107 android:label="@string/app_widget4x4" > -107-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 -108 -108-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 -109 -109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 -110 -110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 -111 -111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -112 -113 -114 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 -115 android:name="android.appwidget.provider" -115-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 -117 -118 -118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 -118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 -119 -119-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 -120 -120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 -120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 -121 -122 -123 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 -125 android:process=":remote" > -125-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 -126 -127 -128 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 -130 android:label="@string/app_name" -130-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 -131 android:launchMode="singleInstance" -131-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 -133 -134 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 -136 android:label="@string/preferences_title" -136-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 -137 android:launchMode="singleTop" -137-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 -139 -140 -141 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 -143 android:exported="false" > -143-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 -144 -145 -146 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 -147 android:name="android.app.default_searchable" -147-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 -======= -======= ->>>>>>> liuyitao-branch 22-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" 23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 @@ -310,217 +59,212 @@ 38 android:extractNativeLibs="true" 39 android:icon="@drawable/icon_app" 39-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -40 android:label="@string/app_name" +40 android:label="@string/app_name" > 40-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -41 android:testOnly="true" > -42 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 -43 android:name="net.micode.notes.ui.NotesListActivity" -43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -44 android:configChanges="keyboardHidden|orientation|screenSize" -44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -45 android:label="@string/app_name" -45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -46 android:launchMode="singleTop" -46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -47 android:theme="@style/NoteTheme" -47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 -49 -49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 -50 -50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 -50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 -51 -52 -52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 -52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 -53 -54 -55 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 -58 android:launchMode="singleTop" -58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 -60 -60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 -61 -61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 -61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 -62 -63 -63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -64 -65 +41 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +44 android:label="@string/app_name" +44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +45 android:launchMode="singleTop" +45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +46 android:theme="@style/NoteTheme" +46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +47 android:windowSoftInputMode="adjustPan" > +47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 +48 +48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 +49 +49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 +49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 +50 +51 +51-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 +51-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 +52 +53 +54 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 +57 android:launchMode="singleTop" +57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 +58 android:theme="@style/NoteTheme" > +58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 +59 +59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 +60 +60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 +60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 +61 +62 +62-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 +62-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +63 +64 +64-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 +64-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +65 65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -66 -66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -67 -68 -68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 -69 -69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 -69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 -70 -71 -71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -72 -73 +66 +67 +67-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 +68 +68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 +68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 +69 +70 +70-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 +70-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +71 +72 +72-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 +72-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 +73 73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -74 -74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 -74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75 -75 -76 -76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 -77 -77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 -77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 -78 -79 -79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 -79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -80 -81 -82 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 -83 android:name="android.app.searchable" -83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 -85 -86 -87 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 -89 android:authorities="micode_notes" -89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 -90 android:multiprocess="true" /> -90-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 -91 -92 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 -95 -95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 -96 -96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 -97 -97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 -98 -98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -99 -100 -101 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 -102 android:name="android.appwidget.provider" -102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 -104 -105 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 -108 -108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 -109 -109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 -109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 -110 -110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 -110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 -111 -111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -112 -113 -114 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 -115 android:name="android.appwidget.provider" -115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 -117 -118 -118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 -118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 -119 -119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 -120 -120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 -120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 -121 -122 -123 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 -125 android:process=":remote" > -125-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 -126 -127 -128 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 -130 android:label="@string/app_name" -130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 -131 android:launchMode="singleInstance" -131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 -133 -134 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 -136 android:label="@string/preferences_title" -136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 -137 android:launchMode="singleTop" -137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 -139 -140 -141 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 -143 android:exported="false" > -143-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 -144 -145 -146 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 -147 android:name="android.app.default_searchable" -147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch -149 -150 -151 +74 +75 +75-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 +76 +76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 +76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 +77 +78 +78-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 +78-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 +79 +80 +81 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 +82 android:name="android.app.searchable" +82-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 +83 android:resource="@xml/searchable" /> +83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 +84 +85 +86 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 +88 android:authorities="micode_notes" +88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 +89 android:multiprocess="true" /> +89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 +90 +91 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57 +93 android:label="@string/app_widget2x2" > +93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 +94 +94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 +95 +95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 +95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 +96 +96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 +96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +97 +97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +98 +99 +100 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 +101 android:name="android.appwidget.provider" +101-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 +103 +104 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 +106 android:label="@string/app_widget4x4" > +106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 +107 +107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 +108 +108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 +108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 +109 +109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 +109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 +110 +110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 +111 +112 +113 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 +114 android:name="android.appwidget.provider" +114-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 +116 +117 +117-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 +117-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 +118 +118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 +119 +119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 +119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 +120 +121 +122 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 +124 android:process=":remote" > +124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 +125 +126 +127 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 +129 android:label="@string/app_name" +129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 +130 android:launchMode="singleInstance" +130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 +132 +133 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 +135 android:label="@string/preferences_title" +135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 +136 android:launchMode="singleTop" +136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 +138 +139 +140 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 +142 android:exported="false" > +142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 +143 +144 +145 D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 +146 android:name="android.app.default_searchable" +146-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 +148 +149 +150 diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index 2631b2e..4b7a997 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,67 +3,32 @@ 3 package="net.micode.notes.test" > 4 5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:5-74 +5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:5-74 6 android:minSdkVersion="14" -6-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:15-41 +6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:15-41 7 android:targetSdkVersion="14" /> -7-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:42-71 +7-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:5:42-71 8 9 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:5-15:66 +9-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:22-75 +10-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:11:22-75 11 android:functionalTest="false" -11-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:14:22-52 +11-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:14:22-52 12 android:handleProfiling="false" -12-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:13:22-53 +12-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:15:22-64 +13-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:12:22-62 +14-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:12:22-62 15 16 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:7:5-9:19 +16-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:7:5-9:19 17 android:debuggable="true" 18 android:extractNativeLibs="true" > 19 -19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:9-60 -19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:23-57 -======= -======= ->>>>>>> liuyitao-branch -5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:5-74 -6 android:minSdkVersion="14" -6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:15-41 -7 android:targetSdkVersion="14" /> -7-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:42-71 -8 -9 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:5-15:66 -10 android:name="android.test.InstrumentationTestRunner" -10-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:11:22-75 -11 android:functionalTest="false" -11-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:14:22-52 -12 android:handleProfiling="false" -12-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:13:22-53 -13 android:label="Tests for net.micode.notes" -13-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:15:22-64 -14 android:targetPackage="net.micode.notes" /> -14-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:12:22-62 -15 -16 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:7:5-9:19 -17 android:debuggable="true" -18 android:extractNativeLibs="true" > -19 -19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:9-60 -19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:23-57 -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch +19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:8:9-60 +19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest140903849203357957.xml:8:23-57 20 21 22 diff --git a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 3067a07..a736437 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -37,8 +37,7 @@ android:debuggable="true" android:extractNativeLibs="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" - android:testOnly="true" > + android:label="@string/app_name" > + android:label="@string/app_name" > %|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-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 7919999..a6400cc 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,42 +1,7 @@ { "logs": [ { -<<<<<<< HEAD -<<<<<<< HEAD "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch - "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", @@ -47,10 +12,6 @@ "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": "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" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "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", @@ -60,11 +21,6 @@ "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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> liuyitao-branch }, { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", @@ -84,10 +40,6 @@ "endColumns": "19", "endOffsets": "210" } -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch } ] }, @@ -95,202 +47,6 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "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", - "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "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", - "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,2913,2696,1098,1287,1476,1685,1897,911,2104" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" - } -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> liuyitao-branch - }, - { - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - } - ] - }, - { -<<<<<<< HEAD -<<<<<<< HEAD - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" -======= -======= ->>>>>>> liuyitao-branch - "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat", - "map": [ - { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "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", @@ -336,15 +92,15 @@ "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" } }, { @@ -384,7 +140,7 @@ ] }, { - "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", @@ -395,10 +151,6 @@ "endLines": "21", "endColumns": "19", "endOffsets": "817" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "to": { "startLines": "2", @@ -410,19 +162,6 @@ } }, { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "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", @@ -431,10 +170,6 @@ "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": "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" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "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-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 259cbc6..53078a0 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,38 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "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", @@ -44,10 +12,6 @@ "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": "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" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "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", @@ -57,11 +21,6 @@ "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": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> liuyitao-branch }, { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", @@ -81,10 +40,6 @@ "endColumns": "19", "endOffsets": "210" } -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch } ] } diff --git a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index ee5387b..bd40dd3 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,19 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" -======= -======= ->>>>>>> liuyitao-branch "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", @@ -25,10 +12,6 @@ "endLines": "21", "endColumns": "19", "endOffsets": "817" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "to": { "startLines": "2", @@ -40,19 +23,6 @@ } }, { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "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", @@ -61,10 +31,6 @@ "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": "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" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch }, "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-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 236384c..e47293c 100644 --- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,182 +4,6 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "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", - "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" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "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", - "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "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,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { -<<<<<<< HEAD -<<<<<<< HEAD - "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "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", - "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,2913,2696,1098,1287,1476,1685,1897,911,2104" -======= -======= ->>>>>>> liuyitao-branch - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" - } -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> liuyitao-branch - }, - { - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - } - ] - }, - { - "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml", - "map": [ - { "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "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", @@ -225,15 +49,15 @@ "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": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2261,2473,2846,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" } }, { @@ -269,10 +93,6 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch } ] } diff --git a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 3067a07..a736437 100644 --- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -37,8 +37,7 @@ android:debuggable="true" android:extractNativeLibs="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" - android:testOnly="true" > + android:label="@string/app_name" > `^RUooB1M@G9p`Q$e@I5sgR_QeHnyg$tcN^8WMAFlp;2!9hwmC?vx$B=H7 zUOgcbfms`)#gX8IvO-y6j9y0ehOXpTQf%s}d*+OBh9%YWUe*c1f;Q)fXKw6-3WFXS zp*W3^!&0$ptXSv^{EO>#!;*63BG8MN1X>qGw(Pv@+3vO0Mlmn(n%YqLC6bM*Q^{Q$fpZIF(Y}%f#j&Q= zn|I#%ukS2jy;?KV!CEftGsu(8^Bf^seHc{8bFhD!RdUKbCX4N1GtwF2zV@k_D{V`o zwt44Ja%XcPJ|q5$b`;84!X>hOzo@QN^GFtHNT1qYl~i?5zwRaOI}$;!Wol*1_uq(6 zoqaJBAR!}T(*MDvVx$b$uW)Z`;--$ZuAQuf{l_SvEw_Fzc~Y|dOG16l=DLG|XRI+7 z#%FaB&$&%)OJYSSzf$}fpP%I&l%($cF2}&({u%qIV|$6u^UC+*r7c+Y-GgEAk8Fq) zYMWB2U~so&ic(0`@07ij?$<928M*FJ(rcbf`E33s|55Ibu3?(maQH||zSA)eCE<}_ z*=jMHskK!!wf5TEYp-t9qu1$m#ji-P4V1RM^CI8V$#hy$332t&yQL|JOq?1|&t4W> zdTAOy>pPXI+rhx@D4cxx=fp$j6N6IK6}sv|N2t=hHnTFXwc`vlJna5Lx+?^q`hTXb znT?kE>cnTnD zJn58W?yj3yWxvB`zrJc#=*fsod}z=?HYeBl@7vmI?&+wwILmZpxUp(YA_3ZHk<+Bt7_i%j@LWoSwQ}t)_5D zexVM{n3gBeVM*6&Jl};Q0zOymLBku5n)1J_J?}?iwiTfs>P40>9s2RqsPhniKSgcE zRj_X9fRokYI@MDQsZbh&yy-2vDCJAij~&~W+odL>c#o zM)|D|qmB_fMA#)Evp>#t#4?#_O4(8`=PaBn60hs0)=Dq@X`8B5uB<{H4eK=Tal{Uo zq@(@P?}wA)>_gLhR-7*TR5)P=3?I*4Zb(nf7*n`O+jR3A+XW*khWCFdCp95*wt2<) ztESiZHv;)tFDKl-{PT-8pT)}DraQ$~%OWkaK2d#JtIMS`Tl7tjHVn2?>-(8DR|;=y z)9*Vn+*6upihc*i9w%*WCZNB4D{1qz*)f`pp$o_Nk`cb#0g3!C|RHlro)@pRQSb@~xP;qWBIY%q+t+>uigmQbUDtCA$@Z%lc$ zQ^iZYWVU2FKy@zZZw`*2>1pS^L3^Pt3hnWTie=uMyRtDlbA7eCV6|mScr$CNkQ1iQ zQNBU);)J;_bm(&Ms?37g@Yi*{!wj7V(fb5ElH>DxW7+rS+;=WSZI3>WM1wSTVQsJ9 z&{Q~!U{fs-mv4MAUoG&I=>^m89|Y)*kw%re+U%=8jW^9SlkdN5`mnCw!su!%Y41;8 zYS26=tk3J4w!4i_u+m!a?kNnMkMpj|em-dX-diHnHq`X(vj00!OeiF`H^#hG;C#A0 z>Bon(z$3J2K8$8ilWkP#+YtGlnles6B8~E+$MMw#WJY-RHLBvpZz8}9+33GGSB-}BViNaD`*u1I%3`%*%b$S7$c)=~Mme-UhU7 zmo1(V*j48i8*Ok588)25?#pr*cz*5ERKU;j7HP$|YInLXUA?U_o$x*GW{qDHGx@iE zx6;WgVXE1?Y|SVJrzfuP(*`H(XUO#{{FW4hv#cqbYS}pU^LR>EEXDe}z-szbpO3}9 zH1gC@{qqu44t}5iF3j$&qZZ?XjGx^b!<)4~>Y;DDKNg5+lX{%yFJ_xfX}^trUsr15 z-L9ji?NQXT7`IY5rg?u%&M9Dd=e;qRVTb+g^_taBOPJb|6`!n`n`nz)RKshArmiYe z2hx|A>DhD-nXXRF_eBLuw~2w*R-XPS)WH!*3PBv%(9+9>V`8;u`@FJN68^4|c+O7R zSUv6XwL;EesMYKesVISzI@$WbS4?JM&g&BC&QH4ZoPPSdn)|y3ZJeu~2VeJ6Y+Kj2 z&@fc?(Sh)u7}&+!<8-#AVD|UXGT|EY*L!QW^Vi5nrZev>W8?aTX#GNHXc%Z%XnfH4 zp$R|}gvOm0h9&|{6dJCyUkI=HT8yH%f3rUth3bPwK%u}M3L-TPs!4w{?2nyK+Z(=?5v9&3u&bv5~As+yyHc zSD%ONw-cW-tYVyZfoGZ5XCo?Uw9M;8f8JEzJ(ls28KgKLd-(&7dS+|#*#uUf`}7*+ z4^AO8$=nxz+|9mMOAXm-G40&loY65EcT2GV1iN6|hg(H<@*Nj5naPS4RPiX)@pT!r zDeSX-?v5(McI#~|W}X>)pyElfy5=Mz(7hd4ZuXD9lTf%nSmWeTl$MW~TmZ$*uEVR( zq0S}K89T?YLY{1QORCj)IY{XFTC6dsVZnd&fkx^Tp`w z)a>52=x}5HoX&7FhUidAV(s9v;OD z14BFL7NEBZV(gHe7z^{&al0L2h!L~^&+QQzu+<(;WF1-+smw#7faU;WrP(9WXjf2R zk65FN0NMd@#KgMu7IZow0wCG}(Z*Q&{~~%AzR+Jn0H`^_X{T@=p*kW4n3PLAAw7=g zZIQZ>CXVC2%kw@M8gE|B3E71aPfUGYA_HQakR6yOfICi|0wQ3*3D(2^0P0PkY#hH1 z=s826@njWDkK={FWiCi6fj}7yaK|R~s};+-z^HzMtK&VD!u-H>0*`&E?+^0+e!;94GBs_zbiwG{9O`y(F5-Blb2 zlnINA{;zi^6dN$y5qk_@B`@XHn4W+6x{#3ozsbH{U_<0Q3iS7a#-iQNsODk^GmF|rk!p@HI#P)HVIPaDy`M@n4fw2#A z6mx0??D0W1g8UVn2q^V|ofeY>Lw<16yif2}3Hw4)EB}iKfPqgiQ!*DL+e)DA%PM=a5Npw%D#Eo}xH0+2&|R|@bb z;LgEs05Jgw5!+XS2g@aRMeqhHbT9ZBfS95Kfk_}@ip5pq!SxDwNwWeG11!Dfze;=- z_G>ASyO;qNGw^c2B8aQ%psK@f1j$_WvH=eU8=!)j5z%+kPa+42+tklzNkN(zPn@P{=s@|*%gOM*5EvJd?S5D!7ju|+*Fy&gOPgoVK94d8AF MA}>&BgTPS#0f!DvPyhe` delta 4313 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 Au>b%7 diff --git a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json index 51f6368..bb4deaa 100644 --- a/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ b/src/Notes-master/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json @@ -1 +1 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file +{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt index 70fd42f..0b566ff 100644 --- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,15 +1,3 @@ -<<<<<<< HEAD -<<<<<<< HEAD -net.micode.notes.app-pngs-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug -net.micode.notes.app-packageDebugResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -net.micode.notes.app-packageDebugResources-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -net.micode.notes.app-merged_res-4 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\res -net.micode.notes.app-main-6 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\res -======= -======= ->>>>>>> liuyitao-branch net.micode.notes.app-pngs-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-1 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-packageDebugResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir @@ -17,7 +5,3 @@ net.micode.notes.app-packageDebugResources-3 D:\Project1\MiNotes\src\Notes-maste net.micode.notes.app-merged_res-4 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-5 D:\Project1\MiNotes\src\Notes-master\app\src\debug\res net.micode.notes.app-main-6 D:\Project1\MiNotes\src\Notes-master\app\src\main\res -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch diff --git a/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt index 522751d..2dfe9ec 100644 --- a/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt +++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt @@ -1,17 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -net.micode.notes.test.app-androidTest-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug -net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir -net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir -net.micode.notes.test.app-merged_res-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest -======= -======= ->>>>>>> liuyitao-branch net.micode.notes.test.app-androidTest-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir net.micode.notes.test.app-merged_res-3 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch diff --git a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index c78041f..6e7247b 100644 --- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,109 +1,125 @@ -net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:string/sync_progress_login = 0x7f0a005e -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/set_remind_time_message = 0x7f0a005a +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:string/sync_progress_login = 0x7f0a005e net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:id/navigation_bar = 0x7f05002f net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:id/ll_font_super = 0x7f05001f +net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_setting = 0x7f0a0036 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:string/error_sync_network = 0x7f0a0013 +net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/note_link_tel = 0x7f0a003e net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:id/menu_send_to_desktop = 0x7f050029 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:id/preference_sync_button = 0x7f050037 net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:string/menu_select_all = 0x7f0a0032 +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_font_large = 0x7f0a0027 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:layout/note_item = 0x7f060007 +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 +net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 net.micode.notes:string/success_sdcard_export = 0x7f0a005b net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000b net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:id/note_edit_list = 0x7f050031 net.micode.notes:drawable/new_note = 0x7f04002f net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:id/note_edit_list = 0x7f050031 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:drawable/list_red_single = 0x7f040023 -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 +net.micode.notes:string/menu_select_none = 0x7f0a0033 +net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 +net.micode.notes:drawable/list_red_single = 0x7f040023 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:drawable/widget_4x_green = 0x7f04003e net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:id/menu_sync = 0x7f05002c +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/notealert_ok = 0x7f0a0041 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 net.micode.notes:string/button_delete = 0x7f0a0007 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:id/menu_list_mode = 0x7f050025 +net.micode.notes:string/app_widget2x2 = 0x7f0a0005 net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:string/search_label = 0x7f0a0058 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:string/preferences_account_title = 0x7f0a0045 net.micode.notes:string/alert_title_delete = 0x7f0a0003 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:id/menu_delete = 0x7f050021 +net.micode.notes:drawable/list_red_down = 0x7f040021 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:id/move = 0x7f05002e +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:raw/introduction = 0x7f090000 net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:drawable/list_red_middle = 0x7f040022 net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:drawable/icon_app = 0x7f040015 net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:layout/note_edit = 0x7f060005 @@ -112,8 +128,8 @@ net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/add_account_text = 0x7f060001 +net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:id/widget_text = 0x7f050042 net.micode.notes:id/widget_bg_image = 0x7f050041 net.micode.notes:string/menu_folder_delete = 0x7f0a0025 @@ -124,49 +140,38 @@ net.micode.notes:id/tv_alert_date = 0x7f05003a net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:id/tv_time = 0x7f05003e net.micode.notes:id/selection_menu = 0x7f050038 -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:id/ll_font_small = 0x7f05001e net.micode.notes:id/note_title = 0x7f050034 net.micode.notes:string/format_exported_file_location = 0x7f0a001a net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:id/navigation_bar = 0x7f05002f -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/menu_sync = 0x7f05002c net.micode.notes:id/menu_share = 0x7f05002b net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:id/menu_setting = 0x7f05002a net.micode.notes:string/menu_move = 0x7f0a002d net.micode.notes:id/date = 0x7f050007 net.micode.notes:id/note_item = 0x7f050033 -net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:id/menu_list_mode = 0x7f050025 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d net.micode.notes:id/menu_font_size = 0x7f050024 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e net.micode.notes:string/error_note_not_exist = 0x7f0a000e net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:id/minute = 0x7f05002d net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 +net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:drawable/list_yellow_up = 0x7f04002c +net.micode.notes:id/iv_bg_white = 0x7f050014 net.micode.notes:id/iv_medium_select = 0x7f050019 +net.micode.notes:string/ticker_success = 0x7f0a0062 net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:id/iv_bg_white = 0x7f050014 net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:drawable/list_white_down = 0x7f040025 net.micode.notes:drawable/list_white_up = 0x7f040028 @@ -177,23 +182,18 @@ net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:id/iv_alert_icon = 0x7f05000d net.micode.notes:drawable/list_yellow_single = 0x7f04002b net.micode.notes:id/cb_edit_item = 0x7f050006 +net.micode.notes:id/font_size_selector = 0x7f05000b +net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:id/menu_new_note = 0x7f050027 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 +net.micode.notes:id/menu_new_note = 0x7f050027 net.micode.notes:drawable/clock = 0x7f040003 +net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/font_small = 0x7f040013 net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt index 986f103..2a40f19 100644 --- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,233 +1,5 @@ -- Merging decision tree log --- manifest -<<<<<<< HEAD -<<<<<<< HEAD -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 - package - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml - android:versionName - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml - xmlns:android - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 - android:targetSdkVersion - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -uses-permission#android.permission.INTERNET -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -application -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19 -INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19 - android:extractNativeLibs - INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 - android:icon - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 - android:launchMode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 - android:windowSoftInputMode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 - android:configChanges - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 - android:theme - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 -action#android.intent.action.MAIN -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 -category#android.intent.category.LAUNCHER -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20 - android:launchMode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43 - android:configChanges - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 - android:theme - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29 -action#android.intent.action.VIEW -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66 -category#android.intent.category.DEFAULT -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73 -data -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78 - android:mimeType - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29 -action#android.intent.action.SEARCH -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68 -meta-data#android.app.searchable -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54 - android:resource - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43 - android:authorities - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47 - android:multiprocess - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20 - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88: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 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -meta-data#android.appwidget.provider -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58 - android:resource - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20 - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20 - android:process - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20 - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45 - android:launchMode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48 - android:theme - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20 - android:label - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54 - android:launchMode - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43 - android:theme - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19 - android:exported - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74 -meta-data#android.app.default_searchable -ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52 - android:value - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 - android:name - ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 -======= -======= ->>>>>>> liuyitao-branch ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 @@ -451,7 +223,3 @@ ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 android:name ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 -<<<<<<< HEAD ->>>>>>> liuyitao-branch -======= ->>>>>>> liuyitao-branch diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskClient.class.uniqueId2 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskClient.class.uniqueId2 deleted file mode 100644 index 7be3b8a5b2bb00cdc610552bb2bce5a1c0290c3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17115 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 Ha)QmkA zcy1$ROX2=>7x$NBV7!xNr;}j-8sqB*S!}P8vI-(@buuhgBJTHLga?ecB=<&p5wh=k zUWz*lY57M>E2pGFsRl`rp{P@Wxz(bSQ)lK?i~3HRDam?S9#Z4-G7G<>%JRyryQ#Fg zEKm9&Kei-4_UcH?EBP^sU8M@(?{@ zGG~g2u;DQ%wcLjAORkRtPUQMpT4FIgBPu0JDH^KKTUj(&;V-&XKFv@zGECIAR3R-^ zMaV#l=~Ok8PE#cmQKfW&Dx)jaa8#v6&{j1P#^9&#sZsQ}8cn;@7YJ!%s)XXMRm(GWAECuu=A67KS&3$uFQ8T%(2Y(1{a^GB3?H23YH;+!G zlXUKjzY3<=Iz;o*l~kkyE~&hkV2x4fle_OCN_jm4<=@Xh`I$QSLcLBWnmTFCl7=E7 z_4W(O`WfI;&~ua2Ert0>Kz2hm15BZ;1YCl$$Ge!9fwE`_LcAIZ)vTPPnzLFf*+Bz1 zRBcPuTv4Fx);eFSf&^;a_*37Mu`Z&a5d9<+PAd>dRic1dh0tm$Rj6ZVrkVx@Pp2hn z23+E?5Xx7;#uHGK4$>xkh1jfS(Zy;uU9RS6ahhOlL)vK9xkfvdnl&1Fs1pSP3EOhz zBay~MLB1Q(hJ1s1TFMdH@q*JI(yl^n45VTP9}6v$!FdC|`N)5Af>bRk9gFpr423+Gf>%A8rcj~B6AdZxCe^~nsgdz5 YNBlS|DM4#OSgRKq1*_-qMycoj2M`|QR{#J2 diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId1 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/GTaskManager.class.uniqueId1 deleted file mode 100644 index ac1834cc53e22f7f391b838bdc641fbd3723d4df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18982 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 Z;PLdWdN3)OtJOp5VLYF~`=+Gi{{hjPvY`L~ diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MetaData.class.uniqueId3 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/MetaData.class.uniqueId3 deleted file mode 100644 index cff1d6012715bea96a0499322ae90665f29e7385..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2462 zcmaJ??_1MW6n<}8OesNGRS-oN1feaA_ydGlWENTwZ41%@qH``yLkXk_Pnx>dpd#KN8*QMiAWsLLzz~GK_x7J)=2F zl5iM$${U)YI9hQ%s-H7libPvd^Q=QeG%6y7 z39_wdPL>y(;c|yi(XAl9VHkOtN#zsLYIb?;m6Tk|j_0M#^<*NSk`mdZluV^l`4mT$ zMcn470!LNK8b7-$;-1T@HT|@uDhAJ9s_a=+qbSiulnRlee}=p;VK_( z?uuqUy}QBq&x4*@w3{OfM(X)*QAMG4X$Xn?$UoEs46IZ2FX z==3(lxkJB$`?!u-iah7WjuE~{+;8F)c~K;f1z-K(F&o8e{79S?`YyotRKNgFwt#Vu zrc7_1Y**|L2*1(7=f>w+01sPo>}uwyqUbpGYd_9kNa2lT;-Uo8znasr|jxk*ao%)3E4qw(VcZ`Rb80lHVcT|-lgfm>wrH@E$ zdv#)z_bo)4I*yS(K!$>4>B~CR{TY3KP8J)8B8R(_?JU)f*OKdbjVfGMEQ<54vbwmdnA>RN1 diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId0 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper$TABLE.class.uniqueId0 deleted file mode 100644 index 64fe9eb5e91cd46d3cfc5804ca2f96614b0e7fab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcma)2u};H441F$bl7<#aSzu>j;TATg&=!GIwL>FzH?^u%#|7oCd>jKGz(=7vSzuu3 zV!vlwe)jwR`TPQKkINVxf^ibeTUk^aF|G>Y&4vS;MFXdb*6ih3?7P%AdGMP}Im0 z(p9yu3wbK7cCY@q;;z|G7`!+q^~AFG;$vJ8ZjXM1&}(0b2!s>$qJwMn5GjjWmMBmE U@YA+BY~vZuHK#hOHeej}56&)8g8%>k diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesDatabaseHelper.class.uniqueId3 deleted file mode 100644 index dcbb84871c2bafd4f7fa96845812bc85761c0d16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8801 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 diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesProvider.class.uniqueId2 deleted file mode 100644 index aee77ab01f4b235f94cd388073afac730fa7b839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9502 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 wMg^Y6T>_!f&4RX@>KY!3YYXATM diff --git a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId4 b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TaskList.class.uniqueId4 deleted file mode 100644 index eff1a55d6cce54ae4eeddba78ba34dfd4dec235f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8180 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