diff --git a/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/project1/.gradle/6.1.1/executionHistory/executionHistory.bin index 0df6ea3..f34c6f2 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 eebbd90..c7cc915 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 8bc6958..c6384dc 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 93c1eb8..f26f1f8 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/buildOutputCleanup/buildOutputCleanup.lock b/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a9b17fa..c5fa285 100644 Binary files a/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/project1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/project1/.idea/gradle.xml b/src/project1/.idea/gradle.xml index 440480e..5cd135a 100644 --- a/src/project1/.idea/gradle.xml +++ b/src/project1/.idea/gradle.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json index 8eb24ee..0aaa464 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -6,92 +6,82 @@ { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", + "startOffsets": "477,529,582,635,687", "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" + "endOffsets": "524,577,630,682,734" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "532", + "startOffsets": "420", "endColumns": "56", - "endOffsets": "584" + "endOffsets": "472" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,412", + "startOffsets": "105,300", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "407,527" + "endOffsets": "295,415" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", + "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" + "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" } } ] diff --git a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json index e447fcc..df307f5 100644 --- a/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/project1/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -6,92 +6,82 @@ { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", "startColumns": "4,4,4,4,4", - "startOffsets": "589,641,694,747,799", + "startOffsets": "477,529,582,635,687", "endColumns": "51,52,52,51,51", - "endOffsets": "636,689,742,794,846" + "endOffsets": "524,577,630,682,734" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271" + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "532", + "startOffsets": "420", "endColumns": "56", - "endOffsets": "584" + "endOffsets": "472" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", "startColumns": "4,4", - "startOffsets": "105,412", + "startOffsets": "105,300", "endLines": "7,11", "endColumns": "19,19", - "endOffsets": "407,527" + "endOffsets": "295,415" } }, { "source": "D:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8276,8480,8691,8898,9058,9241,9426,9611,9814,10020,10203", + "startOffsets": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8475,8686,8893,9053,9236,9421,9606,9809,10015,10198,10399" + "endOffsets": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" } } ] diff --git a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml index 04485e9..9680ab0 100644 --- a/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index f3019d8..a27805d 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Aug 31 10:51:31 CST 2022 +#Wed Aug 31 23:17:03 CST 2022 D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat @@ -37,8 +37,8 @@ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat @@ -73,13 +73,13 @@ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_ D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat D\:\\git\\xiaomi\\src\\project1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index dfa7135..5e87c93 100644 --- a/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/project1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml @@ -1,10 +1,10 @@ - -%s - --%s - --%s - --%s + -%s + --%s + --%s + --%s Messaging @@ -18,7 +18,7 @@ 33sp %1$s result for \"%2$s\" - + %1$s results for \"%2$s\" Confirm to delete folder and its notes? @@ -132,8 +132,8 @@ @color/secondary_text_dark 短信 邮件 diff --git a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 057470c..d51d8fc 100644 --- a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Aug 31 10:53:24 CST 2022 +#Wed Aug 31 23:17:19 CST 2022 base.0=D\:\\git\\xiaomi\\src\\project1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/project1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 16bb1a3..b0bfb1e 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 4c3d148..43fa317 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 @@ -45,7 +45,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index cdd91a8..1be066b 100644 --- a/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/project1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -74,200 +74,198 @@ 45-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" 46-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 +47 android:windowSoftInputMode="adjustPan" > +47-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 +48 +48-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:47:13-50:29 +49 +49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:17-69 +49-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:48:25-66 +50 +51 +51-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:17-77 +51-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:49:27-74 +52 +53 +54 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:53:9-81:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:54:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:55:13-74 +57 android:launchMode="singleTop" +57-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:56:13-43 +58 android:theme="@style/NoteTheme" > +58-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:57:13-45 +59 +59-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:59:13-64:29 +60 +60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:17-69 +60-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:60:25-66 +61 +62 +62-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +62-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +63 +64 +64-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 +64-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 +65 65-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 65-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 +66 +67 +67-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:66:13-71:29 +68 +68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:17-79 +68-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:67:25-76 +69 +70 +70-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +70-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +71 +72 +72-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 +72-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 +73 73-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 73-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +74 +75 +75-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:73:13-76:29 +76 +76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:17-71 +76-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:74:25-68 +77 +78 +78-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:17-76 +78-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:61:27-73 +79 +80 +81 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:78:13-80:54 +82 android:name="android.app.searchable" +82-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:79:17-54 +83 android:resource="@xml/searchable" /> +83-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:80:17-51 +84 +85 +86 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:83:9-86:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:84:13-63 +88 android:authorities="micode_notes" +88-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:85:13-47 +89 android:multiprocess="true" /> +89-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:86:13-40 +90 +91 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:88:9-100:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:89:13-57 +93 android:label="@string/app_widget2x2" > +93-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:90:13-50 +94 +94-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +95 +95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 +95-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 +96 +96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 +96-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 +97 +97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 +97-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 +98 +99 +100 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +101 android:name="android.appwidget.provider" +101-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +103 +104 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:101:9-114:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:102:13-57 +106 android:label="@string/app_widget4x4" > +106-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:103:13-50 +107 +107-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:91:13-95:29 +108 +108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:17-84 +108-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:92:25-81 +109 +109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:17-85 +109-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:93:25-82 +110 +110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:17-85 +110-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:94:25-82 +111 +112 +113 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:97:13-99:58 +114 android:name="android.appwidget.provider" +114-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:98:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:99:17-55 +116 +117 +117-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:9-120:20 +117-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:116:19-55 +118 +118-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:117:13-119:29 +119 +119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:17-79 +119-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:118:25-76 +120 +121 +122 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:122:9-125:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:123:13-61 +124 android:process=":remote" > +124-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:124:13-38 +125 +126 +127 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:127:9-132:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:128:13-50 +129 android:label="@string/app_name" +129-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:129:13-45 +130 android:launchMode="singleInstance" +130-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:130:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:131:13-75 +132 +133 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:134:9-139:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:135:13-71 +135 android:label="@string/preferences_title" +135-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:136:13-54 +136 android:launchMode="singleTop" +136-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:137:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:138:13-60 +138 +139 +140 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:141:9-144:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:142:13-74 +142 android:exported="false" > +142-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:143:13-37 +143 +144 +145 D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:146:9-148:52 +146 android:name="android.app.default_searchable" +146-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:147:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:148:13-49 +148 +149 +150 diff --git a/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 04485e9..9680ab0 100644 --- a/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/project1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -44,7 +44,6 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/project1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index dd68176..fc7566b 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/res/merged/debug/values_values.arsc.flat b/src/project1/app/build/intermediates/res/merged/debug/values_values.arsc.flat index b85f41d..00da6aa 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/outputs/apk/debug/app-debug.apk b/src/project1/app/build/outputs/apk/debug/app-debug.apk index 8d94b83..b5b55ef 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 808cb02..b6c5a05 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 @@ -85,8 +85,6 @@ ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:38:9-51:2 ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges ADDED from D:\git\xiaomi\src\project1\app\src\main\AndroidManifest.xml:40:13-74 android:theme diff --git a/src/project1/app/src/main/AndroidManifest.xml b/src/project1/app/src/main/AndroidManifest.xml index e5c7d47..cee9095 100644 --- a/src/project1/app/src/main/AndroidManifest.xml +++ b/src/project1/app/src/main/AndroidManifest.xml @@ -41,7 +41,7 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:windowSoftInputMode="adjustPan" > diff --git a/src/project1/app/src/main/res/values/styles.xml b/src/project1/app/src/main/res/values/styles.xml index d750e65..76e8d4e 100644 --- a/src/project1/app/src/main/res/values/styles.xml +++ b/src/project1/app/src/main/res/values/styles.xml @@ -63,7 +63,7 @@ \ No newline at end of file