From 28eec420c0585a38f83ff86dea3368765e723c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=B0?= <2119103358@qq.com> Date: Wed, 31 Aug 2022 23:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.bin | Bin 277072 -> 277072 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/6.1.1/fileHashes/fileHashes.bin | Bin 42497 -> 42497 bytes .../.gradle/6.1.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/project1/.idea/gradle.xml | 1 + src/project1/.idea/workspace.xml | 5 + .../blame/res/debug/multi-v2/debug.json | 66 ++- .../blame/res/debug/multi-v2/values.json | 66 ++- .../debug/bundle-manifest/AndroidManifest.xml | 1 - .../compile-file-map.properties | 8 +- .../values-zh-rCN/values-zh-rCN.xml | 108 ----- .../values-zh-rTW/values-zh-rTW.xml | 108 ----- .../merged.dir/values/values.xml | 14 +- .../mergeDebugResources/merger.xml | 4 +- .../tmp/debug/dex-renamer-state.txt | 2 +- .../tmp/debug/zip-cache/androidResources | Bin 8305 -> 8305 bytes .../debug/AndroidManifest.xml | 1 - .../manifest-merger-blame-debug-report.txt | 384 +++++++++--------- .../debug/AndroidManifest.xml | 1 - .../debug/out/resources-debug.ap_ | Bin 950349 -> 950281 bytes .../res/merged/debug/values_values.arsc.flat | Bin 9784 -> 9736 bytes .../app/build/outputs/apk/debug/app-debug.apk | Bin 1050485 -> 1053910 bytes .../logs/manifest-merger-debug-report.txt | 2 - src/project1/app/src/main/AndroidManifest.xml | 2 +- .../app/src/main/res/values/styles.xml | 4 +- 26 files changed, 270 insertions(+), 507 deletions(-) delete mode 100644 src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml delete mode 100644 src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml diff --git a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin index 0df6ea3b106e9b3fb741c7026e3477d9e7e267c2..f34c6f251844792001b3b984d44c3e53c49cd8ad 100644 GIT binary patch delta 1333 zcmah}3rv$&82xX5-UYd>bfhAorMNP&Jcg|h*kEkDMl4p5M@*!pgAy2GhhRmULC98o z5#~iM4{>g?jJSxne_C{Gz5pLB+BznK5)o98r*;#`=3Mu8%d!Mayva#!a=zUA-E+Qk zO;4feDeTx;FFX_6EEX%&8p$?|<|9Q>PVP=kVX3A_B`Gf}&n5m@j!{G>QcL|%@peb# zfdi=VdUHHGFEZ^fOU(RUwyq#=Xs)XP{D}B1Ymj`ziF!VK!3kQbYUAs=9OaJ5g0F?F z>SPppUqmh3monfQrbrtf^TH*Z-|NL3PrHaant%lH#syUSIAFk2D+ZFP4fjSZu?gzm zo{eb`Kf}&)QSpQm7l@zO@Z3-_gcr&4EwR1M>q1{ z0SB#Y6l`UpS`ZWo<) zc}6W;P^H1b?0qo<1ET!YjEVYnHo+j~uLp^GV+v>`Iav`kl`6MnS%A=gH@nK&0tn(v z6jIpucK#~q|0-Vqg=O8OkKU9DqFkX=Cr&<@@FeBvp`oWQ|k=ZnVD&j^`s}iy6prG z>n8p1-A%wr-_S>1Az|sz$i@8}qAhjXLxICh*#m410TRqJkt=a%HeKZ*2T}l|Px(Xd zpGz3Kn`}Zg;@{Boe>2wfLDn}bQ0Z2QL_Tm>N(@11LRtL`2d;a2z_p?Y#99f+G{n9zWtl4 z9?9)Ga?m6B+e;WqqNrdj)m`yBkWharcK}#5pSiy6+nc_E=UbwOj>pbZ6}f?c9o$ei z;rglWlJLacODsl55E!E$ycS(h`B1JZ5rDj2zxPjuR4P4N{amAZVUFqdRtF&f(?+6H_JrQAX%fFkXB{gd?=96T3|KH}9$ aa7YvI#)C%E3vb;5q;PQ%^ivTIdEjrPqAlhC delta 1409 zcmai!c~Fx_7{;?%2n|R5l7b9JIm*#u2}gkhuv(xT9cLO)kcc`$h#@B72uB3zl@>;b zSQI~HE2W?g9okNhn2#|qRl{kafFzZp2PlOWhHysgXd5aG#~&he+?n@}efN95{mrw_ zuI2%zd4MVME6GjI;iIvxCXNZDMm(GCjAuzqaVz9bOjK&4=(}gTEt>Y$b7DgkWtR_` z#)6x;>u270$~_8U7*$~n=%~V7IV-Dnc-AC^u%5aCu;eG6#fLH7fG^#yt&AcVxOGf#T6}QSds{j;@t9+V1v^B zf0bLnByhHbN#Jbw*7T zb9kubJcuHS7i|*|{~Vy9u`m#g6j6YpdK3d{Ad6AN}yF{=FFRK@^SMmbUBnHTQmjkG_)pRtken$)ry_tNNH z4P3Q2CRNqc4VeJ*uP*(%cDXOPxu$&NbxRL9TJC{7+T`PU#XAm}c5Rb}+llkvE51Vh z?a&$BjW=?A(hJ)lz4I!|fuUrSGjjFA^NWtYYiU3(8t91pl8v8Pr2sa-qA9m5VX^w`_w5|W-gwAFSkV1u^ z1NryCU^K@AR>*u1_S=Mg5S@8bd*cM{>>Hk8I`SeQk!%|9%LW_dVg@`*3i!ZSWK{tl z%Cp^{=wc>qha{NvBcabBD6 zeSz|QujyJs#(xFSrv=LHz_;fnOMs3dUBijauM9Pz4NtoxM_5J4n^pDzCM~ z9epGjBchMd!RBpNQiJXt06UOh5)k39iRv~T9X=uY7^A6g-O-wi-InYA(p(&v2tdHi z_;|c3j>eb8?`>KoPN!GE09F8r#I`dQZKXbamO-$K)NeG%4NcF$2vx@njEhhiLz)G* rpx!cK?*^D$GTHW2!f==KOypYyY|$@0&>9^%1lZWqc~j|vP13-B_e)}> diff --git a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock index eebbd9063d66ade2377c14890771b6c2a99b127e..c7cc915fe8c34f2e275ea90e438c765b9e4f855e 100644 GIT binary patch literal 17 UcmZQ(pVV3>a%HO{0|ZzA04j|Gwg3PC literal 17 UcmZQ(pVV3>a%HO{0|e*-04jn5s{jB1 diff --git a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin index 8bc6958c9d9272488501a0f2bccb4dcff72ce098..c6384dc7b3beaf8ddd2aa1e21c7b7d7c1fd75bc7 100644 GIT binary patch delta 787 zcmZoX!_;_&X@g_5LYigBzuWd-JB8Y_(r&%mGlPMFvFS@iz$ykX;5OKt7|q5MBz<0H z#?ARB#QJ8+UI}e}kpNaz`IZBsO8hO5)-whYnn0`w!UBHnrk-ovK6uZYbWHJz%12$W zjw)?^pd=7TdQaXNt7iA5O4|-1z~m34(TvcWG37aDTl+!vRrd}GGHuXCGooOIjgs9Rrf~ZpC z*qm6Rz{vBZDvb*w;&6I$Vzlt&1*O6uK|Y8elka53JYo6ShbJ>l)4aIN*uy>iNfd(Ny*!1xL(^m#C;MUlj7|q6{@H5V~ zZ=dS73koe-?FDrb6TzzX|0{&3l2DzzF<)4|GwNmTRe^4{%4W3^M@=2Dnu`JQ5H*sm zlXu3d@qD}(pa&6P@}GRMNLW67(`ggmca7h#x;7lGSYU;wY4zlZt-_NH;)Ibkh7e_2 zW1Jcb&^GzWtK*~;1ot1ie39kRxz1N#FU-99%ox=gJC?~$A*%Hz^T$gmOy$;oaI&9u z>mSd@t}EN`HKD3D$GN)yO6j%R{gag6-}4cwBMm4C1RCom=O>ma%sRC8` zK}wsY%lPzxtkAiWb(cy>oY-hCt-DFLPq+Bvo%f$*^db6ylJP*v&g)j64sB}4Jku~K pAW^~E3obcvsgDZ(g%nG{i-&#{S-s7_%3zfVlLXr+zz&KDJped+2?GEC diff --git a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock index 93c1eb86db5ca419bdc5e0b663323b90628f0b38..f26f1f81ed14e91beca3fd2bbbc1896e3fab5620 100644 GIT binary patch literal 17 VcmZP;>zH~)@W!7#3}C=y3II1p1mgez literal 17 VcmZP;>zH~)@W!7#3}C<{0suEA1i}CS diff --git a/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a9b17fa7f01997be1f1c963d4fc144fdb63ebc03..c5fa285c7da128aba4cbd8c7c8f607655a7584ff 100644 GIT binary patch literal 17 UcmZSHRhwjVrEb0s0|YDw05aeNlK=n! literal 17 UcmZSHRhwjVrEb0s0|ZP405Z%3e*gdg diff --git a/src/project1/.idea/gradle.xml b/src/project1/.idea/gradle.xml index 440480e..5cd135a 100644 --- a/src/project1/.idea/gradle.xml +++ b/src/project1/.idea/gradle.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json index 8eb24ee..0aaa464 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -6,92 +6,82 @@ { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "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": "589,641,694,747,799", + "startOffsets": "477,529,582,635,687", "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" + "endOffsets": "524,577,630,682,734" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\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": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "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" }, "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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", + "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" + "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" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "532", + "startOffsets": "420", "endColumns": "56", - "endOffsets": "584" + "endOffsets": "472" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,412", + "startOffsets": "105,300", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "407,527" + "endOffsets": "295,415" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\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": "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" + "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,2851,-1,-1,-1,-1,-1,-1,-1,-1" }, "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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", + "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" + "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" } } ] diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json index e447fcc..df307f5 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -6,92 +6,82 @@ { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "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": "589,641,694,747,799", + "startOffsets": "477,529,582,635,687", "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" + "endOffsets": "524,577,630,682,734" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\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": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "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" }, "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": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", + "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": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" + "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" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "532", + "startOffsets": "420", "endColumns": "56", - "endOffsets": "584" + "endOffsets": "472" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,412", + "startOffsets": "105,300", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "407,527" + "endOffsets": "295,415" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\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": "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" + "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,2851,-1,-1,-1,-1,-1,-1,-1,-1" }, "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": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", + "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", "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": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" + "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" } } ] diff --git a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml index 04485e9..9680ab0 100644 --- a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index f3019d8..a27805d 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Aug 31 10:51:31 CST 2022 +#Wed Aug 31 23:17:03 CST 2022 D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat @@ -37,8 +37,8 @@ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat @@ -73,13 +73,13 @@ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index dfa7135..5e87c93 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml @@ -1,10 +1,10 @@ - -%s - --%s - --%s - --%s + -%s + --%s + --%s + --%s Messaging @@ -18,7 +18,7 @@ 33sp %1$s result for \"%2$s\" - + %1$s results for \"%2$s\" Confirm to delete folder and its notes? @@ -132,8 +132,8 @@ @color/secondary_text_dark 短信 邮件 diff --git a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 057470c..d51d8fc 100644 --- a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Aug 31 10:53:24 CST 2022 +#Wed Aug 31 23:17:19 CST 2022 base.0=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 16bb1a34719e6c0a0458bd20d9316ef59a546c3a..b0bfb1eb9138349e46e3c6faf5be01ca0ebbeae2 100644 GIT binary patch delta 1054 zcmYM!ZD?Cn7zgk?&*@Flo0qj|o15IEP1}hT3RaWrZPTP(X35$vnM+g3=1>^u=G&Z5 z-=X3LZi014@<(Pj=L=&9bxLc7isCkKzEx1f*?n5O;WoPuVq?`$lX-jE*bC?I`#*m! z=YBZca;luta~Wcre4I90s>Sxt4e#&!E&kP7(1+-w!k#QIRTng9WM$IA?4n&e4~4Pv4uT$&+K}@M^W`5f?QO+39)pYLB_m#w zjakX(y(SefbqW6Ns^r+Z9`0C>ykN0?Q8HQ+=UbO7YIvz8E@o^hhRBcE znohCcS@BqHH9BeyQF_!RyRq6{c7Bf*pN`quLHZfZzC6d5tbvAcUxJ5kO3wRCQTBP{ zEBor~FzRCBcuOTG#j)F0U9V!kE-J>%wQSVK#Dl$+oDl9!6|0!Dx-(nWve96Ovm>k7 zuVTC*DmL$4%avf938@LElUBEv3;mwFn igZL!UPf6U2+!0dR`nCsNwAq%IcjXtbx({JQ3^$`ThS-PTq6# zo@%C=QHyzElYHzZQzmBOlJ%n6W67@bSY?@I#fp#YNxpIjTOASnYftg< z*CmG<()|4!lAjtpbVSmkB>BN(lB0^w{GsG2CB?O6u7ks&Q4Sf$y?k|A78e{kUq34u zaK_nu9w(jcc+{!UdpO}7;d7T{5pwC2MbS0HwIA`hdmX-WX*~UlWYn#5XD%6_0xx zu+giDxxEfK8~66`tv?{vq+;Hiqbk~)N<4DYC<2&hO7jyn$;BpJH2Pffl^1+gXugE_ zI#$nJ;@lmpZdS19i;H9WTGpBq;-#K?PK(>O*R7yp%oYaLveu%B%J6FTE0}1Bi--5D z diff --git a/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index cdd91a8..1be066b 100644 --- a/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -74,200 +74,198 @@ 45-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" 46-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 +47 android:windowSoftInputMode="adjustPan" > +47-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 +48 +48-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 +49 +49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:17-69 +49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:25-66 +50 +51 +51-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:17-77 +51-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:27-74 +52 +53 +54 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 +57 android:launchMode="singleTop" +57-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 +58 android:theme="@style/NoteTheme" > +58-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 +59 +59-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 +60 +60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:17-69 +60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:25-66 +61 +62 +62-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +62-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +63 +64 +64-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 +64-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 +65 65-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 65-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 +66 +67 +67-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 +68 +68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:17-79 +68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:25-76 +69 +70 +70-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +70-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +71 +72 +72-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 +72-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 +73 73-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 73-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +74 +75 +75-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 +76 +76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:17-71 +76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:25-68 +77 +78 +78-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +78-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +79 +80 +81 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 +82 android:name="android.app.searchable" +82-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 +83 android:resource="@xml/searchable" /> +83-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 +84 +85 +86 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 +88 android:authorities="micode_notes" +88-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 +89 android:multiprocess="true" /> +89-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 +90 +91 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 +93 android:label="@string/app_widget2x2" > +93-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 +94 +94-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +95 +95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 +95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 +96 +96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 +96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 +97 +97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 +97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 +98 +99 +100 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +101 android:name="android.appwidget.provider" +101-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +103 +104 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 +106 android:label="@string/app_widget4x4" > +106-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 +107 +107-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +108 +108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 +108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 +109 +109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 +109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 +110 +110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 +110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 +111 +112 +113 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +114 android:name="android.appwidget.provider" +114-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +116 +117 +117-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:9-120:20 +117-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:19-55 +118 +118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 +119 +119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:17-79 +119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:25-76 +120 +121 +122 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 +124 android:process=":remote" > +124-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 +125 +126 +127 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 +129 android:label="@string/app_name" +129-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 +130 android:launchMode="singleInstance" +130-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:131:13-75 +132 +133 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 +135 android:label="@string/preferences_title" +135-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 +136 android:launchMode="singleTop" +136-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 +138 +139 +140 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 +142 android:exported="false" > +142-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 +143 +144 +145 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 +146 android:name="android.app.default_searchable" +146-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 +148 +149 +150 diff --git a/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 04485e9..9680ab0 100644 --- a/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index dd68176769fb745e048804234d9906cb5076e0ee..fc7566b41a81589bcc1c53233d2160f42e6204f6 100644 GIT binary patch delta 4006 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 delta 4035 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 delta 9771 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 diff --git a/src/project1/app/src/main/res/values/styles.xml b/src/project1/app/src/main/res/values/styles.xml index d750e65..76e8d4e 100644 --- a/src/project1/app/src/main/res/values/styles.xml +++ b/src/project1/app/src/main/res/values/styles.xml @@ -63,7 +63,7 @@ \ No newline at end of file