质量分析报告——刘桓希

src/.idea/sonarIssues.xml

@@ -18,11 +18,86 @@
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlData.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/Task.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/TaskList.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
           <value>
             <set />
           </value>
         </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/ResourceParser.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java">
+          <value>
+            <set />
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/MineInputStreamReader.java">
+          <value>
+            <set />
+          </value>
+        </entry>
         <entry key="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java">
           <value>
             <set />

src/.idea/sonarlint/issuestore/5/0/503adcf2a0be1ecdb94a15efba4433b6589877b9

@@ -1,12 +1,12 @@
 
-M
+<	java:S131h""Add a default case to this switch.(ãÁð™øÿÿÿÿ

-java:S1135c"2Complete the task associated to this TODO comment.(ƒŠ® úÿÿÿÿ

-K
-java:S2864Â
"4Iterate over the "entrySet" instead of the "keySet".(ý‘̯
-o
-java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(§þ¢¾
 ^
 java:S1126­
"BReplace this if-then-else statement by a single method invocation.(‚å¿¥ûÿÿÿÿ

+K
+java:S2864Â
"4Iterate over the "entrySet" instead of the "keySet".(ý‘̯
 f
 java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.(ãÁð™øÿÿÿÿ

-<	java:S131h""Add a default case to this switch.(ãÁð™øÿÿÿÿ

+o
+java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(§þ¢¾
+M
+java:S1135c"2Complete the task associated to this TODO comment.(ƒŠ® úÿÿÿÿ

src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c

@@ -1,35 +1,35 @@
 
 t
 java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(ÑÓ<C391>¥üÿÿÿÿ

+K
+java:S2864˜"4Iterate over the "entrySet" instead of the "keySet".(­Ô‡ï
 n
-java:S1450–
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(©´ÖÛ
+java:S3776¶
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨÁ±øÿÿÿÿ

-o
-java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(À—’¢
 8
 java:S1116ƒ"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-n
+q
-java:S3776¶
"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨÁ±øÿÿÿÿ

+java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ

-K
+r
-java:S2864˜"4Iterate over the "entrySet" instead of the "keySet".(­Ô‡ï
+java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ

-X
-java:S1126æ"AReplace this if-then-else statement by a single return statement.(®ÎÚÉ
 t
 java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").(êÝýÂþÿÿÿÿ

+k
+java:S3252Ó"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(ŸÍÃó
8”ÿÄõÕ.
+o
+java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(À—’¢
+8
+java:S1116¸"Remove this empty statement.(ôŸŽìúÿÿÿÿ

+s
+java:S1104T"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ

+n
+java:S1450–
"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(©´ÖÛ
 t
 java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(®ú÷õþÿÿÿÿ

-N
-java:S1135¤"2Complete the task associated to this TODO comment.(Ùü§“ýÿÿÿÿ

-r
-java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ

 w
 java:S2293Ñ"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð8”ÿÄõÕ.
+X
+java:S1126æ"AReplace this if-then-else statement by a single return statement.(®ÎÚÉ
 r
-java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ

+java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ

-s
+N
-java:S1104T"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ

+java:S1135¤"2Complete the task associated to this TODO comment.(Ùü§“ýÿÿÿÿ

-8
-java:S1116¸"Remove this empty statement.(ôŸŽìúÿÿÿÿ

-q
-java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ

-k
-java:S3252Ó"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(ŸÍÃó
8”ÿÄõÕ.

src/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236

@@ -1,11 +1,11 @@
 
-X
+?
-java:S1126Ü
"AReplace this if-then-else statement by a single return statement.(¶ø ˜
+java:S1125ª"(Remove the literal "true" boolean value.(ÍÛì•
 8
 java:S2386K"Make this member "protected".(Ñ㳎ýÿÿÿÿ

+X
+java:S1126Ü
"AReplace this if-then-else statement by a single return statement.(¶ø ˜
 3
 java:S2386A"Make this member "protected".(”µåÓ
-?
-java:S1125ª"(Remove the literal "true" boolean value.(ÍÛì•
 F
 java:S1066Á
"/Merge this if statement with the enclosing one.(â<>®¾

src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb

@@ -1,13 +1,13 @@
 
 \
 java:S2147õ
"ECombine this catch with the one at line 242, which has the same body.(æš©›
-U
-java:S1155ì
">Use isEmpty() to check whether the collection is empty or not.(”¥ŠÉ
-\
-java:S1126}"AReplace this if-then-else statement by a single return statement.(Æ·¾ôúÿÿÿÿ

 u
 java:S2293½
"YReplace the type specification in this constructor call with the diamond operator ("<>").(áºÐ»ûÿÿÿÿ

-i
+\
-java:S3776µ
"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.(<28>¤§²
+java:S1126}"AReplace this if-then-else statement by a single return statement.(Æ·¾ôúÿÿÿÿ

 j
 java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.(€¨ƒ¦úÿÿÿÿ

+i
+java:S3776µ
"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.(<28>¤§²
+U
+java:S1155ì
">Use isEmpty() to check whether the collection is empty or not.(”¥ŠÉ

src/.idea/sonarlint/issuestore/index.pb

@@ -47,3 +47,43 @@ u
 Eapp/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java,f\0\f087b1ba1b9c91b7293fea0fb071eaed62a42137
 f
 6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56
+g
+7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a
+k
+;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc
+j
+:app/src/main/java/net/micode/notes/gtask/data/SqlNote.java,f\1\f1226eeacd46c914d51f3d1a6d6f27377490d2a4
+p
+@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312
+q
+Aapp/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java,a\b\ab153b0256bc5f6c194e188cec0b8e327e347a90
+h
+8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af
+j
+:app/src/main/java/net/micode/notes/gtask/data/SqlData.java,9\3\934a4e2abf19d28a53f6aeb1dcd99248c44b6892
+d
+4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
+j
+:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
+k
+;app/src/main/java/net/micode/notes/gtask/data/MetaData.java,c\1\c182d0c9c237ea8a46a92ccaae9bb5c751923a88
+g
+7app/src/main/java/net/micode/notes/gtask/data/Node.java,3\a\3aac5305cb73bfbdeb8078cd264d04323fa80e92
+~
+Napp/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java,5\f\5f6162ca79fcea353b280c5dc84973a9c37d2c74
+
+Oapp/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java,0\f\0f0f0549145d0e2bfb972ba1ed2e2c38bfd6d1b1
+s
+Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf
+m
+=app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java,c\4\c42ad3cd6e664963fa1849c760a57d417d500ee7
+m
+=app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710
+l
+<app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java,0\2\0268ec648e2fc0139b30ed13396174b7392c1ae2
+q
+Aapp/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java,5\8\58052a8597c5f01595e1c849728bcae66c27a1a6
+t
+Dapp/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java,1\7\175d8fa829f0a7ced6aa11970f112de6ad144628
+t
+Dapp/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java,2\b\2b687ab930681e3885683578d43df600a0a20982

src/app/build/intermediates/blame/res/debug/multi-v2/debug.json

@@ -6,11 +6,12 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\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,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "126,76,75,74,73,24,25,26,117,118,125,124,31,82,83,81,80,79,95,94,93,85,65,34,35,86,77,119,72,68,21,43,49,54,44,64,63,62,58,57,55,56,59,60,20,50,71,61,69,48,53,52,51,67,47,66,45,46,70,33,39,41,38,40,37,36,30,29,102,101,104,116,109,108,110,111,113,112,103,107,105,106,100,114,115,123,121,120,122,32,84,92,97,96,98,91,90,89,88,27,28",
-                        "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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,937,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,883,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6840,3753,3686,3612,3561,1033,1074,1123,6382,6428,6785,6734,1412,4125,4194,4065,3999,3935,4869,4808,4744,4328,3124,1585,1639,4383,3827,6486,3501,3284,937,2023,2310,2561,2077,3063,3009,2957,2758,2709,2613,2662,2805,2853,883,2354,3441,2904,3328,2266,2513,2456,2400,3228,2221,3185,2128,2170,3381,1533,1844,1942,1796,1894,1748,1702,1360,1306,5251,5191,5394,6307,5710,5640,5775,5854,6039,5965,5327,5584,5452,5518,5141,6144,6228,6695,6586,6537,6632,1475,4272,4684,4984,4925,5052,4635,4589,4540,4488,1172,1239",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "128,76,75,74,73,24,25,26,117,118,125,124,31,82,83,81,80,79,95,94,93,85,65,34,35,86,77,119,72,68,21,43,49,54,44,64,63,62,58,57,55,56,59,60,20,50,71,61,69,48,53,52,51,67,47,66,45,46,70,33,39,41,38,40,37,36,30,29,102,101,104,116,109,108,110,111,113,112,103,107,105,106,100,114,115,123,121,120,122,32,84,92,97,96,98,91,90,89,88,27,28",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,988,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,931,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,55,52,42,50,49,59,52,50,45,47,47,45,46,49,52,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "7014,3821,3747,3680,3606,1068,1117,1166,6422,6480,6834,6779,1469,4188,4266,4119,4059,3993,4919,4863,4802,4377,3179,1633,1696,4463,3903,6531,3555,3322,988,2071,2348,2607,2122,3118,3057,3003,2799,2752,2656,2703,2847,2898,931,2394,3495,2951,3375,2304,2555,2507,2450,3278,2260,3222,2164,2215,3435,1579,1888,1986,1838,1936,1790,1742,1406,1354,5321,5245,5446,6376,5769,5704,5848,5959,6138,6033,5388,5634,5512,5578,5185,6222,6301,6728,6626,6580,6689,1527,4322,4738,5046,4978,5109,4678,4629,4583,4534,1233,1300"
                     },
                     "to": {
                         "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
@@ -24,9 +25,12 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "-1",
+                        "startLines": "18",
-                        "startColumns": "-1",
+                        "startColumns": "4",
-                        "startOffsets": "-1"
+                        "startOffsets": "730",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -45,85 +49,92 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "-1",
+                        "startLines": "18",
-                        "startColumns": "-1",
+                        "startColumns": "4",
-                        "startOffsets": "-1"
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "420",
+                        "startOffsets": "532",
                         "endColumns": "56",
-                        "endOffsets": "472"
+                        "endOffsets": "584"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "130,74,77,76,75,21,22,23,120,121,129,128,28,83,84,82,81,80,96,95,94,86,41,40,66,31,32,87,43,78,122,73,69,20,44,50,55,45,65,64,63,59,58,56,57,60,61,19,51,72,62,70,49,54,53,52,68,48,67,46,47,71,30,36,38,35,37,34,33,27,26,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,29,85,93,98,97,99,92,91,90,89,24,25",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "8273,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,904,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8273,4107,4371,4274,4204,983,1027,1080,7761,7811,8214,8162,1445,4831,4926,4759,4674,4590,5805,5721,5618,5104,2180,2128,3598,1652,1706,5166,2275,4455,7875,4035,3786,904,2335,2656,2962,2394,3526,3464,3406,3180,3127,3022,3076,3231,3282,846,2704,3968,3343,3836,2608,2906,2817,2758,3723,2557,3677,2452,2496,3900,1596,1921,2031,1873,1977,1816,1767,1389,1335,6268,6200,6512,7662,6881,6799,6956,7046,7290,7210,6353,6429,6739,6577,6658,6144,7435,7558,8120,7991,7933,8045,1530,5035,5531,5942,5872,6023,5471,5415,5352,5291,1133,1244",
-                        "endLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "134,74,77,76,75,21,22,23,120,121,129,128,28,83,84,82,81,80,96,95,94,86,41,40,66,31,32,87,43,78,122,73,69,20,44,50,55,45,65,64,63,59,58,56,57,60,61,19,51,72,62,70,49,54,53,52,68,48,67,46,47,71,30,36,38,35,37,34,33,27,26,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,29,85,93,98,97,99,92,91,90,89,24,25",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "8681,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,977,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "endOffsets": "8681,4198,4449,4365,4268,1021,1074,1127,7805,7869,8267,8208,1524,4920,5029,4825,4753,4668,5866,5799,5715,5160,2237,2174,3671,1700,1761,5266,2329,4552,7925,4101,3830,977,2388,2698,3016,2446,3592,3520,3458,3225,3174,3070,3121,3276,3337,898,2752,4029,3400,3894,2650,2956,2900,2811,3780,2602,3717,2490,2551,3962,1646,1971,2079,1915,2025,1867,1810,1439,1383,6347,6262,6571,7753,6950,6875,7040,7204,7429,7284,6423,6506,6793,6652,6733,6194,7552,7656,8156,8039,7985,8114,1590,5098,5612,6017,5936,6112,5525,5465,5409,5346,1238,1329"
                     },
                     "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,125,126",
                         "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,4,4",
-                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2742,2793,2871,2924,2984,3089,3148,3250,3305,3376,3425,3503,3561,3608,3667,3724,3795,3856,3913,3963,4015,4068,4118,4168,4228,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7217,7270,7327,7401,7466,7534,7620,7700,7769,7863,7922,7977,8039,8099,8209",
+                        "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3615,3673,3720,3779,3836,3907,3968,4025,4075,4127,4180,4230,4280,4340,4397,4450,4516,4578,4641,4688,4743,4831,4889,4951,5001,5046,5089,5149,5216,5271,5326,5379,5426,5479,5535,5583,5638,5691,5775,5842,5906,6002,6076,6157,6246,6409,6553,6632,6707,6789,6848,6928,7008,7063,7185,7288,7329,7382,7439,7513,7578,7646,7732,7812,7881,7975,8034,8089,8151,8211,8321",
                         "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,125,126",
                         "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2737,2788,2866,2919,2979,3084,3143,3245,3300,3371,3420,3498,3556,3603,3662,3719,3790,3851,3908,3958,4010,4063,4113,4163,4223,4280,4333,4399,4461,4524,4571,4626,4714,4772,4834,4884,4929,4972,5032,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204,8294"
+                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3610,3668,3715,3774,3831,3902,3963,4020,4070,4122,4175,4225,4275,4335,4392,4445,4511,4573,4636,4683,4738,4826,4884,4946,4996,5041,5084,5144,5211,5266,5321,5374,5421,5474,5530,5578,5633,5686,5770,5837,5901,5997,6071,6152,6241,6404,6548,6627,6702,6784,6843,6923,7003,7058,7180,7283,7324,7377,7434,7508,7573,7641,7727,7807,7876,7970,8029,8084,8146,8206,8316,8406"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "-1,-1",
+                        "startLines": "19,26",
-                        "startColumns": "-1,-1",
+                        "startColumns": "4,4",
-                        "startOffsets": "-1,-1"
+                        "startOffsets": "758,1073",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,300",
+                        "startOffsets": "105,412",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "295,415"
+                        "endOffsets": "407,527"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,-1,64,-1,22,-1,-1,-1,-1,-1,-1",
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "-1,-1,4,-1,4,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "-1,-1,2704,-1,917,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "-1,-1,66,-1,25,-1,-1,-1,-1,-1,-1",
+                        "endLines": "53,58,66,62,25,29,33,38,43,21,48",
-                        "endColumns": "-1,-1,12,-1,12,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "-1,-1,2865,-1,1098,-1,-1,-1,-1,-1,-1"
+                        "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "127,131,135,138,141,145,149,153,157,161,165",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8299,8503,8714,8878,9038,9221,9406,9591,9794,10000,10183",
+                        "startOffsets": "8411,8615,8826,8990,9150,9333,9518,9703,9906,10112,10295",
                         "endLines": "130,134,137,140,144,148,152,156,160,164,168",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8498,8709,8873,9033,9216,9401,9586,9789,9995,10178,10379"
+                        "endOffsets": "8610,8821,8985,9145,9328,9513,9698,9901,10107,10290,10491"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
+                        "startLines": "19,20,21,22,18",
-                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "-1,-1,-1,-1,-1"
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
+                        "startOffsets": "589,641,694,747,799",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
+                        "endOffsets": "636,689,742,794,846"
                     }
                 }
             ]

src/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json

@@ -6,11 +6,12 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\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,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "126,76,75,74,73,24,25,26,117,118,125,124,31,82,83,81,80,79,95,94,93,85,65,34,35,86,77,119,72,68,21,43,49,54,44,64,63,62,58,57,55,56,59,60,20,50,71,61,69,48,53,52,51,67,47,66,45,46,70,33,39,41,38,40,37,36,30,29,102,101,104,116,109,108,110,111,113,112,103,107,105,106,100,114,115,123,121,120,122,32,84,92,97,96,98,91,90,89,88,27,28",
-                        "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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,937,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,883,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "6840,3753,3686,3612,3561,1033,1074,1123,6382,6428,6785,6734,1412,4125,4194,4065,3999,3935,4869,4808,4744,4328,3124,1585,1639,4383,3827,6486,3501,3284,937,2023,2310,2561,2077,3063,3009,2957,2758,2709,2613,2662,2805,2853,883,2354,3441,2904,3328,2266,2513,2456,2400,3228,2221,3185,2128,2170,3381,1533,1844,1942,1796,1894,1748,1702,1360,1306,5251,5191,5394,6307,5710,5640,5775,5854,6039,5965,5327,5584,5452,5518,5141,6144,6228,6695,6586,6537,6632,1475,4272,4684,4984,4925,5052,4635,4589,4540,4488,1172,1239",
-                        "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,55,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "128,76,75,74,73,24,25,26,117,118,125,124,31,82,83,81,80,79,95,94,93,85,65,34,35,86,77,119,72,68,21,43,49,54,44,64,63,62,58,57,55,56,59,60,20,50,71,61,69,48,53,52,51,67,47,66,45,46,70,33,39,41,38,40,37,36,30,29,102,101,104,116,109,108,110,111,113,112,103,107,105,106,100,114,115,123,121,120,122,32,84,92,97,96,98,91,90,89,88,27,28",
-                        "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,988,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,931,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,55,52,42,50,49,59,52,50,45,47,47,45,46,49,52,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "7014,3821,3747,3680,3606,1068,1117,1166,6422,6480,6834,6779,1469,4188,4266,4119,4059,3993,4919,4863,4802,4377,3179,1633,1696,4463,3903,6531,3555,3322,988,2071,2348,2607,2122,3118,3057,3003,2799,2752,2656,2703,2847,2898,931,2394,3495,2951,3375,2304,2555,2507,2450,3278,2260,3222,2164,2215,3435,1579,1888,1986,1838,1936,1790,1742,1406,1354,5321,5245,5446,6376,5769,5704,5848,5959,6138,6033,5388,5634,5512,5578,5185,6222,6301,6728,6626,6580,6689,1527,4322,4738,5046,4978,5109,4678,4629,4583,4534,1233,1300"
                     },
                     "to": {
                         "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
@@ -24,9 +25,12 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                     "from": {
-                        "startLines": "-1",
+                        "startLines": "18",
-                        "startColumns": "-1",
+                        "startColumns": "4",
-                        "startOffsets": "-1"
+                        "startOffsets": "730",
+                        "endLines": "21",
+                        "endColumns": "19",
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",

src/app/build/intermediates/blame/res/debug/multi-v2/values.json

@@ -6,85 +6,92 @@
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\colors.xml",
                     "from": {
-                        "startLines": "-1",
+                        "startLines": "18",
-                        "startColumns": "-1",
+                        "startColumns": "4",
-                        "startOffsets": "-1"
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",
                         "startColumns": "4",
-                        "startOffsets": "420",
+                        "startOffsets": "532",
                         "endColumns": "56",
-                        "endOffsets": "472"
+                        "endOffsets": "584"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "130,74,77,76,75,21,22,23,120,121,129,128,28,83,84,82,81,80,96,95,94,86,41,40,66,31,32,87,43,78,122,73,69,20,44,50,55,45,65,64,63,59,58,56,57,60,61,19,51,72,62,70,49,54,53,52,68,48,67,46,47,71,30,36,38,35,37,34,33,27,26,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,29,85,93,98,97,99,92,91,90,89,24,25",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "8273,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,904,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8273,4107,4371,4274,4204,983,1027,1080,7761,7811,8214,8162,1445,4831,4926,4759,4674,4590,5805,5721,5618,5104,2180,2128,3598,1652,1706,5166,2275,4455,7875,4035,3786,904,2335,2656,2962,2394,3526,3464,3406,3180,3127,3022,3076,3231,3282,846,2704,3968,3343,3836,2608,2906,2817,2758,3723,2557,3677,2452,2496,3900,1596,1921,2031,1873,1977,1816,1767,1389,1335,6268,6200,6512,7662,6881,6799,6956,7046,7290,7210,6353,6429,6739,6577,6658,6144,7435,7558,8120,7991,7933,8045,1530,5035,5531,5942,5872,6023,5471,5415,5352,5291,1133,1244",
-                        "endLines": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "134,74,77,76,75,21,22,23,120,121,129,128,28,83,84,82,81,80,96,95,94,86,41,40,66,31,32,87,43,78,122,73,69,20,44,50,55,45,65,64,63,59,58,56,57,60,61,19,51,72,62,70,49,54,53,52,68,48,67,46,47,71,30,36,38,35,37,34,33,27,26,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,29,85,93,98,97,99,92,91,90,89,24,25",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "8681,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,977,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "endOffsets": "8681,4198,4449,4365,4268,1021,1074,1127,7805,7869,8267,8208,1524,4920,5029,4825,4753,4668,5866,5799,5715,5160,2237,2174,3671,1700,1761,5266,2329,4552,7925,4101,3830,977,2388,2698,3016,2446,3592,3520,3458,3225,3174,3070,3121,3276,3337,898,2752,4029,3400,3894,2650,2956,2900,2811,3780,2602,3717,2490,2551,3962,1646,1971,2079,1915,2025,1867,1810,1439,1383,6347,6262,6571,7753,6950,6875,7040,7204,7429,7284,6423,6506,6793,6652,6733,6194,7552,7656,8156,8039,7985,8114,1590,5098,5612,6017,5936,6112,5525,5465,5409,5346,1238,1329"
                     },
                     "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,125,126",
                         "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,4,4",
-                        "startOffsets": "739,1132,1228,1311,1407,1476,1519,1571,1623,1672,1735,1793,1844,1928,2022,2130,2201,2285,2368,2434,2517,2619,2680,2742,2793,2871,2924,2984,3089,3148,3250,3305,3376,3425,3503,3561,3608,3667,3724,3795,3856,3913,3963,4015,4068,4118,4168,4228,4285,4338,4404,4466,4529,4576,4631,4719,4777,4839,4889,4934,4977,5037,5104,5159,5214,5267,5314,5367,5423,5471,5526,5579,5663,5730,5794,5890,5964,6045,6134,6297,6441,6520,6595,6677,6736,6816,6896,6951,7073,7176,7217,7270,7327,7401,7466,7534,7620,7700,7769,7863,7922,7977,8039,8099,8209",
+                        "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3615,3673,3720,3779,3836,3907,3968,4025,4075,4127,4180,4230,4280,4340,4397,4450,4516,4578,4641,4688,4743,4831,4889,4951,5001,5046,5089,5149,5216,5271,5326,5379,5426,5479,5535,5583,5638,5691,5775,5842,5906,6002,6076,6157,6246,6409,6553,6632,6707,6789,6848,6928,7008,7063,7185,7288,7329,7382,7439,7513,7578,7646,7732,7812,7881,7975,8034,8089,8151,8211,8321",
                         "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,125,126",
                         "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,77,57,46,58,56,70,60,56,49,51,52,49,49,59,56,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": "1127,1223,1306,1402,1471,1514,1566,1618,1667,1730,1788,1839,1923,2017,2125,2196,2280,2363,2429,2512,2614,2675,2737,2788,2866,2919,2979,3084,3143,3245,3300,3371,3420,3498,3556,3603,3662,3719,3790,3851,3908,3958,4010,4063,4113,4163,4223,4280,4333,4399,4461,4524,4571,4626,4714,4772,4834,4884,4929,4972,5032,5099,5154,5209,5262,5309,5362,5418,5466,5521,5574,5658,5725,5789,5885,5959,6040,6129,6292,6436,6515,6590,6672,6731,6811,6891,6946,7068,7171,7212,7265,7322,7396,7461,7529,7615,7695,7764,7858,7917,7972,8034,8094,8204,8294"
+                        "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3610,3668,3715,3774,3831,3902,3963,4020,4070,4122,4175,4225,4275,4335,4392,4445,4511,4573,4636,4683,4738,4826,4884,4946,4996,5041,5084,5144,5211,5266,5321,5374,5421,5474,5530,5578,5633,5686,5770,5837,5901,5997,6071,6152,6241,6404,6548,6627,6702,6784,6843,6923,7003,7058,7180,7283,7324,7377,7434,7508,7573,7641,7727,7807,7876,7970,8029,8084,8146,8206,8316,8406"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\arrays.xml",
                     "from": {
-                        "startLines": "-1,-1",
+                        "startLines": "19,26",
-                        "startColumns": "-1,-1",
+                        "startColumns": "4,4",
-                        "startOffsets": "-1,-1"
+                        "startOffsets": "758,1073",
+                        "endLines": "24,29",
+                        "endColumns": "19,19",
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
                         "startColumns": "4,4",
-                        "startOffsets": "105,300",
+                        "startOffsets": "105,412",
                         "endLines": "7,11",
                         "endColumns": "19,19",
-                        "endOffsets": "295,415"
+                        "endOffsets": "407,527"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\styles.xml",
                     "from": {
-                        "startLines": "-1,-1,64,-1,22,-1,-1,-1,-1,-1,-1",
+                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "-1,-1,4,-1,4,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "-1,-1,2704,-1,917,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "-1,-1,66,-1,25,-1,-1,-1,-1,-1,-1",
+                        "endLines": "53,58,66,62,25,29,33,38,43,21,48",
-                        "endColumns": "-1,-1,12,-1,12,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "-1,-1,2865,-1,1098,-1,-1,-1,-1,-1,-1"
+                        "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
                         "startLines": "127,131,135,138,141,145,149,153,157,161,165",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8299,8503,8714,8878,9038,9221,9406,9591,9794,10000,10183",
+                        "startOffsets": "8411,8615,8826,8990,9150,9333,9518,9703,9906,10112,10295",
                         "endLines": "130,134,137,140,144,148,152,156,160,164,168",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8498,8709,8873,9033,9216,9401,9586,9789,9995,10178,10379"
+                        "endOffsets": "8610,8821,8985,9145,9328,9513,9698,9901,10107,10290,10491"
                     }
                 },
                 {
                     "source": "F:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\values\\dimens.xml",
                     "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
+                        "startLines": "19,20,21,22,18",
-                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "-1,-1,-1,-1,-1"
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
+                        "startOffsets": "589,641,694,747,799",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
+                        "endOffsets": "636,689,742,794,846"
                     }
                 }
             ]

src/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -37,8 +37,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="@string/app_name" >
-        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Sun Oct 25 09:05:51 CST 2020
+#Mon Oct 26 19:54:29 CST 2020
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\account_dialog_title.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat
@@ -11,8 +11,8 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_no
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\delete.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_edit.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\searchable.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat
@@ -36,8 +36,8 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_re
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\clock.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\call_note_edit.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\raw\\introduction=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat
@@ -71,26 +71,26 @@ F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\widget_2x_info.xm
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\datetime_picker.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\add_account_text.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\menu\\note_list_options.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\xml\\preferences.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\note_item.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat
 F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat
+F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat

src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Mon Oct 26 10:05:03 CST 2020
+#Fri Oct 30 09:36:17 CST 2020
 base.0=F\:\\Git\\work_room\\p3p7sqtgz\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -38,8 +38,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="@string/app_name" >
-        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -61,215 +61,214 @@
 38        android:debuggable="true"
 39        android:icon="@drawable/icon_app"
 39-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:35:9-42
-40        android:label="@string/app_name"
+40        android:label="@string/app_name" >
 40-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:36:9-41
-41        android:testOnly="true" >
+41        <activity
-42        <activity
+41-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:37:9-49:20
-42-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:37:9-49:20
+42            android:name="net.micode.notes.ui.NotesListActivity"
-43            android:name="net.micode.notes.ui.NotesListActivity"
+42-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:38:13-49
-43-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:38:13-49
+43            android:configChanges="keyboardHidden|orientation|screenSize"
-44            android:configChanges="keyboardHidden|orientation|screenSize"
+43-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:39:13-74
-44-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:39:13-74
+44            android:label="@string/app_name"
-45            android:label="@string/app_name"
+44-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:40:13-45
-45-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:40:13-45
+45            android:launchMode="singleTop"
-46            android:launchMode="singleTop"
+45-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:41:13-43
-46-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:41:13-43
+46            android:theme="@style/NoteTheme"
-47            android:theme="@style/NoteTheme"
+46-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:42:13-45
-47-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:42:13-45
+47            android:windowSoftInputMode="adjustPan" >
-48            android:windowSoftInputMode="adjustPan" >
+47-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:43:13-52
-48-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:43:13-52
+48
-49
+49            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
-50            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+50            <intent-filter>
-51            <intent-filter>
+50-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:45:13-48:29
-51-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:45:13-48:29
+51                <action android:name="android.intent.action.MAIN" />
-52                <action android:name="android.intent.action.MAIN" />
+51-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:46:17-69
-52-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:46:17-69
+51-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:46:25-66
-52-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:46:25-66
+52
-53
+53                <category android:name="android.intent.category.LAUNCHER" />
-54                <category android:name="android.intent.category.LAUNCHER" />
+53-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:47:17-77
-54-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:47:17-77
+53-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:47:27-74
-54-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:47:27-74
+54            </intent-filter>
-55            </intent-filter>
+55        </activity>
-56        </activity>
+56        <activity
-57        <activity
+56-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:51:9-79:20
-57-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:51:9-79:20
+57            android:name="net.micode.notes.ui.NoteEditActivity"
-58            android:name="net.micode.notes.ui.NoteEditActivity"
+57-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:52:13-48
-58-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:52:13-48
+58            android:configChanges="keyboardHidden|orientation|screenSize"
-59            android:configChanges="keyboardHidden|orientation|screenSize"
+58-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:53:13-74
-59-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:53:13-74
+59            android:launchMode="singleTop"
-60            android:launchMode="singleTop"
+59-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:54:13-43
-60-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:54:13-43
+60            android:theme="@style/NoteTheme" >
-61            android:theme="@style/NoteTheme" >
+60-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:55:13-45
-61-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:55:13-45
+61            <intent-filter>
-62            <intent-filter>
+61-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:57:13-62:29
-62-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:57:13-62:29
+62                <action android:name="android.intent.action.VIEW" />
-63                <action android:name="android.intent.action.VIEW" />
+62-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:58:17-69
-63-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:58:17-69
+62-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:58:25-66
-63-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:58:25-66
+63
-64
+64                <category android:name="android.intent.category.DEFAULT" />
-65                <category android:name="android.intent.category.DEFAULT" />
+64-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
-65-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
+64-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
-65-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
+65
-66
+66                <data android:mimeType="vnd.android.cursor.item/text_note" />
-67                <data android:mimeType="vnd.android.cursor.item/text_note" />
+66-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
+66-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
+67                <data android:mimeType="vnd.android.cursor.item/call_note" />
 67-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
 67-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
-68                <data android:mimeType="vnd.android.cursor.item/call_note" />
+68            </intent-filter>
-68-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
+69            <intent-filter>
-68-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
+69-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:64:13-69:29
-69            </intent-filter>
+70                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-70            <intent-filter>
+70-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:65:17-79
-70-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:64:13-69:29
+70-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:65:25-76
-71                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+71
-71-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:65:17-79
+72                <category android:name="android.intent.category.DEFAULT" />
-71-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:65:25-76
+72-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
-72
+72-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
-73                <category android:name="android.intent.category.DEFAULT" />
+73
-73-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
+74                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
+74-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
-74
+74-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
-75                <data android:mimeType="vnd.android.cursor.item/text_note" />
+75                <data android:mimeType="vnd.android.cursor.item/call_note" />
 75-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
 75-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
-76                <data android:mimeType="vnd.android.cursor.item/call_note" />
+76            </intent-filter>
-76-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:17-78
+77            <intent-filter>
-76-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:60:23-75
+77-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:71:13-74:29
-77            </intent-filter>
+78                <action android:name="android.intent.action.SEARCH" />
-78            <intent-filter>
+78-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:72:17-71
-78-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:71:13-74:29
+78-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:72:25-68
-79                <action android:name="android.intent.action.SEARCH" />
+79
-79-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:72:17-71
+80                <category android:name="android.intent.category.DEFAULT" />
-79-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:72:25-68
+80-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
-80
+80-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
-81                <category android:name="android.intent.category.DEFAULT" />
+81            </intent-filter>
-81-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:17-76
+82
-81-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:59:27-73
+83            <meta-data
-82            </intent-filter>
+83-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:76:13-78:54
-83
+84                android:name="android.app.searchable"
-84            <meta-data
+84-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:77:17-54
-84-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:76:13-78:54
+85                android:resource="@xml/searchable" />
-85                android:name="android.app.searchable"
+85-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:78:17-51
-85-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:77:17-54
+86        </activity>
-86                android:resource="@xml/searchable" />
+87
-86-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:78:17-51
+88        <provider
-87        </activity>
+88-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:81:9-84:43
-88
+89            android:name="net.micode.notes.data.NotesProvider"
-89        <provider
+89-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:82:13-63
-89-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:81:9-84:43
+90            android:authorities="micode_notes"
-90            android:name="net.micode.notes.data.NotesProvider"
+90-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:83:13-47
-90-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:82:13-63
+91            android:multiprocess="true" />
-91            android:authorities="micode_notes"
+91-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:84:13-40
-91-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:83:13-47
+92
-92            android:multiprocess="true" />
+93        <receiver
-92-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:84:13-40
+93-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:86:9-98:20
-93
+94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-94        <receiver
+94-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:87:13-57
-94-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:86:9-98:20
+95            android:label="@string/app_widget2x2" >
-95            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+95-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:88:13-50
-95-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:87:13-57
+96            <intent-filter>
-96            android:label="@string/app_widget2x2" >
+96-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:89:13-93:29
-96-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:88:13-50
+97                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-97            <intent-filter>
+97-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:17-84
-97-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:89:13-93:29
+97-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:25-81
-98                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+98                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-98-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:17-84
+98-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:17-85
-98-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:25-81
+98-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:25-82
-99                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+99                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-99-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:17-85
+99-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:17-85
-99-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:25-82
+99-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:25-82
-100                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+100            </intent-filter>
-100-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:17-85
+101
-100-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:25-82
+102            <meta-data
-101            </intent-filter>
+102-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:95:13-97:58
-102
+103                android:name="android.appwidget.provider"
-103            <meta-data
+103-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:96:17-58
-103-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:95:13-97:58
+104                android:resource="@xml/widget_2x_info" />
-104                android:name="android.appwidget.provider"
+104-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:97:17-55
-104-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:96:17-58
+105        </receiver>
-105                android:resource="@xml/widget_2x_info" />
+106        <receiver
-105-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:97:17-55
+106-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:99:9-112:20
-106        </receiver>
+107            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-107        <receiver
+107-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:100:13-57
-107-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:99:9-112:20
+108            android:label="@string/app_widget4x4" >
-108            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+108-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:101:13-50
-108-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:100:13-57
+109            <intent-filter>
-109            android:label="@string/app_widget4x4" >
+109-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:89:13-93:29
-109-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:101:13-50
+110                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-110            <intent-filter>
+110-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:17-84
-110-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:89:13-93:29
+110-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:25-81
-111                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+111                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-111-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:17-84
+111-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:17-85
-111-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:90:25-81
+111-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:25-82
-112                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+112                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-112-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:17-85
+112-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:17-85
-112-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:91:25-82
+112-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:25-82
-113                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+113            </intent-filter>
-113-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:17-85
+114
-113-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:92:25-82
+115            <meta-data
-114            </intent-filter>
+115-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:95:13-97:58
-115
+116                android:name="android.appwidget.provider"
-116            <meta-data
+116-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:96:17-58
-116-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:95:13-97:58
+117                android:resource="@xml/widget_4x_info" />
-117                android:name="android.appwidget.provider"
+117-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:97:17-55
-117-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:96:17-58
+118        </receiver>
-118                android:resource="@xml/widget_4x_info" />
+119        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:97:17-55
+119-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:114:9-118:20
-119        </receiver>
+119-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:114:19-55
-120        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+120            <intent-filter>
-120-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:114:9-118:20
+120-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:115:13-117:29
-120-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:114:19-55
+121                <action android:name="android.intent.action.BOOT_COMPLETED" />
-121            <intent-filter>
+121-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:116:17-79
-121-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:115:13-117:29
+121-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:116:25-76
-122                <action android:name="android.intent.action.BOOT_COMPLETED" />
+122            </intent-filter>
-122-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:116:17-79
+123        </receiver>
-122-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:116:25-76
+124        <receiver
-123            </intent-filter>
+124-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:120:9-123:20
-124        </receiver>
+125            android:name="net.micode.notes.ui.AlarmReceiver"
-125        <receiver
+125-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:121:13-61
-125-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:120:9-123:20
+126            android:process=":remote" >
-126            android:name="net.micode.notes.ui.AlarmReceiver"
+126-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:122:13-38
-126-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:121:13-61
+127        </receiver>
-127            android:process=":remote" >
+128
-127-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:122:13-38
+129        <activity
-128        </receiver>
+129-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:125:9-130:20
-129
+130            android:name="net.micode.notes.ui.AlarmAlertActivity"
-130        <activity
+130-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:126:13-50
-130-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:125:9-130:20
+131            android:label="@string/app_name"
-131            android:name="net.micode.notes.ui.AlarmAlertActivity"
+131-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:127:13-45
-131-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:126:13-50
+132            android:launchMode="singleInstance"
-132            android:label="@string/app_name"
+132-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:128:13-48
-132-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:127:13-45
+133            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-133            android:launchMode="singleInstance"
+133-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:129:13-75
-133-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:128:13-48
+134        </activity>
-134            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+135        <activity
-134-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:129:13-75
+135-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:132:9-137:20
-135        </activity>
+136            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-136        <activity
+136-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:133:13-71
-136-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:132:9-137:20
+137            android:label="@string/preferences_title"
-137            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+137-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:134:13-54
-137-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:133:13-71
+138            android:launchMode="singleTop"
-138            android:label="@string/preferences_title"
+138-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:135:13-43
-138-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:134:13-54
+139            android:theme="@android:style/Theme.Holo.Light" >
-139            android:launchMode="singleTop"
+139-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:136:13-60
-139-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:135:13-43
+140        </activity>
-140            android:theme="@android:style/Theme.Holo.Light" >
+141
-140-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:136:13-60
+142        <service
-141        </activity>
+142-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:139:9-142:19
-142
+143            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-143        <service
+143-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:140:13-74
-143-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:139:9-142:19
+144            android:exported="false" >
-144            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+144-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:141:13-37
-144-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:140:13-74
+145        </service>
-145            android:exported="false" >
+146
-145-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:141:13-37
+147        <meta-data
-146        </service>
+147-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:144:9-146:52
-147
+148            android:name="android.app.default_searchable"
-148        <meta-data
+148-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:145:13-58
-148-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:144:9-146:52
+149            android:value=".ui.NoteEditActivity" />
-149            android:name="android.app.default_searchable"
+149-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:146:13-49
-149-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:145:13-58
+150    </application>
-150            android:value=".ui.NoteEditActivity" />
+151
-150-->F:\Git\work_room\p3p7sqtgz\src\app\src\main\AndroidManifest.xml:146:13-49
+152</manifest>
-151    </application>
-152
-153</manifest>

src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -37,8 +37,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
+        android:label="@string/app_name" >
-        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

src/app/src/main/java/net/micode/notes/data/Notes.java

@@ -45,7 +45,7 @@ public class Notes {
     public static final int TYPE_WIDGET_INVALIDE      = -1;
     public static final int TYPE_WIDGET_2X            = 0;
     public static final int TYPE_WIDGET_4X            = 1;
-
+    public static final String Content = "content://" ;
     public static class DataConstants {
         public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
         public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
@@ -54,117 +54,117 @@ public class Notes {
     /**
      * Uri to query all notes and folders
      */
-    public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
+    public static final Uri CONTENT_NOTE_URI = Uri.parse(Content + AUTHORITY + "/note");
 
     /**
      * Uri to query data
      */
-    public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
+    public static final Uri CONTENT_DATA_URI = Uri.parse(Content + AUTHORITY + "/data");
 
     public interface NoteColumns {
         /**
          * The unique ID for a row
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String ID = "_id";
+        String ID = "_id";
 
         /**
          * The parent's id for note or folder
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String PARENT_ID = "parent_id";
+        String PARENT_ID = "parent_id";
 
         /**
          * Created data for note or folder
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String CREATED_DATE = "created_date";
+        String CREATED_DATE = "created_date";
 
         /**
          * Latest modified date
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String MODIFIED_DATE = "modified_date";
+        String MODIFIED_DATE = "modified_date";
 
 
         /**
          * Alert date
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String ALERTED_DATE = "alert_date";
+        String ALERTED_DATE = "alert_date";
 
         /**
          * Folder's name or text content of note
          * <P> Type: TEXT </P>
          */
-        public static final String SNIPPET = "snippet";
+         String SNIPPET = "snippet";
 
         /**
          * Note's widget id
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String WIDGET_ID = "widget_id";
+         String WIDGET_ID = "widget_id";
 
         /**
          * Note's widget type
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String WIDGET_TYPE = "widget_type";
+         String WIDGET_TYPE = "widget_type";
 
         /**
          * Note's background color's id
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String BG_COLOR_ID = "bg_color_id";
+         String BG_COLOR_ID = "bg_color_id";
 
         /**
          * For text note, it doesn't has attachment, for multi-media
          * note, it has at least one attachment
          * <P> Type: INTEGER </P>
          */
-        public static final String HAS_ATTACHMENT = "has_attachment";
+         String HAS_ATTACHMENT = "has_attachment";
 
         /**
          * Folder's count of notes
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String NOTES_COUNT = "notes_count";
+         String NOTES_COUNT = "notes_count";
 
         /**
          * The file type: folder or note
          * <P> Type: INTEGER </P>
          */
-        public static final String TYPE = "type";
+         String TYPE = "type";
 
         /**
          * The last sync id
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String SYNC_ID = "sync_id";
+         String SYNC_ID = "sync_id";
 
         /**
          * Sign to indicate local modified or not
          * <P> Type: INTEGER </P>
          */
-        public static final String LOCAL_MODIFIED = "local_modified";
+         String LOCAL_MODIFIED = "local_modified";
 
         /**
          * Original parent id before moving into temporary folder
          * <P> Type : INTEGER </P>
          */
-        public static final String ORIGIN_PARENT_ID = "origin_parent_id";
+        String ORIGIN_PARENT_ID = "origin_parent_id";
 
         /**
          * The gtask id
          * <P> Type : TEXT </P>
          */
-        public static final String GTASK_ID = "gtask_id";
+         String GTASK_ID = "gtask_id";
 
         /**
          * The version code
          * <P> Type : INTEGER (long) </P>
          */
-        public static final String VERSION = "version";
+         String VERSION = "version";
     }
 
     public interface DataColumns {
@@ -172,37 +172,37 @@ public class Notes {
          * The unique ID for a row
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String ID = "_id";
+         String ID = "_id";
 
         /**
          * The MIME type of the item represented by this row.
          * <P> Type: Text </P>
          */
-        public static final String MIME_TYPE = "mime_type";
+         String MIME_TYPE = "mime_type";
 
         /**
          * The reference id to note that this data belongs to
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String NOTE_ID = "note_id";
+         String NOTE_ID = "note_id";
 
         /**
          * Created data for note or folder
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String CREATED_DATE = "created_date";
+         String CREATED_DATE = "created_date";
 
         /**
          * Latest modified date
          * <P> Type: INTEGER (long) </P>
          */
-        public static final String MODIFIED_DATE = "modified_date";
+         String MODIFIED_DATE = "modified_date";
 
         /**
          * Data's content
          * <P> Type: TEXT </P>
          */
-        public static final String CONTENT = "content";
+         String CONTENT = "content";
 
 
         /**
@@ -210,35 +210,35 @@ public class Notes {
          * integer data type
          * <P> Type: INTEGER </P>
          */
-        public static final String DATA1 = "data1";
+         String DATA1 = "data1";
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
          * integer data type
          * <P> Type: INTEGER </P>
          */
-        public static final String DATA2 = "data2";
+         String DATA2 = "data2";
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
          * TEXT data type
          * <P> Type: TEXT </P>
          */
-        public static final String DATA3 = "data3";
+         String DATA3 = "data3";
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
          * TEXT data type
          * <P> Type: TEXT </P>
          */
-        public static final String DATA4 = "data4";
+         String DATA4 = "data4";
 
         /**
          * Generic data column, the meaning is {@link #MIMETYPE} specific, used for
          * TEXT data type
          * <P> Type: TEXT </P>
          */
-        public static final String DATA5 = "data5";
+         String DATA5 = "data5";
     }
 
     public static final class TextNote implements DataColumns {
@@ -254,7 +254,7 @@ public class Notes {
 
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
 
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
+        public static final Uri CONTENT_URI = Uri.parse(Content + AUTHORITY + "/text_note");
     }
 
     public static final class CallNote implements DataColumns {
@@ -274,6 +274,6 @@ public class Notes {
 
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
 
-        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
+        public static final Uri CONTENT_URI = Uri.parse(Content + AUTHORITY + "/call_note");
     }
 }

src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -33,9 +33,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final int DB_VERSION = 4;
 
     public interface TABLE {
-        public static final String NOTE = "note";
+        String NOTE = "note";
 
-        public static final String DATA = "data";
+        String DATA = "data";
     }
 
     private static final String TAG = "NotesDatabaseHelper";

src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java

@@ -143,40 +143,45 @@ public class SqlData {
         js.put(DataColumns.DATA3, mDataContentData3);
         return js;
     }
+    public void For_Commit_mIsCreate(long noteId, boolean validateVersion, long version){
+        if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
+            mDiffDataValues.remove(DataColumns.ID);
+        }
 
+        mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
+        Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
+        try {
+            mDataId = Long.valueOf(uri.getPathSegments().get(1));
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "Get note id error :" + e.toString());
+            throw new ActionFailureException("create note failed");
+        }
+    }
+    public void For_Commit_Not_mIsCreate(long noteId, boolean validateVersion, long version){
+        if (mDiffDataValues.size() > 0) {
+            int result = 0;
+            if (!validateVersion) {
+                result = mContentResolver.update(ContentUris.withAppendedId(
+                        Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
+            } else {
+                result = mContentResolver.update(ContentUris.withAppendedId(
+                        Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
+                        " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+                                + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
+                                String.valueOf(noteId), String.valueOf(version)
+                        });
+            }
+            if (result == 0) {
+                Log.w(TAG, "there is no update. maybe user updates note when syncing");
+            }
+        }
+    }
     public void commit(long noteId, boolean validateVersion, long version) {
 
         if (mIsCreate) {
-            if (mDataId == INVALID_ID && mDiffDataValues.containsKey(DataColumns.ID)) {
+            For_Commit_mIsCreate(noteId,  validateVersion, version);
-                mDiffDataValues.remove(DataColumns.ID);
-            }
-
-            mDiffDataValues.put(DataColumns.NOTE_ID, noteId);
-            Uri uri = mContentResolver.insert(Notes.CONTENT_DATA_URI, mDiffDataValues);
-            try {
-                mDataId = Long.valueOf(uri.getPathSegments().get(1));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "Get note id error :" + e.toString());
-                throw new ActionFailureException("create note failed");
-            }
         } else {
-            if (mDiffDataValues.size() > 0) {
+            For_Commit_Not_mIsCreate(noteId, validateVersion,version);
-                int result = 0;
-                if (!validateVersion) {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
-                } else {
-                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
-                            " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
-                                    + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
-                                    String.valueOf(noteId), String.valueOf(version)
-                            });
-                }
-                if (result == 0) {
-                    Log.w(TAG, "there is no update. maybe user updates note when syncing");
-                }
-            }
         }
 
         mDiffDataValues.clear();

src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java

@@ -353,7 +353,7 @@ public class SqlNote {
             }
         } catch (JSONException e) {
             Log.e(TAG, e.toString());
-            e.printStackTrace();
+            //e.printStackTrace();
             return false;
         }
         return true;
@@ -402,7 +402,7 @@ public class SqlNote {
             return js;
         } catch (JSONException e) {
             Log.e(TAG, e.toString());
-            e.printStackTrace();
+           // e.printStackTrace();
         }
         return null;
     }