diff --git a/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.bin index 265f2fc..c915b98 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.lock index 3aa6c32..2871498 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/Notes-master2/.gradle/6.1.1/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.bin index e4c9edd..5746931 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.lock index 0ae63ca..a9a8863 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/Notes-master2/.gradle/6.1.1/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master2/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/Notes-master2/.gradle/6.1.1/fileHashes/resourceHashesCache.bin index 451a7fa..58df124 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/Notes-master2/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master2/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/Notes-master2/.gradle/6.1.1/javaCompile/classAnalysis.bin index 1d5a265..318a588 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/src/Notes-master2/.gradle/6.1.1/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master2/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/Notes-master2/.gradle/6.1.1/javaCompile/jarAnalysis.bin index 3338379..6aa8413 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/src/Notes-master2/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ diff --git a/src/Notes-master2/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/Notes-master2/.gradle/6.1.1/javaCompile/javaCompile.lock index 8e03fe9..936a247 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/Notes-master2/.gradle/6.1.1/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master2/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/Notes-master2/.gradle/6.1.1/javaCompile/taskHistory.bin index 1e54905..0bdf4bd 100644 Binary files a/src/Notes-master2/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/Notes-master2/.gradle/6.1.1/javaCompile/taskHistory.bin differ diff --git a/src/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f919534..ce3cc59 100644 Binary files a/src/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master2/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin index 009ddb2..03eb782 100644 Binary files a/src/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master2/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master2/.gradle/checksums/checksums.lock b/src/Notes-master2/.gradle/checksums/checksums.lock index 17f5699..7b7285d 100644 Binary files a/src/Notes-master2/.gradle/checksums/checksums.lock and b/src/Notes-master2/.gradle/checksums/checksums.lock differ diff --git a/src/Notes-master2/.gradle/checksums/md5-checksums.bin b/src/Notes-master2/.gradle/checksums/md5-checksums.bin index 6542f8b..298e4a1 100644 Binary files a/src/Notes-master2/.gradle/checksums/md5-checksums.bin and b/src/Notes-master2/.gradle/checksums/md5-checksums.bin differ diff --git a/src/Notes-master2/.gradle/checksums/sha1-checksums.bin b/src/Notes-master2/.gradle/checksums/sha1-checksums.bin index 52c2370..687f91b 100644 Binary files a/src/Notes-master2/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master2/.gradle/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master2/.idea/caches/build_file_checksums.ser b/src/Notes-master2/.idea/caches/build_file_checksums.ser index cd6a760..45302b0 100644 Binary files a/src/Notes-master2/.idea/caches/build_file_checksums.ser and b/src/Notes-master2/.idea/caches/build_file_checksums.ser differ diff --git a/src/Notes-master2/.idea/misc.xml b/src/Notes-master2/.idea/misc.xml index 7e1fd57..37a7509 100644 --- a/src/Notes-master2/.idea/misc.xml +++ b/src/Notes-master2/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/src/Notes-master2/.idea/modules/Notes-master2.iml b/src/Notes-master2/.idea/modules/Notes-master2.iml index be3f4ca..48a28d3 100644 --- a/src/Notes-master2/.idea/modules/Notes-master2.iml +++ b/src/Notes-master2/.idea/modules/Notes-master2.iml @@ -8,7 +8,7 @@ - + diff --git a/src/Notes-master2/.idea/modules/app/app.iml b/src/Notes-master2/.idea/modules/app/app.iml index 73cdb8b..f3bd613 100644 --- a/src/Notes-master2/.idea/modules/app/app.iml +++ b/src/Notes-master2/.idea/modules/app/app.iml @@ -25,19 +25,19 @@ - + - + + - - + @@ -85,7 +85,7 @@ - + diff --git a/src/Notes-master2/app/build.gradle b/src/Notes-master2/app/build.gradle index c0920c1..a9bcdf4 100644 --- a/src/Notes-master2/app/build.gradle +++ b/src/Notes-master2/app/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 14 + compileSdkVersion 23 buildToolsVersion "30.0.2" defaultConfig { applicationId "net.micode.notes" - minSdkVersion 14 + //targetSdkVersion 14 + minSdkVersion 23 } buildTypes { @@ -29,4 +30,5 @@ dependencies { implementation files("E:\\xiaomi\\Notes-master\\httpcomponents-client-4.5.12\\lib\\httpclient-osgi-4.5.12.jar") implementation files("E:\\xiaomi\\Notes-master\\httpcomponents-client-4.5.12\\lib\\httpclient-win-4.5.12.jar") implementation files("E:\\xiaomi\\Notes-master\\httpcomponents-client-4.5.12\\lib\\httpcore-4.4.13.jar") + } \ No newline at end of file diff --git a/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/debug.json index e585ff7..2bdfd8e 100644 --- a/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -6,82 +6,92 @@ { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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": "127,71,74,73,72,18,19,20,117,118,126,125,25,80,81,79,78,77,93,92,91,83,38,37,63,28,29,84,40,75,119,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,27,33,35,32,34,31,30,24,23,100,99,103,115,108,107,109,110,112,111,101,102,106,104,105,98,113,114,124,122,121,123,26,82,90,95,94,96,89,88,87,86,21,22", + "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": "8004,3894,4155,4059,3990,823,866,918,7502,7551,7946,7895,1278,4609,4703,4538,4454,4371,5570,5487,5385,4879,2000,1949,3393,1482,1535,4940,2093,4238,7614,3823,3578,2152,2467,2768,2210,3322,3261,3204,2982,2930,2827,2880,3032,3082,2514,3757,3142,3627,2420,2713,2625,2567,3516,2370,3471,2267,2310,3690,1427,1746,1854,1699,1801,1643,1595,1223,1170,6026,5959,6267,7405,6631,6550,6705,6794,7036,6957,6110,6185,6491,6331,6411,5904,7180,7302,7854,7727,7670,7780,1362,4811,5299,5705,5636,5785,5240,5185,5123,5063,970,1080", + "endLines": "131,71,74,73,72,18,19,20,117,118,126,125,25,80,81,79,78,77,93,92,91,83,38,37,63,28,29,84,40,75,119,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,27,33,35,32,34,31,30,24,23,100,99,103,115,108,107,109,110,112,111,101,102,106,104,105,98,113,114,124,122,121,123,26,82,90,95,94,96,89,88,87,86,21,22", + "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": "8407,3985,4233,4150,4054,861,913,965,7546,7609,7999,7941,1357,4698,4806,4604,4533,4449,5631,5565,5482,4935,2057,1995,3466,1530,1590,5040,2147,4335,7664,3889,3622,2205,2509,2822,2262,3388,3317,3256,3027,2977,2875,2925,3077,3137,2562,3818,3199,3685,2462,2763,2708,2620,3573,2415,3511,2305,2365,3752,1477,1796,1902,1741,1849,1694,1638,1273,1218,6105,6021,6326,7496,6700,6626,6789,6952,7175,7031,6180,6262,6545,6406,6486,5954,7297,7400,7890,7775,7722,7849,1422,4874,5380,5780,5700,5874,5294,5235,5180,5118,1075,1165" }, "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,1091,1187,1270,1366,1435,1478,1530,1582,1631,1694,1752,1803,1887,1981,2089,2160,2244,2327,2393,2476,2578,2639,2701,2752,2830,2883,2943,3048,3107,3209,3264,3335,3384,3442,3489,3548,3605,3676,3737,3794,3844,3896,3949,3999,4049,4109,4162,4228,4290,4353,4400,4455,4543,4601,4663,4713,4758,4801,4861,4928,4983,5038,5091,5138,5191,5247,5295,5350,5403,5487,5554,5618,5714,5788,5869,5958,6121,6265,6344,6419,6501,6560,6640,6720,6775,6897,7000,7041,7094,7151,7225,7290,7358,7444,7524,7593,7687,7746,7801,7863,7923,8033", + "startOffsets": "851,1243,1339,1422,1518,1587,1630,1682,1734,1783,1846,1904,1955,2039,2133,2241,2312,2396,2479,2545,2628,2730,2791,2853,2904,2982,3035,3095,3200,3259,3361,3416,3487,3536,3594,3641,3700,3757,3828,3889,3946,3996,4048,4101,4151,4201,4261,4314,4380,4442,4505,4552,4607,4695,4753,4815,4865,4910,4953,5013,5080,5135,5190,5243,5290,5343,5399,5447,5502,5555,5639,5706,5770,5866,5940,6021,6110,6273,6417,6496,6571,6653,6712,6792,6872,6927,7049,7152,7193,7246,7303,7377,7442,7510,7596,7676,7745,7839,7898,7953,8015,8075,8185", "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": "1086,1182,1265,1361,1430,1473,1525,1577,1626,1689,1747,1798,1882,1976,2084,2155,2239,2322,2388,2471,2573,2634,2696,2747,2825,2878,2938,3043,3102,3204,3259,3330,3379,3437,3484,3543,3600,3671,3732,3789,3839,3891,3944,3994,4044,4104,4157,4223,4285,4348,4395,4450,4538,4596,4658,4708,4753,4796,4856,4923,4978,5033,5086,5133,5186,5242,5290,5345,5398,5482,5549,5613,5709,5783,5864,5953,6116,6260,6339,6414,6496,6555,6635,6715,6770,6892,6995,7036,7089,7146,7220,7285,7353,7439,7519,7588,7682,7741,7796,7858,7918,8028,8118" + "endOffsets": "1238,1334,1417,1513,1582,1625,1677,1729,1778,1841,1899,1950,2034,2128,2236,2307,2391,2474,2540,2623,2725,2786,2848,2899,2977,3030,3090,3195,3254,3356,3411,3482,3531,3589,3636,3695,3752,3823,3884,3941,3991,4043,4096,4146,4196,4256,4309,4375,4437,4500,4547,4602,4690,4748,4810,4860,4905,4948,5008,5075,5130,5185,5238,5285,5338,5394,5442,5497,5550,5634,5701,5765,5861,5935,6016,6105,6268,6412,6491,6566,6648,6707,6787,6867,6922,7044,7147,7188,7241,7298,7372,7437,7505,7591,7671,7740,7834,7893,7948,8010,8070,8180,8270" } }, { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "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": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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,2853,-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": "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,2853,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8123,8327,8538,8756,8916,9099,9284,9469,9672,9878,10061", + "startOffsets": "8275,8479,8690,8908,9068,9251,9436,9621,9824,10030,10213", "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": "8322,8533,8751,8911,9094,9279,9464,9667,9873,10056,10257" + "endOffsets": "8474,8685,8903,9063,9246,9431,9616,9819,10025,10208,10409" } }, { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "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": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "420", + "startOffsets": "532", "endColumns": "56", - "endOffsets": "472" + "endOffsets": "584" } } ] diff --git a/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/values.json index 70709d3..dacbff7 100644 --- a/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/Notes-master2/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -6,82 +6,92 @@ { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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": "127,71,74,73,72,18,19,20,117,118,126,125,25,80,81,79,78,77,93,92,91,83,38,37,63,28,29,84,40,75,119,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,27,33,35,32,34,31,30,24,23,100,99,103,115,108,107,109,110,112,111,101,102,106,104,105,98,113,114,124,122,121,123,26,82,90,95,94,96,89,88,87,86,21,22", + "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": "8004,3894,4155,4059,3990,823,866,918,7502,7551,7946,7895,1278,4609,4703,4538,4454,4371,5570,5487,5385,4879,2000,1949,3393,1482,1535,4940,2093,4238,7614,3823,3578,2152,2467,2768,2210,3322,3261,3204,2982,2930,2827,2880,3032,3082,2514,3757,3142,3627,2420,2713,2625,2567,3516,2370,3471,2267,2310,3690,1427,1746,1854,1699,1801,1643,1595,1223,1170,6026,5959,6267,7405,6631,6550,6705,6794,7036,6957,6110,6185,6491,6331,6411,5904,7180,7302,7854,7727,7670,7780,1362,4811,5299,5705,5636,5785,5240,5185,5123,5063,970,1080", + "endLines": "131,71,74,73,72,18,19,20,117,118,126,125,25,80,81,79,78,77,93,92,91,83,38,37,63,28,29,84,40,75,119,70,66,41,47,52,42,62,61,60,56,55,53,54,57,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,27,33,35,32,34,31,30,24,23,100,99,103,115,108,107,109,110,112,111,101,102,106,104,105,98,113,114,124,122,121,123,26,82,90,95,94,96,89,88,87,86,21,22", + "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": "8407,3985,4233,4150,4054,861,913,965,7546,7609,7999,7941,1357,4698,4806,4604,4533,4449,5631,5565,5482,4935,2057,1995,3466,1530,1590,5040,2147,4335,7664,3889,3622,2205,2509,2822,2262,3388,3317,3256,3027,2977,2875,2925,3077,3137,2562,3818,3199,3685,2462,2763,2708,2620,3573,2415,3511,2305,2365,3752,1477,1796,1902,1741,1849,1694,1638,1273,1218,6105,6021,6326,7496,6700,6626,6789,6952,7175,7031,6180,6262,6545,6406,6486,5954,7297,7400,7890,7775,7722,7849,1422,4874,5380,5780,5700,5874,5294,5235,5180,5118,1075,1165" }, "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,1091,1187,1270,1366,1435,1478,1530,1582,1631,1694,1752,1803,1887,1981,2089,2160,2244,2327,2393,2476,2578,2639,2701,2752,2830,2883,2943,3048,3107,3209,3264,3335,3384,3442,3489,3548,3605,3676,3737,3794,3844,3896,3949,3999,4049,4109,4162,4228,4290,4353,4400,4455,4543,4601,4663,4713,4758,4801,4861,4928,4983,5038,5091,5138,5191,5247,5295,5350,5403,5487,5554,5618,5714,5788,5869,5958,6121,6265,6344,6419,6501,6560,6640,6720,6775,6897,7000,7041,7094,7151,7225,7290,7358,7444,7524,7593,7687,7746,7801,7863,7923,8033", + "startOffsets": "851,1243,1339,1422,1518,1587,1630,1682,1734,1783,1846,1904,1955,2039,2133,2241,2312,2396,2479,2545,2628,2730,2791,2853,2904,2982,3035,3095,3200,3259,3361,3416,3487,3536,3594,3641,3700,3757,3828,3889,3946,3996,4048,4101,4151,4201,4261,4314,4380,4442,4505,4552,4607,4695,4753,4815,4865,4910,4953,5013,5080,5135,5190,5243,5290,5343,5399,5447,5502,5555,5639,5706,5770,5866,5940,6021,6110,6273,6417,6496,6571,6653,6712,6792,6872,6927,7049,7152,7193,7246,7303,7377,7442,7510,7596,7676,7745,7839,7898,7953,8015,8075,8185", "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": "1086,1182,1265,1361,1430,1473,1525,1577,1626,1689,1747,1798,1882,1976,2084,2155,2239,2322,2388,2471,2573,2634,2696,2747,2825,2878,2938,3043,3102,3204,3259,3330,3379,3437,3484,3543,3600,3671,3732,3789,3839,3891,3944,3994,4044,4104,4157,4223,4285,4348,4395,4450,4538,4596,4658,4708,4753,4796,4856,4923,4978,5033,5086,5133,5186,5242,5290,5345,5398,5482,5549,5613,5709,5783,5864,5953,6116,6260,6339,6414,6496,6555,6635,6715,6770,6892,6995,7036,7089,7146,7220,7285,7353,7439,7519,7588,7682,7741,7796,7858,7918,8028,8118" + "endOffsets": "1238,1334,1417,1513,1582,1625,1677,1729,1778,1841,1899,1950,2034,2128,2236,2307,2391,2474,2540,2623,2725,2786,2848,2899,2977,3030,3090,3195,3254,3356,3411,3482,3531,3589,3636,3695,3752,3823,3884,3941,3991,4043,4096,4146,4196,4256,4309,4375,4437,4500,4547,4602,4690,4748,4810,4860,4905,4948,5008,5075,5130,5185,5238,5285,5338,5394,5442,5497,5550,5634,5701,5765,5861,5935,6016,6105,6268,6412,6491,6566,6648,6707,6787,6867,6922,7044,7147,7188,7241,7298,7372,7437,7505,7591,7671,7740,7834,7893,7948,8010,8070,8180,8270" } }, { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "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": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\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,2853,-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": "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,2853,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8123,8327,8538,8756,8916,9099,9284,9469,9672,9878,10061", + "startOffsets": "8275,8479,8690,8908,9068,9251,9436,9621,9824,10030,10213", "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": "8322,8533,8751,8911,9094,9279,9464,9667,9873,10056,10257" + "endOffsets": "8474,8685,8903,9063,9246,9431,9616,9819,10025,10208,10409" } }, { "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "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": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "420", + "startOffsets": "532", "endColumns": "56", - "endOffsets": "472" + "endOffsets": "584" } } ] diff --git a/src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json b/src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json index e04f524..a0954a9 100644 --- a/src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json +++ b/src/Notes-master2/app/build/intermediates/blame/res/debug/single/debug.json @@ -1,8 +1,4 @@ [ - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" @@ -15,10 +11,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list.xml" @@ -27,58 +19,22 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit.xml" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_edit.xml" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml" @@ -91,14 +47,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" @@ -107,18 +55,10 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\add_account_text.xml" @@ -127,10 +67,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_item.xml" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" @@ -151,10 +87,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" @@ -163,18 +95,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" @@ -199,6 +119,154 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\sub_folder.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_list_footer.xml" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + }, + { + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" @@ -212,24 +280,16 @@ "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", @@ -243,30 +303,22 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\settings_header.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_record_activity.xml.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\record_activity.xml" }, { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" @@ -275,18 +327,10 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw\\introduction" @@ -295,10 +339,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml" @@ -311,26 +351,10 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" @@ -347,10 +371,6 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" @@ -359,24 +379,8 @@ "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" - }, { "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" - }, - { - "merged": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "E:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml" } ] \ No newline at end of file diff --git a/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml index 15d932b..2580857 100644 --- a/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml +++ b/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="1" android:versionName="0.1" > - + @@ -15,9 +15,12 @@ + + @@ -104,26 +107,35 @@ + android:process=":remote" > + + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + + android:theme="@android:style/Theme.Holo.Light" > + + android:exported="false" > + + + \ No newline at end of file diff --git a/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json b/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json index 1a93d35..99a7805 100644 --- a/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json +++ b/src/Notes-master2/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "14" + "minSdkVersion": "23" } } ] diff --git a/src/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 017706b..9c4ee7f 100644 Binary files a/src/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master2/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 9ffc69d..ee6e00e 100644 Binary files a/src/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master2/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 1295691..226f6e2 100644 Binary files a/src/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master2/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= deleted file mode 100644 index d03b977..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= deleted file mode 100644 index 46d3cb3..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= deleted file mode 100644 index 091b6b6..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= deleted file mode 100644 index a20288b..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= deleted file mode 100644 index 5afb9b4..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= deleted file mode 100644 index f27829e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= deleted file mode 100644 index 0d4a161..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= deleted file mode 100644 index 3402ba5..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= deleted file mode 100644 index 8190f88..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= deleted file mode 100644 index ee0fc38..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= deleted file mode 100644 index 6a09445..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= deleted file mode 100644 index 3aad90c..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= deleted file mode 100644 index 2b28058..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= deleted file mode 100644 index 1f8cc12..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= deleted file mode 100644 index e40b65d..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= deleted file mode 100644 index b322a60..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= deleted file mode 100644 index 9f562b5..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= deleted file mode 100644 index 5405370..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= deleted file mode 100644 index 5137d2e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= deleted file mode 100644 index 2e46a7c..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= deleted file mode 100644 index da1fbce..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= deleted file mode 100644 index b5e5cbc..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= deleted file mode 100644 index 93b769e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= deleted file mode 100644 index 85e5545..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= deleted file mode 100644 index c322319..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= deleted file mode 100644 index f3ed40b..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= deleted file mode 100644 index 2400090..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= deleted file mode 100644 index 3b85954..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= deleted file mode 100644 index d03b977..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0kNMDY7DS7+iY7ItzGq9pvOuvIw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= deleted file mode 100644 index 46d3cb3..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/0oMgFkaqNlaFdfnbvIt1RXo21fM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= deleted file mode 100644 index 091b6b6..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1_8+9GLiPklpn+pkVZ7k7vtgwNI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= deleted file mode 100644 index a20288b..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/1bPHgmquHT244oxdsHzpmzB_RrM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= deleted file mode 100644 index 5afb9b4..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/2N32+xXn3V9bok5n6_D3dLdlkHM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= deleted file mode 100644 index f27829e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/9cUb6a_5OX0D5AGgCHmc2Y4woxM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= deleted file mode 100644 index 0d4a161..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/HmS3RvlHsweOnU_HPdAdgJszyEM= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= deleted file mode 100644 index 3402ba5..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/IudH0oHJ46h6_UEkklGr68ky9kc= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= deleted file mode 100644 index 8190f88..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/J94eWQLIylUmxVLTm5r0gjoF5zY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= deleted file mode 100644 index ee0fc38..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/L0ZpRjC14OqiE5gzJsOTdIAJpMo= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= deleted file mode 100644 index 6a09445..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/NnSZLXHolgokJ1p2X2vNMWuSkEI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= deleted file mode 100644 index 3aad90c..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Oizfn6K4390DGgxXscd5VfQaHLo= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= deleted file mode 100644 index 2b28058..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/PBk4yM4iSd+ZwphxD7rUHzcqHNY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= deleted file mode 100644 index 1f8cc12..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/QU2+CA+lAnc8t7J2EBKou2Ndw_g= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= deleted file mode 100644 index e40b65d..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/RCvKW3MQrEk19pnY7uGOWC7izb8= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= deleted file mode 100644 index b322a60..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/SRKjLMpXFhtgE87S7yvCLaA_HtI= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= deleted file mode 100644 index 9f562b5..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Tn+6jhvyIawAfrQxoHlUkuBgFx8= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= deleted file mode 100644 index 5405370..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Ty20UwJ_OaRo9t1aKcB6fVaGWD0= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= deleted file mode 100644 index 5137d2e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/Vq_Ulon92moQsZuIQuZ0052bGPY= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= deleted file mode 100644 index 2e46a7c..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/YxONfOFnwzF1dEbnYAHoQtZUNVE= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= deleted file mode 100644 index da1fbce..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/acYVSOYrH5gOkd4DvZEy2zgXDQE= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= deleted file mode 100644 index b5e5cbc..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/cM4grCAzY_IxjqHIn9bkmECvPDw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= deleted file mode 100644 index 93b769e..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/eQy2SsB5Wud867akByG7i+lFR+I= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= deleted file mode 100644 index 85e5545..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/nyxw0SrO7FULh28P7AWUPwietPg= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= deleted file mode 100644 index c322319..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/pR71J+PQQVofk_LdJCDOm3joqWc= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= deleted file mode 100644 index f3ed40b..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/qkS3MRVtWmxCb3PqfpC7Su4rojA= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= deleted file mode 100644 index 2400090..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/wI4_oTWdhfJ8hzJ_Cr6W9kJBg8c= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= b/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= deleted file mode 100644 index 3b85954..0000000 Binary files a/src/Notes-master2/app/build/intermediates/incremental/debug-mergeNativeLibs/zip-cache/zibWEFU+qJDJsogS+h84x+8tQxw= and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 0717b71..bd1d730 100644 --- a/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Sep 26 13:59:43 CST 2020 +#Fri Nov 13 10:13:35 CST 2020 E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat @@ -8,7 +8,6 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\color\\seconda E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\test.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_test.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat @@ -19,8 +18,8 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_item.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_4x.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat @@ -44,8 +43,8 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\raw\\introduction=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat @@ -58,7 +57,6 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\note_layout.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_layout.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\folder_list_item.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat @@ -75,24 +73,25 @@ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\ E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\account_dialog_title.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\datetime_picker.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\record_activity.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_record_activity.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\layout\\widget_2x.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat +E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat diff --git a/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index 73b4006..2be6830 100644 --- a/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master2/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/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 654c055..ff35d3f 100644 --- a/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master2/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s diff --git a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index e476921..a41a03e 100644 --- a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,7 @@ -#Sat Sep 26 14:12:17 CST 2020 -base.0=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Nov 13 10:14:47 CST 2020 +base.0=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex +path.1=classes.dex +renamed.1=classes2.dex path.0=classes.dex renamed.0=classes.dex +base.1=E\:\\program\\p8ci9b4nf\\src\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex diff --git a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index c80f2db..8d1b4b2 100644 Binary files a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index efee878..f1413a2 100644 Binary files a/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master2/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 54755e3..4cb9523 100644 --- a/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="1" android:versionName="0.1" > - + @@ -16,9 +16,12 @@ + + @@ -105,26 +108,35 @@ + android:process=":remote" > + + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + + android:theme="@android:style/Theme.Holo.Light" > + + android:exported="false" > + + + \ No newline at end of file diff --git a/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/output.json b/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/output.json index b774efa..f96d66f 100644 --- a/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/output.json +++ b/src/Notes-master2/app/build/intermediates/instant_app_manifest/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "14" + "minSdkVersion": "23" } } ] diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class index 799e613..d9846f9 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/BuildConfig.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 253421b..7f4f3ef 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 1f92aa9..b8129db 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class index 2dca96a..a4e6edc 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index 1f14a2d..f1092fc 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 36315c7..6d8c966 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 483b1d2..f54a7ab 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index 3e2d98c..40640b3 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class index 03731af..4d07390 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index d324f0e..5312fbd 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index cb3bdc2..8558246 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index 0a3a356..2fbe949 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class index 2b5118e..c2f45a7 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index 645f1f5..455f7ce 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class index 271b0da..17f2c8a 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index 7a0c4ed..5377ca1 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 8e8396b..00fdce0 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class index 9ae78d8..6a11981 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class index c29e580..a7ffbfa 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class index 02960fb..3a6165b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class index ebb2251..c671684 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index c39f210..8545f9e 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class index 2df54b8..8216db2 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index efae164..fecfd9d 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class index b20d33f..12a31cb 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class index 2df0dae..4797112 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 2777f1e..b4405d6 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index 9368278..b91202f 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class index 6bbe48a..add97e1 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 833a990..057d2a5 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 093ef28..47b930b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 65e50c8..750d9c6 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index 0979413..7441e70 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class index 93c2bc9..0030332 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index 4fbc40c..ff81638 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index e77df14..36b4922 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index 59b0099..823ef1b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 30ee496..4047d44 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class index d5f24f4..068f824 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index e62463b..95fa8a5 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class index 3483f88..d5771d0 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index 68c5c88..b29a318 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class index eff3719..1927e68 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class index afe201e..6359086 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index 255d90a..1e6db2c 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index e44ae63..54c442c 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class index 86c542e..4f59cba 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index ad69268..629abbf 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index f44100a..cebe2a3 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class index 5adfb41..e4b9fdc 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 325d898..51788ed 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index 8106f9a..7db192e 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 55a70e0..5eed195 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 8cdbc88..5e02889 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index eb827bb..51e6b34 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 19558ef..706548e 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index e17d013..e12c1da 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index b49e2b7..f2cbbda 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8840c5a..ce88f79 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 00e821d..44c3a1b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index e0ab5ed..e475edd 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class index 3b31419..2ff02fa 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 710a505..6102411 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 1394920..e14b454 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 2c9e867..d7d0fc9 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index d011be7..7e01406 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 9e48fbf..f3d88ce 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index e5a489e..6ffb6ee 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index d5b72ac..045dd2a 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 4265edc..664dcbb 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index fe62e51..5d985f6 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 6c98c13..bb36b19 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 330b52d..6e98dbb 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index dc224fc..250f431 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index 2e6cdfe..88a92d9 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index a6f3ac4..a9bdef5 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index ac66193..7a20028 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 4d869f0..00a0b9d 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 5e269c0..8d35c85 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index a32ebc3..4641e0d 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 9250833..e6dc1bd 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index 5914578..48e3ed4 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index 4e1f881..c161d09 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index d88881e..10dd543 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 3ff87dc..35050cf 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class index 6077311..eec673d 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class index 74a306c..b4136fb 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class index 4b8ee12..e44330b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class index d47de75..8a42e8b 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class index c90977a..38552bc 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class index 69d7358..a0b2cf0 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class index f59ee60..4569560 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 318b2e1..7e7d919 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index d6ff2ea..a7595e3 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 3abf96e..ffd94d6 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index ac50656..1ff7994 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index 02050c4..613c9e2 100644 Binary files a/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master2/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 51fdacd..98f564f 100644 --- a/src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master2/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -4,7 +4,7 @@ 4 android:versionCode="1" 5 android:versionName="0.1" > 6 -7 +7 7-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml 8 9 @@ -34,215 +34,235 @@ 17 17-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:16:5-81 17-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:16:22-78 -18 -19 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:5-124:19 -20 android:debuggable="true" -21 android:icon="@drawable/icon_app" -21-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:19:9-42 -22 android:label="@string/app_name" -22-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:20:9-41 -23 android:testOnly="true" > -24 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:21:9-33:20 -25 android:name="net.micode.notes.ui.NotesListActivity" -25-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:22:13-49 -26 android:configChanges="keyboardHidden|orientation|screenSize" -26-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:23:13-74 -27 android:label="@string/app_name" -27-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:24:13-45 -28 android:launchMode="singleTop" -28-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:25:13-43 -29 android:theme="@style/NoteTheme" -29-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:26:13-45 -30 android:windowSoftInputMode="adjustPan" > -30-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:27:13-52 -31 -31-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:28:13-32:29 -32 -32-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:17-69 -32-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:25-66 -33 -34 -34-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:17-77 -34-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:27-74 -35 -36 -37 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:9-64:20 -38 android:name="net.micode.notes.ui.NoteEditActivity" -38-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:35:13-48 -39 android:configChanges="keyboardHidden|orientation|screenSize" -39-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:36:13-74 -40 android:launchMode="singleTop" -40-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:37:13-43 -41 android:theme="@style/NoteTheme" > -41-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:38:13-45 -42 -42-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:39:13-46:29 -43 -43-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:17-69 -43-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:25-66 -44 -45 -45-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:17-76 -45-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:27-73 -46 -47 -47-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:17-78 -47-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:23-75 -48 -48-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:17-78 -48-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:23-75 -49 -50 -50-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:13-54:29 -51 -51-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:48:17-79 -51-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:48:25-76 -52 -53 -53-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:17-76 -53-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:27-73 -54 -55 -55-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:17-78 -55-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:23-75 -56 -56-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:17-78 -56-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:23-75 -57 -58 -58-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:55:13-59:29 -59 -59-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:56:17-71 -59-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:56:25-68 -60 -61 -61-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:17-76 -61-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:27-73 -62 +18 +18-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:17:5-70 +18-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:17:22-68 +19 +19-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:5-79 +19-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:22-77 +20 +21 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:21:5-141:19 +22 android:debuggable="true" +23 android:extractNativeLibs="false" +24 android:icon="@drawable/icon_app" +24-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:22:9-42 +25 android:label="@string/app_name" +25-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:23:9-41 +26 android:testOnly="true" > +27 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:24:9-36:20 +28 android:name="net.micode.notes.ui.NotesListActivity" +28-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:25:13-49 +29 android:configChanges="keyboardHidden|orientation|screenSize" +29-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:26:13-74 +30 android:label="@string/app_name" +30-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:27:13-45 +31 android:launchMode="singleTop" +31-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:28:13-43 +32 android:theme="@style/NoteTheme" +32-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:13-45 +33 android:windowSoftInputMode="adjustPan" > +33-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:30:13-52 +34 +34-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:13-35:29 +35 +35-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:32:17-69 +35-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:32:25-66 +36 +37 +37-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:17-77 +37-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:27-74 +38 +39 +40 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:37:9-67:20 +41 android:name="net.micode.notes.ui.NoteEditActivity" +41-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:38:13-48 +42 android:configChanges="keyboardHidden|orientation|screenSize" +42-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:39:13-74 +43 android:launchMode="singleTop" +43-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:13-43 +44 android:theme="@style/NoteTheme" > +44-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 +45 +45-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:13-49:29 +46 +46-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:43:17-69 +46-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:43:25-66 +47 +48 +48-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:17-76 +48-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:27-73 +49 +50 +50-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:17-78 +50-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:23-75 +51 +51-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:17-78 +51-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:23-75 +52 +53 +53-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:50:13-57:29 +54 +54-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:51:17-79 +54-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:51:25-76 +55 +56 +56-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:17-76 +56-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:27-73 +57 +58 +58-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:17-78 +58-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:23-75 +59 +59-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:17-78 +59-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:23-75 +60 +61 +61-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:58:13-62:29 +62 +62-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:59:17-71 +62-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:59:25-68 63 -64 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:61:13-63:54 -65 android:name="android.app.searchable" -65-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:62:17-54 -66 android:resource="@xml/searchable" /> -66-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:63:17-51 -67 -68 -69 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:66:9-69:43 -70 android:name="net.micode.notes.data.NotesProvider" -70-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:67:13-47 -71 android:authorities="micode_notes" -71-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:68:13-47 -72 android:multiprocess="true" /> -72-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:69:13-40 -73 -74 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:71:9-83:20 -75 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -75-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:72:13-57 -76 android:label="@string/app_widget2x2" > -76-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:73:13-50 -77 -77-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:74:13-78:29 -78 -78-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:17-84 -78-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:25-81 -79 -79-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:17-85 -79-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:25-82 -80 -80-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:17-85 -80-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:25-82 -81 -82 -83 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:13-82:58 -84 android:name="android.appwidget.provider" -84-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:81:17-58 -85 android:resource="@xml/widget_2x_info" /> -85-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:82:17-55 -86 -87 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:84:9-96:20 -88 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -88-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:85:13-57 -89 android:label="@string/app_widget4x4" > -89-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:86:13-50 -90 -90-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:74:13-78:29 -91 -91-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:17-84 -91-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:25-81 -92 -92-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:17-85 -92-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:25-82 -93 -93-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:17-85 -93-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:25-82 -94 -95 -96 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:13-82:58 -97 android:name="android.appwidget.provider" -97-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:81:17-58 -98 android:resource="@xml/widget_4x_info" /> -98-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:82:17-55 -99 -100 -100-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:97:9-101:20 -100-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:97:19-55 -101 -101-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:29 -102 -102-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:99:17-79 -102-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:99:25-76 -103 -104 -105 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:9-104:50 -106 android:name="net.micode.notes.ui.AlarmReceiver" -106-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:103:13-45 -107 android:process=":remote" /> -107-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:104:13-38 -108 -109 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:106:9-110:87 -110 android:name="net.micode.notes.ui.AlarmAlertActivity" -110-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:107:13-50 -111 android:label="@string/app_name" -111-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:108:13-45 -112 android:launchMode="singleInstance" -112-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:109:13-48 -113 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -113-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:110:13-75 -114 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:111:9-115:72 -115 android:name="net.micode.notes.ui.NotesPreferenceActivity" -115-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:112:13-55 -116 android:label="@string/preferences_title" -116-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:113:13-54 -117 android:launchMode="singleTop" -117-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:114:13-43 -118 android:theme="@android:style/Theme.Holo.Light" /> -118-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:115:13-60 -119 -120 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:117:9-119:48 -121 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -121-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:118:13-58 -122 android:exported="false" /> -122-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:119:13-37 -123 -124 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:121:9-123:52 -125 android:name="android.app.default_searchable" -125-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:122:13-58 -126 android:value=".ui.NoteEditActivity" /> -126-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:123:13-49 -127 -128 -129 +64 +64-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:17-76 +64-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:27-73 +65 +66 +67 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:64:13-66:54 +68 android:name="android.app.searchable" +68-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:65:17-54 +69 android:resource="@xml/searchable" /> +69-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:66:17-51 +70 +71 +72 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:69:9-72:43 +73 android:name="net.micode.notes.data.NotesProvider" +73-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:70:13-47 +74 android:authorities="micode_notes" +74-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:71:13-47 +75 android:multiprocess="true" /> +75-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:72:13-40 +76 +77 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:74:9-86:20 +78 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +78-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:13-57 +79 android:label="@string/app_widget2x2" > +79-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:13-50 +80 +80-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:13-81:29 +81 +81-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:17-84 +81-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:25-81 +82 +82-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:17-85 +82-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:25-82 +83 +83-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:17-85 +83-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:25-82 +84 +85 +86 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:83:13-85:58 +87 android:name="android.appwidget.provider" +87-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:84:17-58 +88 android:resource="@xml/widget_2x_info" /> +88-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:85:17-55 +89 +90 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:87:9-99:20 +91 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +91-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:88:13-57 +92 android:label="@string/app_widget4x4" > +92-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:89:13-50 +93 +93-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:13-81:29 +94 +94-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:17-84 +94-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:25-81 +95 +95-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:17-85 +95-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:25-82 +96 +96-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:17-85 +96-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:25-82 +97 +98 +99 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:83:13-85:58 +100 android:name="android.appwidget.provider" +100-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:84:17-58 +101 android:resource="@xml/widget_4x_info" /> +101-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:85:17-55 +102 +103 +103-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:100:9-104:20 +103-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:100:19-55 +104 +104-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:101:13-103:29 +105 +105-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:17-79 +105-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:25-76 +106 +107 +108 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:105:9-109:20 +109 android:name="net.micode.notes.ui.AlarmReceiver" +109-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:106:13-45 +110 android:process=":remote" > +110-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:107:13-38 +111 +112 +113 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:111:9-117:20 +114 android:name="net.micode.notes.ui.AlarmAlertActivity" +114-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:112:13-50 +115 android:label="@string/app_name" +115-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:113:13-45 +116 android:launchMode="singleInstance" +116-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:114:13-48 +117 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +117-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:115:13-75 +118 +119 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:118:9-124:20 +120 android:name="net.micode.notes.ui.NotesPreferenceActivity" +120-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:119:13-55 +121 android:label="@string/preferences_title" +121-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:120:13-54 +122 android:launchMode="singleTop" +122-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:121:13-43 +123 android:theme="@android:style/Theme.Holo.Light" > +123-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:122:13-60 +124 +125 +126 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:126:9-130:19 +127 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +127-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:127:13-58 +128 android:exported="false" > +128-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:128:13-37 +129 +130 +131 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:132:9-134:52 +132 android:name="android.app.default_searchable" +132-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:133:13-58 +133 android:value=".ui.NoteEditActivity" /> +133-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:134:13-49 +134 +135 E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:136:9-140:15 +136 android:name="net.micode.notes.ui.RecordActivity" +136-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:137:13-46 +137 android:label="Notes" +137-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:138:13-34 +138 android:launchMode="standard" /> +138-->E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:139:13-42 +139 +140 +141 diff --git a/src/Notes-master2/app/build/intermediates/merged_java_res/debug/out.jar b/src/Notes-master2/app/build/intermediates/merged_java_res/debug/out.jar index 6b380ff..99b677f 100644 Binary files a/src/Notes-master2/app/build/intermediates/merged_java_res/debug/out.jar and b/src/Notes-master2/app/build/intermediates/merged_java_res/debug/out.jar differ diff --git a/src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 15d932b..2580857 100644 --- a/src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master2/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -4,7 +4,7 @@ android:versionCode="1" android:versionName="0.1" > - + @@ -15,9 +15,12 @@ + + @@ -104,26 +107,35 @@ + android:process=":remote" > + + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + + android:theme="@android:style/Theme.Holo.Light" > + + android:exported="false" > + + + \ No newline at end of file diff --git a/src/Notes-master2/app/build/intermediates/merged_manifests/debug/output.json b/src/Notes-master2/app/build/intermediates/merged_manifests/debug/output.json index a68e415..e48ecff 100644 --- a/src/Notes-master2/app/build/intermediates/merged_manifests/debug/output.json +++ b/src/Notes-master2/app/build/intermediates/merged_manifests/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "14" + "minSdkVersion": "23" } } ] diff --git a/src/Notes-master2/app/build/intermediates/processed_res/debug/out/output.json b/src/Notes-master2/app/build/intermediates/processed_res/debug/out/output.json index 512068d..4e64ae1 100644 --- a/src/Notes-master2/app/build/intermediates/processed_res/debug/out/output.json +++ b/src/Notes-master2/app/build/intermediates/processed_res/debug/out/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "14" + "minSdkVersion": "23" } } ] diff --git a/src/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 770fc62..49b4dfa 100644 Binary files a/src/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master2/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar deleted file mode 100644 index 70d949d..0000000 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar deleted file mode 100644 index cd8dfdf..0000000 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar deleted file mode 100644 index 123ee67..0000000 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar deleted file mode 100644 index 85ad1b5..0000000 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar and /dev/null differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex index 8406c6b..71a606a 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index acf85b3..c817fb8 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 383e920..61f0477 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex index b27d0df..d19c2f7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index 73f1c6e..d310746 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex index df62b8a..8af390e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 775bcb8..4a6145f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index b465e24..5f921b0 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index bc4d41f..901ecf0 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 1b6e872..e74339b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index bc0e89b..cfc37e3 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index 57120d5..78320e7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index c7dde7e..de9868c 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index 1a233bf..83c2285 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index 402ffca..c7011bd 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index ba6ad60..5115e2c 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 5fb6bb8..450d643 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index 9a7e336..f5a9ed9 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index b72490f..ed38f00 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index 22e46f2..b36ee82 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex index b3b9bd1..295fa9a 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 1938026..6c7dbda 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 1329291..f4fab3e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 0ac3a14..299e196 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex index 7c1e0a6..195bab4 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index 7880750..ac3d116 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 2905381..879bf18 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index d5c970d..ee5790e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex index 0ed5f90..51b39c7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 8bcd35a..f8841b7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 356d11b..5c58398 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index ec4684e..a3206d5 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index f9b0ed1..e1e9d6b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex index 23c4fb2..bc0ca4f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index a352caf..2f15a61 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index ba96f47..c98c28f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 3530263..436a7d5 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 8794451..418fc7b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index 9ce8069..b913a6f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index b5adb29..20d4d8d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 964238c..f796372 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index e97fe5e..b0393f7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index a2f67eb..edcd18d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index 7ab4e91..923cfc6 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index 1a1ebb9..06da160 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 329a94d..385c2c9 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex index fa635ea..b677403 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 8c9be1b..9bd8982 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 1655d53..1125dc2 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex index ca27fef..089d567 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 3ad2058..1c7807e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index dfb9291..3914b29 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 6702e9a..489f791 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index eccfc20..ab65db8 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 8c2ed1c..01c9ff6 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index a707b51..97891e0 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index c6ea5bb..444a4d3 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 91f15ef..ee095d7 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index b318359..745eb65 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index ad8f236..725b023 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index f6986a9..094874e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex index f612f53..9a1bf39 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 8b8d900..693917e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 23b015c..8ea8824 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index efd12dc..9ae1c00 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index e34784a..fa8c93d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 2ae7979..03408f2 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index b0b57f8..5301e4d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index c1b03b9..d757963 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 5e5b4ac..151e5a0 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 26d72c5..759db1d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e6817aa..0a6a654 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 7ea900f..fbc74a6 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 8fbf61b..3bbad18 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index bb42791..5c89aaa 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index af5f33b..52e9c5b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 8912b51..f106111 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 472753b..48a857e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index a5bb37e..992e7eb 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index e37e9a9..5b19f00 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index fc0e0e8..272ae04 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex index 3251de1..dc24f7f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index 5b0eff8..d3e20cf 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 7997913..f0dad83 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 0bb6278..fcc1de9 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex index f75e895..ce7ed17 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex index 987dff8..6346c4d 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex index f5728b4..fdbff4a 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex index 228ac03..3c51d20 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex index b4c5756..7fa4126 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex index a4993bf..b62a32e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex index 5744f21..07bdd0e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 5ed1e0d..fa32d01 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index babb653..b86a77b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index bfa1430..fee981b 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 9b66ac9..462752e 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 32e3410..42f7d1f 100644 Binary files a/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master2/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat index 9928e6a..6ca34fb 100644 Binary files a/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat index f45e174..0494e95 100644 Binary files a/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master2/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat index caae4cd..727c837 100644 Binary files a/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat and b/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ diff --git a/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat index 611b7a7..d3c92f8 100644 Binary files a/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/Notes-master2/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..fbb24ee 100644 --- a/src/Notes-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master2/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -87,60 +87,66 @@ int id et_edit_text 0x7f050009 int id et_foler_name 0x7f05000a int id font_size_selector 0x7f05000b int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 +int id insert_photo 0x7f05000d +int id iv_alert_icon 0x7f05000e +int id iv_bg_blue 0x7f05000f +int id iv_bg_blue_select 0x7f050010 +int id iv_bg_green 0x7f050011 +int id iv_bg_green_select 0x7f050012 +int id iv_bg_red 0x7f050013 +int id iv_bg_red_select 0x7f050014 +int id iv_bg_white 0x7f050015 +int id iv_bg_white_select 0x7f050016 +int id iv_bg_yellow 0x7f050017 +int id iv_bg_yellow_select 0x7f050018 +int id iv_large_select 0x7f050019 +int id iv_medium_select 0x7f05001a +int id iv_small_select 0x7f05001b +int id iv_super_select 0x7f05001c +int id ll_font_large 0x7f05001d +int id ll_font_normal 0x7f05001e +int id ll_font_small 0x7f05001f +int id ll_font_super 0x7f050020 +int id menu_alert 0x7f050021 +int id menu_delete 0x7f050022 +int id menu_delete_remind 0x7f050023 +int id menu_export_text 0x7f050024 +int id menu_font_size 0x7f050025 +int id menu_insert_photo 0x7f050026 +int id menu_insert_record 0x7f050027 +int id menu_list_mode 0x7f050028 +int id menu_new_folder 0x7f050029 +int id menu_new_note 0x7f05002a +int id menu_search 0x7f05002b +int id menu_send_to_desktop 0x7f05002c +int id menu_setting 0x7f05002d +int id menu_share 0x7f05002e +int id menu_sync 0x7f05002f +int id minute 0x7f050030 +int id move 0x7f050031 +int id navigation_bar 0x7f050032 +int id note_bg_color_selector 0x7f050033 +int id note_edit_list 0x7f050034 +int id note_edit_view 0x7f050035 +int id note_item 0x7f050036 +int id note_title 0x7f050037 +int id notes_list 0x7f050038 +int id play_record 0x7f050039 +int id prefenerece_sync_status_textview 0x7f05003a +int id preference_sync_button 0x7f05003b +int id selection_menu 0x7f05003c +int id start_record 0x7f05003d +int id stop_record 0x7f05003e +int id sv_note_edit 0x7f05003f +int id tv_alert_date 0x7f050040 +int id tv_folder_name 0x7f050041 +int id tv_modified_date 0x7f050042 +int id tv_name 0x7f050043 +int id tv_time 0x7f050044 +int id tv_title 0x7f050045 +int id tv_title_bar 0x7f050046 +int id widget_bg_image 0x7f050047 +int id widget_text 0x7f050048 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -152,9 +158,10 @@ int layout note_item 0x7f060007 int layout note_list 0x7f060008 int layout note_list_dropdown_menu 0x7f060009 int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d +int layout record_activity 0x7f06000b +int layout settings_header 0x7f06000c +int layout widget_2x 0x7f06000d +int layout widget_4x 0x7f06000e int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 diff --git a/src/Notes-master2/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master2/app/build/outputs/apk/debug/app-debug.apk index fc400b2..ca69f3b 100644 Binary files a/src/Notes-master2/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master2/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt index 23fc0ed..e1f504c 100644 --- a/src/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master2/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,12 +1,12 @@ -- Merging decision tree log --- manifest -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 -INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-126:12 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 +INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:2:1-143:12 package ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:4:5-31 INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml @@ -59,168 +59,184 @@ uses-permission#android.permission.RECEIVE_BOOT_COMPLETED ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:16:5-81 android:name ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:16:22-78 +uses-permission#android.permission.RECORD_AUDIO +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:17:5-70 + android:name + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:17:22-68 +uses-permission#android.permission.READ_EXTERNAL_STORAGE +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:5-79 + android:name + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:22-77 application -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:18:5-124:19 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:21:5-141:19 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:20:9-41 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:23:9-41 android:icon - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:19:9-42 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:22:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:21:9-33:20 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:24:9-36:20 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:24:13-45 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:27:13-45 android:launchMode - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:25:13-43 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:28:13-43 android:windowSoftInputMode - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:27:13-52 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:30:13-52 android:configChanges - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:23:13-74 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:26:13-74 android:theme - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:26:13-45 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:13-45 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:22:13-49 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:25:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:28:13-32:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:13-35:29 action#android.intent.action.MAIN -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:17-69 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:32:17-69 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:29:25-66 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:32:25-66 category#android.intent.category.LAUNCHER -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:17-77 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:17-77 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:31:27-74 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:34:9-64:20 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:37:9-67:20 android:launchMode - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:37:13-43 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:13-43 android:configChanges - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:36:13-74 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:39:13-74 android:theme - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:38:13-45 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:35:13-48 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:38:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:39:13-46:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:13-49:29 tools:ignore - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:39:28-58 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:28-58 action#android.intent.action.VIEW -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:17-69 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:43:17-69 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:40:25-66 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:43:25-66 category#android.intent.category.DEFAULT -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:17-76 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:17-76 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:42:27-73 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:45:27-73 data -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:17-78 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:17-78 android:mimeType - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:44:23-75 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:47:13-54:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:50:13-57:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:48:17-79 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:51:17-79 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:48:25-76 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:51:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:55:13-59:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:58:13-62:29 action#android.intent.action.SEARCH -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:56:17-71 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:59:17-71 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:56:25-68 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:59:25-68 meta-data#android.app.searchable -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:61:13-63:54 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:64:13-66:54 android:resource - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:63:17-51 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:66:17-51 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:62:17-54 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:65:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:66:9-69:43 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:69:9-72:43 android:authorities - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:68:13-47 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:71:13-47 android:multiprocess - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:69:13-40 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:72:13-40 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:67:13-47 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:70:13-47 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:71:9-83:20 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:74:9-86:20 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:73:13-50 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:13-50 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:72:13-57 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:74:13-78:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:13-81:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:17-84 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:17-84 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:75:25-81 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:78:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:17-85 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:17-85 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:76:25-82 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:79:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:17-85 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:17-85 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:77:25-82 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:25-82 meta-data#android.appwidget.provider -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:80:13-82:58 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:83:13-85:58 android:resource - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:82:17-55 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:85:17-55 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:81:17-58 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:84:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:84:9-96:20 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:87:9-99:20 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:86:13-50 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:89:13-50 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:85:13-57 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:88:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:97:9-101:20 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:100:9-104:20 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:97:19-55 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:100:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:98:13-100:29 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:101:13-103:29 action#android.intent.action.BOOT_COMPLETED -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:99:17-79 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:17-79 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:99:25-76 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:102:9-104:50 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:105:9-109:20 android:process - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:104:13-38 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:107:13-38 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:103:13-45 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:106:13-45 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:106:9-110:87 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:111:9-117:20 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:108:13-45 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:113:13-45 android:launchMode - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:109:13-48 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:114:13-48 android:theme - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:110:13-75 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:115:13-75 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:107:13-50 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:112:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:111:9-115:72 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:118:9-124:20 android:label - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:113:13-54 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:120:13-54 android:launchMode - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:114:13-43 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:121:13-43 android:theme - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:115:13-60 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:122:13-60 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:112:13-55 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:119:13-55 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:117:9-119:48 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:126:9-130:19 android:exported - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:119:13-37 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:128:13-37 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:118:13-58 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:127:13-58 meta-data#android.app.default_searchable -ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:121:9-123:52 +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:132:9-134:52 android:value - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:123:13-49 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:134:13-49 + android:name + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:133:13-58 +activity#net.micode.notes.ui.RecordActivity +ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:136:9-140:15 + android:label + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:138:13-34 + android:launchMode + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:139:13-42 android:name - ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:122:13-58 + ADDED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml:137:13-46 uses-sdk INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml reason: use-sdk injection requested INJECTED from E:\program\p8ci9b4nf\src\Notes-master2\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master2/app/src/main/AndroidManifest.xml b/src/Notes-master2/app/src/main/AndroidManifest.xml index 963dc31..1e77021 100644 --- a/src/Notes-master2/app/src/main/AndroidManifest.xml +++ b/src/Notes-master2/app/src/main/AndroidManifest.xml @@ -14,6 +14,9 @@ + + + + android:process=":remote"> + + + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar"> + + + android:theme="@android:style/Theme.Holo.Light"> + + + android:exported="false"> + + + + \ No newline at end of file diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java index d97ac5d..5e70eaf 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/data/Contact.java @@ -46,7 +46,7 @@ public class Contact { } String selection = CALLER_ID_SELECTION.replace("+", - PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));//将CALLER_ID_SELECTION的最后的+好替代为号码的后MIN_MATCH位 Cursor cursor = context.getContentResolver().query( Data.CONTENT_URI, new String [] { Phone.DISPLAY_NAME }, diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java index f240604..b7698dd 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/data/Notes.java @@ -238,7 +238,9 @@ public class Notes { * TEXT data type *

Type: TEXT

*/ + public static final String DATA5 = "data5"; + } public static final class TextNote implements DataColumns { diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java index 6a19454..baad816 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -182,7 +182,12 @@ public class Task extends Node { } try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONObject note = null; + try{ + note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + } catch(NullPointerException e) { + Log.e(TAG, "getJSONObject is null"); + } JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index 4ea21c5..1fb281b 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -135,7 +135,12 @@ public class TaskList extends Node { } try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONObject folder = null; + try { + folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + } catch(NullPointerException e) { + Log.d(TAG, "getJSONObject is null"); + } if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { String name = folder.getString(NoteColumns.SNIPPET); @@ -201,6 +206,7 @@ public class TaskList extends Node { return SYNC_ACTION_ERROR; } if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { + //if (c.getLong(SqlNote.MODIFIED_DATE_COLUMN) == getLastModified()) { // local modification only return SYNC_ACTION_UPDATE_REMOTE; } else { diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index b3b61e7..e14bd46 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -58,9 +58,9 @@ public class GTaskASyncTask extends AsyncTask { } public void publishProgess(String message) { - publishProgress(new String[] { + /*publishProgress(new String[] { message - }); + });*/ } private void showNotification(int tickerId, String content) { @@ -77,8 +77,8 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); + /*notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, + pendingIntent);*/ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index c67dfdf..d4e5231 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -112,7 +112,8 @@ public class GTaskClient { public boolean login(Activity activity) { // we suppose that the cookie would expire after 5 minutes // then we need to re-login - final long interval = 1000 * 60 * 5; + // final long interval = 1000 * 60 * 5; + final long interval = 300000; if (mLastLoginTime + interval < System.currentTimeMillis()) { mLoggedin = false; } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java index d2b4082..ebc103d 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java @@ -331,7 +331,11 @@ public class GTaskManager { while (iter.hasNext()) { Map.Entry entry = iter.next(); node = entry.getValue(); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + try{ + doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + } catch(NullPointerException e){ + Log.e(TAG, "doContentSync is null"); + } } // mCancelled can be set by another thread, so we neet to check one by @@ -468,7 +472,11 @@ public class GTaskManager { node = entry.getValue(); if (mGTaskHashMap.containsKey(gid)) { mGTaskHashMap.remove(gid); - doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + try{ + doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); + } catch(NullPointerException e){ + Log.e(TAG, "doContentSync is null"); + } } } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java index 6706cf6..0e31a0b 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/model/Note.java @@ -247,6 +247,8 @@ public class Note { return null; } } + + return null; } } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..d47d691 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -54,6 +54,8 @@ public class WorkingNote { private long mFolderId; + private int isRecord; + private Context mContext; private static final String TAG = "WorkingNote"; @@ -69,7 +71,7 @@ public class WorkingNote { DataColumns.DATA1, DataColumns.DATA2, DataColumns.DATA3, - DataColumns.DATA4, + DataColumns.DATA4 }; public static final String[] NOTE_PROJECTION = new String[] { @@ -120,6 +122,7 @@ public class WorkingNote { mNoteId = noteId; mFolderId = folderId; mIsDeleted = false; + isRecord = 0; mNote = new Note(); loadNote(); } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 2c47ba4..fde6666 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -77,7 +77,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); } diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 8f0ec7e..f42bd39 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -22,28 +22,28 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; -import android.content.ComponentName; import android.content.ContentUris; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Paint; +import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.MediaStore; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; import android.util.Log; -import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.MotionEvent; -import android.view.SubMenu; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; @@ -69,6 +69,9 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -329,7 +332,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - protected void onNewIntent(Intent intent) { + protected void onNewIntent(Intent intent) {//再次被调用时调用这个函数构造 super.onNewIntent(intent); initActivityState(intent); } @@ -569,12 +572,116 @@ public class NoteEditActivity extends Activity implements OnClickListener, case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; + case R.id.menu_insert_record: + insertRecord(); + break; + case R.id.menu_insert_photo: + insertPhoto(); + break; default: break; } return true; } + private int REQUEST_CODE_RECORD = 2; + private void insertRecord(){ + Intent intent = new Intent(this, RecordActivity.class); + startActivityForResult(intent, REQUEST_CODE_RECORD); + } + + + private int yourChoice; + private void insertPhoto(){ + final String[] items = { "Camera", "Album" }; + yourChoice = -1; + AlertDialog.Builder singleChoiceDialog = + new AlertDialog.Builder(NoteEditActivity.this); + singleChoiceDialog.setTitle("Photo from..."); + // 第二个参数是默认选项，此处设置为0 + singleChoiceDialog.setSingleChoiceItems(items, -1, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + yourChoice = which; + } + }); + singleChoiceDialog.setPositiveButton("OK", + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + /*if (yourChoice != -1) { + Toast.makeText(NoteEditActivity.this, + "you choose" + items[yourChoice], + Toast.LENGTH_SHORT).show(); + }*/ + switch(yourChoice){ + case 0: + //insertPhotoFromCamera(); + break; + case 1: + insertPhotoFromAlbum(); + break; + default: + Log.d(TAG, "choose photo's index wrong"); + break; + } + Log.d(TAG, "you choose " + yourChoice); + } + }); + + singleChoiceDialog.show(); + } + + /*private ImageView InsertImage; + private Uri ImageUri; + private void insertPhotoFromCamera(){ + InsertImage = (ImageView) findViewById(R.id.insert_photo); + File outputImage = new File(getExternalCacheDir(), "output_image.jpg"); + try { + if (outputImage.exists()) { + outputImage.delete(); + } + outputImage.createNewFile(); + } catch(IOException e) { + e.printStackTrace(); + Log.d(TAG, "Image File create fail"); + } + ImageUri = Uri.fromFile(outputImage); + + Intent intent = new Intent("android.media.action.IMAGE_CAPTURE"); + intent.putExtra(MediaStore.EXTRA_OUTPUT, ImageUri); + startActivityForResult(intent, 1); + }*/ + + private void insertPhotoFromAlbum(){ + + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data){ + switch (requestCode) { + case 1: + /*if (resultCode == RESULT_OK) { + try { + Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(ImageUri)); + InsertImage.setImageBitmap(bitmap); + Log.d(TAG, "onActivityResult: do this function"); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + }*/ + break; + + case 2: + if (resultCode == RESULT_OK) { + //handleImage(data); + } + default: + break; + } + } + private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java index 0f5a878..66c630b 100644 --- a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/NoteItemData.java @@ -26,7 +26,7 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.tool.DataUtils; -public class NoteItemData { +public class NoteItemData { static final String [] PROJECTION = new String [] { NoteColumns.ID, NoteColumns.ALERTED_DATE, diff --git a/src/Notes-master2/app/src/main/java/net/micode/notes/ui/RecordActivity.java b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/RecordActivity.java new file mode 100644 index 0000000..c88a8a8 --- /dev/null +++ b/src/Notes-master2/app/src/main/java/net/micode/notes/ui/RecordActivity.java @@ -0,0 +1,185 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.media.MediaRecorder; +import android.os.Bundle; +import android.os.Environment; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.Toast; + +import net.micode.notes.R; + +import java.io.File; +import java.io.IOException; + + +public class RecordActivity extends Activity { + + private MediaRecorder mediaRecorder; + + private String TAG = "RecordActivity"; + + private boolean isRecording; + + private Button start; + private Button stop; + private Button play; + + @Override + protected void onCreate(Bundle savedInstanceState){ + super.onCreate(savedInstanceState); + this.setContentView(R.layout.record_activity); + start = (Button) findViewById (R.id.start_record); + stop = (Button) findViewById (R.id.stop_record); + play = (Button) findViewById (R.id.play_record); + start.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + start(); + Log.d(TAG, "onClick: Start"); + } + }); + + stop.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + stop(); + Log.d(TAG, "onClick: Stop"); + } + }); + + play.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: play"); + } + }); + } + + //在这里重载Back键执行的操作 + /*@Override + public void onBackPressed(){ + + }*/ + + private boolean checkSDCard() { + // TODO Auto-generated method stub + //检测SD卡是否插入手机中 + if (android.os.Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { + return true; + } + return false; + } + + /** + * 开始录音 + */ + protected void start() { + /*try { + File path; + if (checkSDCard()) { + //File mpath = Environment.getExternalStorageDirectory(); + //File mpath = new File("/storage/"); + path = new File(Environment.getExternalStorageDirectory().getPath() + File.separator + "audioRecords/1.amr"); + Log.d(TAG, "start: "+path); + path.createNewFile(); + + + } else { + Toast.makeText(RecordActivity.this, "SDcard未连接", + Toast.LENGTH_LONG).show(); + return; + } + + File file = null; + try { + file = File.createTempFile(String.valueOf("myrecord_"), ".amr", path); + } catch (IOException e) { + Log.d("audioRecorder", "文件创建失败"); + }*/ + File file = null; + file = new File(Environment.getExternalStorageDirectory().getPath() + File.separator + "audioRecords/1.amr"); + + + if (file.exists()) { + // 如果文件存在，删除它，演示代码保证设备上只有一个录音文件 + file.delete(); + } + Log.d(TAG, "file create suceess"); + + mediaRecorder = new MediaRecorder(); + // 设置音频录入源 + mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); + // 设置录制音频的输出格式 + mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT); + // 设置音频的编码格式 + mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT); + /*recorder.setOutputFormat(OutputFormat.MPEG_4); + recorder.setAudioEncoder(AudioEncoder.AAC);*/ + // 设置录制音频文件输出文件路径 + mediaRecorder.setOutputFile(file.getAbsolutePath()); + + Log.d(TAG, "mediaRecorder is ready"); + + mediaRecorder.setOnErrorListener(new MediaRecorder.OnErrorListener() { + + @Override + public void onError(MediaRecorder mr, int what, int extra) { + // 发生错误，停止录制 + mediaRecorder.stop(); + mediaRecorder.release(); + mediaRecorder = null; + isRecording=false; + start.setEnabled(true); + stop.setEnabled(false); + Toast.makeText(RecordActivity.this, "录音发生错误", Toast.LENGTH_SHORT).show(); + } + }); + + // 准备、开始 + try { + mediaRecorder.prepare(); + } catch (IOException e) { + Log.d(TAG, "mediaRecorder is not prepare"); + } + Log.d(TAG, "mediaRecorder is prepare"); + mediaRecorder.start(); + Log.d(TAG, "mediaRecorder is start"); + + isRecording=true; + start.setEnabled(false); + stop.setEnabled(true); + Log.d(TAG, "Button is ready"); + Toast.makeText(RecordActivity.this, "开始录音", Toast.LENGTH_SHORT).show(); + + } + + /** + * 录音结束 + */ + protected void stop() { + if (isRecording) { + // 如果正在录音，停止并释放资源 + mediaRecorder.stop(); + mediaRecorder.release(); + mediaRecorder = null; + isRecording=false; + start.setEnabled(true); + stop.setEnabled(false); + Toast.makeText(RecordActivity.this, "录音结束", Toast.LENGTH_SHORT).show(); + } + } + + @Override + protected void onDestroy() { + if (isRecording) { + // 如果正在录音，停止并释放资源 + mediaRecorder.stop(); + mediaRecorder.release(); + mediaRecorder = null; + } + super.onDestroy(); + } +} diff --git a/src/Notes-master2/app/src/main/res/layout/note_edit.xml b/src/Notes-master2/app/src/main/res/layout/note_edit.xml index 10b2aa7..50cef5b 100644 --- a/src/Notes-master2/app/src/main/res/layout/note_edit.xml +++ b/src/Notes-master2/app/src/main/res/layout/note_edit.xml @@ -83,7 +83,9 @@ android:layout_gravity="left|top" android:fadingEdgeLength="0dip"> + @@ -98,7 +100,9 @@ android:minLines="12" android:textAppearance="@style/TextAppearancePrimaryItem" android:lineSpacingMultiplier="1.2" /> - + + + + + + + diff --git a/src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml b/src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml index a885f9c..26de558 100644 --- a/src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml +++ b/src/Notes-master2/app/src/main/res/layout/note_edit_list_item.xml @@ -24,9 +24,9 @@ android:id="@+id/cb_edit_item" android:layout_width="wrap_content" android:layout_height="28dip" + android:layout_gravity="top|left" android:checked="false" - android:focusable="false" - android:layout_gravity="top|left" /> + android:focusable="false" /> + + +