diff --git a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin index f34c6f2..ce64399 100644 Binary files a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin differ diff --git a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock index bb762c3..f3b367b 100644 Binary files a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.lock differ diff --git a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin index c6384dc..be235dd 100644 Binary files a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.bin differ diff --git a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock index 5c85813..074b5f0 100644 Binary files a/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/project1/.gradle/6.1.1/fileHashes/fileHashes.lock differ diff --git a/src/project1/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/project1/.gradle/6.1.1/fileHashes/resourceHashesCache.bin index 64884b4..3f169b7 100644 Binary files a/src/project1/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/project1/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/src/project1/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/project1/.gradle/6.1.1/javaCompile/javaCompile.lock index 76274a7..4554fa8 100644 Binary files a/src/project1/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/project1/.gradle/6.1.1/javaCompile/javaCompile.lock differ diff --git a/src/project1/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/project1/.gradle/6.1.1/javaCompile/taskHistory.bin index f2aa322..9376173 100644 Binary files a/src/project1/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/project1/.gradle/6.1.1/javaCompile/taskHistory.bin differ diff --git a/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4ddb9fc..4036d0a 100644 Binary files a/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/project1/.gradle/buildOutputCleanup/outputFiles.bin b/src/project1/.gradle/buildOutputCleanup/outputFiles.bin index 5fc3fad..2da2534 100644 Binary files a/src/project1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/project1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/project1/.idea/caches/build_file_checksums.ser b/src/project1/.idea/caches/build_file_checksums.ser index fc66efd..4310268 100644 Binary files a/src/project1/.idea/caches/build_file_checksums.ser and b/src/project1/.idea/caches/build_file_checksums.ser differ diff --git a/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml b/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml deleted file mode 100644 index 1bde125..0000000 --- a/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_32.xml b/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_32.xml new file mode 100644 index 0000000..f137d47 --- /dev/null +++ b/src/project1/.idea/libraries/Gradle__org_apache_http_legacy_android_32.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/project1/.idea/misc.xml b/src/project1/.idea/misc.xml index 7bfef59..37a7509 100644 --- a/src/project1/.idea/misc.xml +++ b/src/project1/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/src/project1/.idea/modules/app/app.iml b/src/project1/.idea/modules/app/app.iml index 2ca9b09..3f8ef90 100644 --- a/src/project1/.idea/modules/app/app.iml +++ b/src/project1/.idea/modules/app/app.iml @@ -85,8 +85,8 @@ - + - + \ No newline at end of file diff --git a/src/project1/.idea/workspace.xml b/src/project1/.idea/workspace.xml index ad59610..92fb9b6 100644 --- a/src/project1/.idea/workspace.xml +++ b/src/project1/.idea/workspace.xml @@ -6,13 +6,263 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -45,7 +295,9 @@ + + @@ -132,17 +384,23 @@ - - + + + - - + + + + + + + diff --git a/src/project1/app/build.gradle b/src/project1/app/build.gradle index 7e49bac..981ea64 100644 --- a/src/project1/app/build.gradle +++ b/src/project1/app/build.gradle @@ -1,13 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 + compileSdkVersion 32 buildToolsVersion "30.0.0" defaultConfig { applicationId "net.micode.notes" useLibrary'org.apache.http.legacy' - targetSdkVersion 14 + targetSdkVersion 32 + } buildTypes { 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 0aaa464..21064e5 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 @@ -1,103 +1,79 @@ { "logs": [ { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\strings.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" - } - }, - { - "source": "D:\\git\\xiaomi\\src\\project1\\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" + "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" }, "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" + "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", + "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,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", + "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" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "12", + "startLines": "2", "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } - }, + } + ] + }, + { + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\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,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": "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": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" - } - } - ] - }, - { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\readNotes\\src\\project1\\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": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "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": "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" + "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" }, "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", @@ -107,67 +83,101 @@ "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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" } + } + ] + }, + { + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", + "map": [ + { + "source": "D:\\readNotes\\src\\project1\\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": "589,641,694,747,799", + "endColumns": "51,52,52,51,51", + "endOffsets": "636,689,742,794,846" + } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "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" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "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", + "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" } - } - ] - }, - { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ + }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values\\arrays.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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "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" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "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", - "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,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", - "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" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,412", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "407,527" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\readNotes\\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": "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,2918,2696,1098,1287,1476,1685,1897,911,2104" + }, + "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,8907,9067,9250,9435,9620,9823,10029,10212", + "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,8902,9062,9245,9430,9615,9818,10024,10207,10408" + } + }, + { + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { - "startLines": "2", + "startLines": "12", "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startOffsets": "532", + "endColumns": "56", + "endOffsets": "584" } } ] diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json index b4e004c..ed7ecd0 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json @@ -1,17 +1,17 @@ { "logs": [ { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\readNotes\\src\\project1\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "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": "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" + "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" }, "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", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json index 36a8e3b..2bd6de9 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json @@ -1,36 +1,17 @@ { "logs": [ { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "D:\\git\\xiaomi\\src\\project1\\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": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "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": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,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", - "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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\readNotes\\src\\project1\\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" + }, + "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", + "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": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,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", + "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": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } 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 df307f5..e88ab25 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 @@ -1,87 +1,97 @@ { "logs": [ { - "outputFile": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\readNotes\\src\\project1\\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" + "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", + "startOffsets": "589,641,694,747,799", "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "endOffsets": "636,689,742,794,846" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\readNotes\\src\\project1\\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" + "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" }, "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", + "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", "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" - } - }, - { - "source": "D:\\git\\xiaomi\\src\\project1\\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" + "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" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,300", + "startOffsets": "105,412", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "295,415" + "endOffsets": "407,527" } }, { - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\readNotes\\src\\project1\\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,2851,-1,-1,-1,-1,-1,-1,-1,-1" + "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,2918,2696,1098,1287,1476,1685,1897,911,2104" }, "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,8755,8915,9098,9283,9468,9671,9877,10060", + "startOffsets": "8276,8480,8691,8907,9067,9250,9435,9620,9823,10029,10212", "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,8750,8910,9093,9278,9463,9666,9872,10055,10256" + "endOffsets": "8475,8686,8902,9062,9245,9430,9615,9818,10024,10207,10408" + } + }, + { + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "532", + "endColumns": "56", + "endOffsets": "584" } } ] diff --git a/src/project1/app/build/intermediates/blame/res/debug/single/debug.json b/src/project1/app/build/intermediates/blame/res/debug/single/debug.json index b5214a7..93471b1 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/single/debug.json +++ b/src/project1/app/build/intermediates/blame/res/debug/single/debug.json @@ -1,382 +1,382 @@ [ { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw\\introduction" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\sub_folder.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\preferences.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\widget_2x.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\settings_header.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\raw\\introduction" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\color\\primary_text_dark.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable\\new_note.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\widget_4x.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\preferences.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\call_record_folder.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_item.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_edit.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\clock.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list_options.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\sub_folder.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_edit.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable\\new_note.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\widget_4x.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\searchable.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_item.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list_footer.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\settings_header.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\call_note_edit.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\add_account_text.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\call_record_folder.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list_options.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_edit.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list_footer.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\folder_list_item.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\searchable.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_edit.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\widget_2x.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "D:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list.xml" + "merged": "D:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", + "source": "D:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\add_account_text.xml" } ] \ No newline at end of file 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 9680ab0..6cc8115 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 @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="20" + android:targetSdkVersion="32" /> diff --git a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json index a5a8b69..3797ee6 100644 --- a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json +++ b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "20" } } ] diff --git a/src/project1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/project1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 80d90c5..77e2e17 100644 Binary files a/src/project1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/project1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/project1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/project1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index a1b858f..6fa5a4d 100644 Binary files a/src/project1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/project1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/project1/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/src/project1/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state index 1673ec0..b2bccbe 100644 Binary files a/src/project1/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and b/src/project1/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state differ diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/project1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index be5d84b..0c638f1 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/project1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index e016ed4..2b66a49 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index a27805d..474def3 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,96 +1,96 @@ -#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 -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw\\introduction=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -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\\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 -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat -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\\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\\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 -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat +#Sat Oct 22 09:36:11 CST 2022 +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\raw\\introduction=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat +D\:\\readNotes\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\readNotes\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.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 new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %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 new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %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 5e87c93..c396c69 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? diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 061f644..9c0c259 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #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 + #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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/project1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 5b9552a..2541f7c 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/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 d51d8fc..64cf6d9 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 23:17:19 CST 2022 -base.0=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Sat Oct 22 09:36:23 CST 2022 +base.0=D\:\\readNotes\\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 b0bfb1e..e470c0d 100644 Binary files a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/project1/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/project1/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 43fa317..c288b5b 100644 --- a/src/project1/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -21,8 +21,8 @@ android:versionName="0.1" > + android:minSdkVersion="20" + android:targetSdkVersion="32" /> diff --git a/src/project1/app/build/intermediates/instant_app_manifest/debug/output.json b/src/project1/app/build/intermediates/instant_app_manifest/debug/output.json index e981797..2b162b2 100644 --- a/src/project1/app/build/intermediates/instant_app_manifest/debug/output.json +++ b/src/project1/app/build/intermediates/instant_app_manifest/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "20" } } ] 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 1be066b..380d87f 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 @@ -20,252 +20,251 @@ 20 android:versionName="0.1" > 21 22 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="1" -23-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -24-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 +23 android:minSdkVersion="20" +23-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml +24 android:targetSdkVersion="32" /> +24-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml 25 26 -26-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:23:5-81 +26-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:23:22-78 27 -27-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:24:5-88 +27-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:24:22-85 28 -28-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:25:5-67 +28-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:25:22-64 29 -29-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:26:5-72 +29-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:26:22-69 30 -30-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:27:5-74 +30-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:27:22-71 31 -31-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:28:5-80 +31-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:28:22-77 32 -32-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:29:5-71 +32-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:29:22-68 33 -33-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:30:5-74 +33-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:30:22-71 34 -34-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:31:5-81 +34-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:31:22-78 35 36 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:33:5-147:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:34:9-42 39 android:label="@string/app_name" -39-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:35:9-41 40 android:testOnly="true" > 41 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:36:9-49:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:37:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:38:13-74 44 android:label="@string/app_name" -44-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:39:13-45 45 android:launchMode="singleTop" -45-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:40:13-43 46 android:theme="@style/NoteTheme" -46-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:41:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 +47-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:43:13-52 48 -48-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 +48-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:45:13-48: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 +49-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:46:17-69 +49-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:46: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 +51-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:47:17-77 +51-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:47:27-74 52 53 54 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 +54-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:51:9-79:20 55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 +55-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:52:13-48 56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 +56-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:53:13-74 57 android:launchMode="singleTop" -57-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 +57-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:54:13-43 58 android:theme="@style/NoteTheme" > -58-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 +58-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:55:13-45 59 -59-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 +59-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:57:13-62: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 +60-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:58:17-69 +60-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:58: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 +62-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:17-76 +62-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59: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 +64-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:17-78 +64-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60: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 +65-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:17-78 +65-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:23-75 66 67 -67-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 +67-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:64:13-69: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 +68-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:65:17-79 +68-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:65: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 +70-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:17-76 +70-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59: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 +72-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:17-78 +72-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60: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 +73-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:17-78 +73-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:23-75 74 75 -75-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 +75-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:71:13-74: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 +76-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:72:17-71 +76-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:72: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 +78-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:17-76 +78-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:27-73 79 80 81 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 +81-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:76:13-78:54 82 android:name="android.app.searchable" -82-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 +82-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:77:17-54 83 android:resource="@xml/searchable" /> -83-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 +83-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:78:17-51 84 85 86 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 +86-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:81:9-84:43 87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 +87-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:82:13-63 88 android:authorities="micode_notes" -88-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 +88-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:83:13-47 89 android:multiprocess="true" /> -89-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 +89-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:84:13-40 90 91 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 +91-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:86:9-98:20 92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 +92-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:87:13-57 93 android:label="@string/app_widget2x2" > -93-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 +93-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:88:13-50 94 -94-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +94-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:89:13-93: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 +95-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90:17-84 +95-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90: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 +96-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91:17-85 +96-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91: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 +97-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:17-85 +97-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:25-82 98 99 100 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +100-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:95:13-97:58 101 android:name="android.appwidget.provider" -101-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +101-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:96:17-58 102 android:resource="@xml/widget_2x_info" /> -102-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +102-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:97:17-55 103 104 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 +104-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:99:9-112:20 105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 +105-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:100:13-57 106 android:label="@string/app_widget4x4" > -106-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 +106-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:101:13-50 107 -107-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +107-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:89:13-93: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 +108-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90:17-84 +108-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90: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 +109-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91:17-85 +109-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91: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 +110-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:17-85 +110-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:25-82 111 112 113 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +113-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:95:13-97:58 114 android:name="android.appwidget.provider" -114-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +114-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:96:17-58 115 android:resource="@xml/widget_4x_info" /> -115-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +115-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:97: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 +117-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:114:9-118:20 +117-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:114:19-55 118 -118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 +118-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:115:13-117: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 +119-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:116:17-79 +119-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:116:25-76 120 121 122 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 +122-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:120:9-123:20 123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 +123-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:121:13-61 124 android:process=":remote" > -124-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 +124-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:122:13-38 125 126 127 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 +127-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:125:9-130:20 128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 +128-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:126:13-50 129 android:label="@string/app_name" -129-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 +129-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:127:13-45 130 android:launchMode="singleInstance" -130-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 +130-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:128: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 +131-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:129:13-75 132 133 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 +133-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:132:9-137:20 134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 +134-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:133:13-71 135 android:label="@string/preferences_title" -135-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 +135-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:134:13-54 136 android:launchMode="singleTop" -136-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 +136-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:135:13-43 137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 +137-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:136:13-60 138 139 140 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 +140-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:139:9-142:19 141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 +141-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:140:13-74 142 android:exported="false" > -142-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 +142-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:141:13-37 143 144 145 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 +145-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:144:9-146:52 146 android:name="android.app.default_searchable" -146-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 +146-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:145:13-58 147 android:value=".ui.NoteEditActivity" /> -147-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 +147-->D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:146: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 9680ab0..6cc8115 100644 --- a/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,8 +20,8 @@ android:versionName="0.1" > + android:minSdkVersion="20" + android:targetSdkVersion="32" /> diff --git a/src/project1/app/build/intermediates/merged_manifests/debug/output.json b/src/project1/app/build/intermediates/merged_manifests/debug/output.json index b781455..7448634 100644 --- a/src/project1/app/build/intermediates/merged_manifests/debug/output.json +++ b/src/project1/app/build/intermediates/merged_manifests/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "20" } } ] diff --git a/src/project1/app/build/intermediates/processed_res/debug/out/output.json b/src/project1/app/build/intermediates/processed_res/debug/out/output.json index 8c58a0e..c38db55 100644 --- a/src/project1/app/build/intermediates/processed_res/debug/out/output.json +++ b/src/project1/app/build/intermediates/processed_res/debug/out/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "20" } } ] 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 fc7566b..a66f2f0 100644 Binary files a/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar index 3d17d9a..8d505c6 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar index bac49f6..6b6996a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar index 41358d2..3bea18e 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar index 01039ee..f5b6468 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex index 9673c85..71a606a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 75ec813..c817fb8 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 945ace2..7c43c75 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex index 255f10a..d19c2f7 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index 2a2b130..d310746 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index 116b081..8af390e 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index bfddfee..21c502c 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index d105ac1..5f921b0 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index ef5fbf3..901ecf0 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index d99883f..e74339b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 82de025..93561cd 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index 7d774da..78320e7 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index 4e4d086..de9868c 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index 9a14b9f..bc5b3d3 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index cba5c9d..6d191df 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 70eda56..7015887 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 8be20b6..5998538 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index d29f7ef..f5a9ed9 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index a23ddcb..ed38f00 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index b6c5e21..b36ee82 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index 1a49021..295fa9a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index ccf4acb..16fe62d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 0ea4add..d2c6061 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 71e70e2..0ebe312 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index 985ceed..195bab4 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index 77970d4..ac3d116 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index d60c5ed..8b3388f 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 9a05ca7..33e25fc 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 961490d..51b39c7 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 41183c4..579d427 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 62df3b2..3a8012b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 2929c7d..a3206d5 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 913da50..6424f35 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex index a159d48..bc0ca4f 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index ef773d9..2f15a61 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index 1a407ec..c98c28f 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 077b1cf..436a7d5 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index a20bde5..418fc7b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index 6731844..baa7784 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 9cc7bf3..20d4d8d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index b6452ff..f796372 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 4d48216..b0393f7 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index 455357c..edcd18d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index b4d1662..923cfc6 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index a3c8a92..06da160 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index b07a56b..385c2c9 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index 640f6c0..b677403 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index c6ccf82..73f9f61 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 3dd2070..1125dc2 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index 855ecae..089d567 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index b6eef18..b3e9aed 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index 915ba18..3914b29 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 988b222..489f791 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 6cadfc6..edd0941 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 0bee083..d34733a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 2b0ef77..0442952 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 07ea9d7..6be02a8 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index bfd8504..f7972c9 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index d21e5b2..e514a62 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 7058dc0..331ab0a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index 2f860ff..094874e 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index a10b711..9a1bf39 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 06e8c97..693917e 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 2223e8a..c96c0e3 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 0fb154d..9ae1c00 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 852fe6d..fa8c93d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index b29dec2..03408f2 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 620f991..5301e4d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 310238a..d757963 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 4c7b295..151e5a0 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 1418edb..759db1d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e074074..7f6c621 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index b4e2052..fbc74a6 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index aea776d..3bbad18 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 1f04798..5c89aaa 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index a1c8325..52e9c5b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index f9ef937..f106111 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 75652b4..3b62d3b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 179b08c..0a373ea 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index dbbce38..6cba7c3 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index b64c7e8..806f256 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index 030b901..dc24f7f 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index e134e00..f3a414b 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 4f7249c..c523661 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 650c055..dd7e299 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index 91bb107..4e7e58d 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 5b13567..ee98189 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index 7d795a4..2afcfa3 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index 18dd3c6..9c3de1a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index 0534fe4..3511139 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index d8e73e0..494ea9a 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 193356e..d142a02 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 48423c9..baafabf 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index e5e6a69..a3ad83c 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 96b992c..d77d153 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 52a0936..f4d6b46 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index b39ce4f..4098688 100644 Binary files a/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/project1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat index 28968a1..8b2e284 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat index 6243017..264204d 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat index 125cdc7..10b18c8 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat index 61095d5..0cda326 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat index 5858043..779383f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat index 67107af..1ef0cee 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat index c180cd5..28cf409 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat index 09e2d30..feaf128 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat index 5670645..58655f5 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat index 65003ca..ecc7bd4 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat index 91db4d6..857f186 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat index fc2918f..cb0b265 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat index fd0bac2..8085379 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat index 9bcdd7e..2cb203f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat index 2004c03..e3c2750 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat index d7f804b..52404ad 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat index d6f57e3..3651ec0 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat index 39f95ff..524a828 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat index d54cc46..466e063 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat index dc23fe1..54ce93a 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index b46171c..122fc19 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat index 84f5301..f24331e 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat index 9d19894..909da58 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat index ca4c4f0..bf1a546 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat index 03a6677..a81dbbf 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat index 63c53a7..36bd759 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat index aae5c04..45eee02 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat index afa85a5..0be8634 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat index c08f2f6..b1ccd8f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat index b3c98d1..ef69043 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat index 9b407c4..3ae2e4c 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat index 40449f6..deb392b 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat index 19e0b2a..cf82657 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat index 15190b2..d8f3f87 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat index f6efc5d..052cbe1 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat index 05017e2..c3d2b5f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat index 3b582ad..dd6093f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat index 8011a04..ad800d9 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat index 357df47..91b57ed 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat index 89b9504..f88c244 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat index 396630f..c7f28de 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat index 6b8d179..a1c30bd 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat index dccfb6e..6018745 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat index 9a02ce1..e63a264 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat index 2f9bac8..405f514 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat index 80bf587..30a4f31 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat index 6bb5f35..9e06655 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat index 0a228cb..5d11709 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat index f8d52c0..4f8f540 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat index a6365fa..8369fa7 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat index 39a292f..9a6cb8a 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index 990c282..90f6e26 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat index 83798b5..4a38f38 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat index 79aa2d8..d84d03e 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat index e541106..4b248ae 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat index 61b42e3..e5a9307 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat index c7efd7a..59b4957 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat index 1df62dc..5b9542a 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat index 54580e5..66b3c0b 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat index 433a9e5..e92b4c7 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat index bc1f1ca..eb98f2f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat index e277310..ec38dbd 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat index 38901fd..fa33cc7 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat index c7b04da..186f9dc 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat index 22f94b1..5c96e02 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat index 0c6d3fe..cb2a5f0 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat index c10581e..70e8049 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat index a691274..01707a4 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat index c1675f0..92f60fc 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat index 41fb1cb..0940c00 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat index 6125871..4593af6 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat index f48d6fb..6b61ac5 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat index 33a336f..17764e3 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat index f6c0ff9..2aa2d0d 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat index 3db1017..6aa085f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat index 18061cd..dacbf8f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat index f8854db..6f61922 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat index 48acf4b..e531dba 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat index 9e53cae..c1b86bf 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat index c24c2c3..2490a3e 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat index 60b0f13..dc273f8 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat index c717c1f..162918f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat index 19f9569..d2dfa0d 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat index abb87f9..7e1b7ea 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat index 8185477..8f8ceb0 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat index 139c76a..9bbf5b8 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat index 2de4dd6..7fb900f 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat index f18635e..de95973 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat index 13d350e..9c2b45b 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/src/project1/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat index 009758c..6f6d6b3 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat and b/src/project1/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/raw_introduction.flat b/src/project1/app/build/intermediates/res/merged/debug/raw_introduction.flat index 2a4f8fb..9d8026d 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/raw_introduction.flat and b/src/project1/app/build/intermediates/res/merged/debug/raw_introduction.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/project1/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 1334fa5..86cebe8 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/project1/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/project1/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat index e7b6886..0a3657b 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/project1/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/project1/app/build/intermediates/res/merged/debug/values_values.arsc.flat index 00da6aa..f234ffd 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/project1/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat index 09c9138..e649936 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat index 2be04d1..59a6b3d 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat index 7f1016a..d120b69 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/project1/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat b/src/project1/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat index d5f1712..642c7c5 100644 Binary files a/src/project1/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat and b/src/project1/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/project1/app/build/outputs/apk/debug/app-debug.apk b/src/project1/app/build/outputs/apk/debug/app-debug.apk index b5b55ef..3a85b06 100644 Binary files a/src/project1/app/build/outputs/apk/debug/app-debug.apk and b/src/project1/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/project1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/project1/app/build/outputs/logs/manifest-merger-debug-report.txt index b6c5a05..99f0c8d 100644 --- a/src/project1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/project1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,233 +1,233 @@ -- Merging decision tree log --- manifest -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:1-148:12 package - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 - android:targetSdkVersion - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml - INJECTED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:23:5-81 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:23:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:24:5-88 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:24:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:25:5-67 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:25:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:26:5-72 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:26:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:27:5-74 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:27:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:28:5-80 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:28:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:29:5-71 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:29:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:31:5-81 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:31:22-78 application -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:33:5-147:19 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:35:9-41 android:icon - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:34:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:36:9-49:20 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:39:13-45 android:launchMode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:40:13-43 android:windowSoftInputMode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:43:13-52 android:configChanges - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:38:13-74 android:theme - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:41:13-45 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:37:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:45:13-48:29 action#android.intent.action.MAIN -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:46:17-69 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:46:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:47:17-77 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:47:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:51:9-79:20 android:launchMode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:54:13-43 android:configChanges - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:53:13-74 android:theme - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:55:13-45 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:52: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 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:57:13-62:29 action#android.intent.action.VIEW -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:58:17-69 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:58:25-66 category#android.intent.category.DEFAULT -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:17-76 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:59:27-73 data -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60:17-78 android:mimeType - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:60: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 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:64:13-69:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:65:17-79 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:65:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:71:13-74:29 action#android.intent.action.SEARCH -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:72:17-71 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:72:25-68 meta-data#android.app.searchable -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:76:13-78:54 android:resource - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:78:17-51 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:77:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:81:9-84:43 android:authorities - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:83:13-47 android:multiprocess - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:84:13-40 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:82:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:86:9-98:20 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:88:13-50 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:87: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 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:89:13-93:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90:17-84 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:90:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91:17-85 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:91:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:17-85 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:92:25-82 meta-data#android.appwidget.provider -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:95:13-97:58 android:resource - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:97:17-55 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:96:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:99:9-112:20 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:101:13-50 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:100:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:114:9-118:20 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:114:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:115:13-117:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:116:17-79 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:116:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:120:9-123:20 android:process - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:122:13-38 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:121:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:125:9-130:20 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:127:13-45 android:launchMode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:128:13-48 android:theme - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:129:13-75 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:126:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:132:9-137:20 android:label - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:134:13-54 android:launchMode - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:135:13-43 android:theme - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:136:13-60 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:133:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:139:9-142:19 android:exported - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:141:13-37 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:140:13-74 meta-data#android.app.default_searchable -ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:144:9-146:52 android:value - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:146:13-49 android:name - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml:145:13-58 +uses-sdk +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml +INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + ADDED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml + INJECTED from D:\readNotes\src\project1\app\src\main\AndroidManifest.xml diff --git a/src/project1/app/src/main/AndroidManifest.xml b/src/project1/app/src/main/AndroidManifest.xml index cee9095..216bb5b 100644 --- a/src/project1/app/src/main/AndroidManifest.xml +++ b/src/project1/app/src/main/AndroidManifest.xml @@ -20,8 +20,6 @@ android:versionCode="1" android:versionName="0.1" > - - diff --git a/src/project1/local.properties b/src/project1/local.properties index f063061..bc89ca7 100644 --- a/src/project1/local.properties +++ b/src/project1/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Wed Aug 31 10:34:27 CST 2022 -sdk.dir=D\:\\Android\\SDK +# For customization when using a Version Control System, please read the +# header note. +#Sat Oct 22 09:25:08 CST 2022 +sdk.dir=C\:\\Users\\26960\\AppData\\Local\\Android\\Sdk