更换字体

3 years ago · 0313d40368
parent 28150e8029
commit 0313d40368
120 changed files with 1178 additions and 959 deletions
--- a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin
+++ b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin
--- a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock
+++ b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock
--- a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin
+++ b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin
--- a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock
+++ b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock
--- a/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
+++ b/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
--- a/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes1/.gradle/file-system.probe
+++ b/src/Notes1/.gradle/file-system.probe
--- a/src/Notes1/.idea/misc.xml
+++ b/src/Notes1/.idea/misc.xml
@ -5,16 +5,12 @@
      <map>
        <entry key="..\:/Android/SDK/platforms/android-22/data/res/layout-xlarge/activity_list.xml" value="0.1" />
        <entry key="..\:/Android/SDK/platforms/android-22/data/res/layout/alert_dialog.xml" value="0.10552536231884058" />
-        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/note_edit_list_item.xml" value="0.26510416666666664" />
-        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/note_item.xml" value="0.26510416666666664" />
-        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/password.xml" value="0.25052083333333336" />
-        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/xml/activity_login.xml" value="0.26510416666666664" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/dialog_edit_text.xml" value="0.10552536231884058" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/note_edit.xml" value="0.32364096080910243" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/note_edit_list_item.xml" value="0.3333333333333333" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/layout/password.xml" value="0.10552536231884058" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/menu/note_edit.xml" value="0.17916666666666667" />
-        <entry key="..\:/MiNote_maintain/new_MiCode/src/Notes1/app/src/main/res/menu/private_folder.xml" value="0.17916666666666667" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/drawable/new_note.xml" value="0.1345" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/add_account_text.xml" value="0.15364583333333334" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/datetime_picker.xml" value="0.15364583333333334" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/dialog_edit_text.xml" value="0.15364583333333334" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/layout/note_item.xml" value="0.15364583333333334" />
+        <entry key="..\:/AndroidTool/AndriodProject/Notes1/app/src/main/res/menu/note_edit.xml" value="0.15364583333333334" />
        <entry key="..\:/Notes1/app/src/main/res/layout/account_dialog_title.xml" value="0.10552536231884058" />
        <entry key="..\:/Notes1/app/src/main/res/layout/add_account_text.xml" value="0.10552536231884058" />
        <entry key="..\:/Notes1/app/src/main/res/layout/datetime_picker.xml" value="0.10552536231884058" />
--- a/src/Notes1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@ -1,14 +1,14 @@

-\	java:S112ž"FDefine and throw a dedicated exception instead of using a generic one.(ˆ¥ÉÎ
-p
-java:S2293Œ"YReplace the type specification in this constructor call with the diamond operator ("<>").(è‰¥ð
-d
-java:S1192Ò"NDefine a constant instead of duplicating this literal "if_create.txt" 3 times.(Ì¬²
-l	java:S117§"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(”…ë<E280A6>ÿÿÿÿÿ
-g	java:S117â"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ä›áí
-l	java:S117ç"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ŽßÎþûÿÿÿÿ
-l	java:S117é"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÀÇÏ¯üÿÿÿÿ
-l	java:S117ô"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¦°²¥øÿÿÿÿ
+c	java:S112ž"FDefine and throw a dedicated exception instead of using a generic one.(ˆ¥ÉÎ8ÏŽ<EFBFBD>˜¿0
+w
+java:S2293Œ"YReplace the type specification in this constructor call with the diamond operator ("<>").(è‰¥ð8ÐŽ<EFBFBD>˜¿0
+k
+java:S1192Ò"NDefine a constant instead of duplicating this literal "if_create.txt" 3 times.(Ì¬²8ÒŽ<EFBFBD>˜¿0
+s	java:S117§"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(”…ë<E280A6>ÿÿÿÿÿ8ÔŽ<EFBFBD>˜¿0
+n	java:S117â"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ä›áí8ÔŽ<EFBFBD>˜¿0
+s	java:S117ç"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ŽßÎþûÿÿÿÿ8ÕŽ<EFBFBD>˜¿0
+s	java:S117é"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ÀÇÏ¯üÿÿÿÿ8ÕŽ<EFBFBD>˜¿0
+s	java:S117ô"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(¦°²¥øÿÿÿÿ8ÕŽ<EFBFBD>˜¿0
 >
 java:S1604Œ"(Make this anonymous inner class a lambda(—ÌºV
 ?
@ -17,22 +17,22 @@ java:S1604
 java:S1604È"(Make this anonymous inner class a lambda(¿Ü´ã
 D
 java:S1604ä"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
-?
-java:S1604ì"(Make this anonymous inner class a lambda(øÄì‡
-?
-java:S1604Ù"(Make this anonymous inner class a lambda(Û±¼ 
+F
+java:S1604ì"(Make this anonymous inner class a lambda(øÄì‡8ÖŽ<EFBFBD>˜¿0
+F
+java:S1604Ù"(Make this anonymous inner class a lambda(Û±¼ 8ÖŽ<EFBFBD>˜¿0
 ?
 java:S1604þ"(Make this anonymous inner class a lambda(Î¬¯”
-D
-java:S1604Ü"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
-?
-java:S1604ä"(Make this anonymous inner class a lambda(øÄì‡
-g
-java:S1301¼"KReplace this "switch" statement by "if" statements to increase readability.(×“¾ñùÿÿÿÿ
-e
-java:S2095Ÿ"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.(á©Úî
-N
-java:S2589¡"7Remove this expression which always evaluates to "true"(åÄ…©
+K
+java:S1604Ü"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ8×Ž<EFBFBD>˜¿0
+F
+java:S1604ä"(Make this anonymous inner class a lambda(øÄì‡8×Ž<EFBFBD>˜¿0
+n
+java:S1301¼"KReplace this "switch" statement by "if" statements to increase readability.(×“¾ñùÿÿÿÿ8ØŽ<EFBFBD>˜¿0
+l
+java:S2095Ÿ"NUse try-with-resources or close this "FileOutputStream" in a "finally" clause.(á©Úî8¾<EFBFBD><EFBFBD>˜¿0
+U
+java:S2589¡"7Remove this expression which always evaluates to "true"(åÄ…©8¾<EFBFBD><EFBFBD>˜¿0
 o	java:S116w"ZRename this field "if_first_create" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ý¥Ã·
 t
 java:S1450w"^Remove the "if_first_create" field and declare it as a local variable in the relevant methods.(Ý¥Ã·
@ -66,37 +66,37 @@ M
 java:S1874ê"1Remove this use of "getHeight"; it is deprecated.(·¡ªÃýÿÿÿÿ
 8
 java:S1116 "Remove this empty statement.(ôŸŽìúÿÿÿÿ
-i
-java:S3776á"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ãìîí
-?	java:S108è")Either remove or fill this block of code.(žûÊ¥
-h
-java:S3776Ñ"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ÅôÉ#
+p
+java:S3776á"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(ãìîí8á<EFBFBD><EFBFBD>˜¿0
+F	java:S108è")Either remove or fill this block of code.(žûÊ¥8â<EFBFBD><EFBFBD>˜¿0
+o
+java:S3776Ñ"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(ÅôÉ#8è<EFBFBD><EFBFBD>˜¿0
 N
 java:S1135•"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
-^
-java:S1126š"BReplace this if-then-else statement by a single method invocation.(çŽ’¦ýÿÿÿÿ
+e
+java:S1126š"BReplace this if-then-else statement by a single method invocation.(çŽ’¦ýÿÿÿÿ8î<EFBFBD><EFBFBD>˜¿0
 N
 java:S1135¢"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
-e
-java:S1871»"IThis case's code block is the same as the block for the case on line 683.(øì´÷ûÿÿÿÿ
-i	java:S100¦"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(µñü‚øÿÿÿÿ
+l
+java:S1871»"IThis case's code block is the same as the block for the case on line 683.(øì´÷ûÿÿÿÿ8ð<EFBFBD><EFBFBD>˜¿0
+p	java:S100¦"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(µñü‚øÿÿÿÿ8ö<EFBFBD><EFBFBD>˜¿0
 F
 java:S2093ª"*Change this "try" to a try-with-resources.(¡»¢üùÿÿÿÿ
-d	java:S100Â"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(©¸˜Á
-W	java:S125Ô"<This block of commented-out lines of code should be removed.(Óä§Çúÿÿÿÿ
-W	java:S125ƒ"<This block of commented-out lines of code should be removed.(Ó”©Öøÿÿÿÿ
-R	java:S125‡"<This block of commented-out lines of code should be removed.(¾è–á
-N
-java:S1135‰"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
-N
-java:S1135–"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ
+k	java:S100Â"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(©¸˜Á8ÿ<EFBFBD><EFBFBD>˜¿0
+^	java:S125Ô"<This block of commented-out lines of code should be removed.(Óä§Çúÿÿÿÿ8<EFBFBD><EFBFBD><EFBFBD>˜¿0
+^	java:S125ƒ"<This block of commented-out lines of code should be removed.(Ó”©Öøÿÿÿÿ8„<EFBFBD><EFBFBD>˜¿0
+Y	java:S125‡"<This block of commented-out lines of code should be removed.(¾è–á8„<EFBFBD><EFBFBD>˜¿0
+U
+java:S1135‰"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ8„<EFBFBD><EFBFBD>˜¿0
+U
+java:S1135–"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ8…<EFBFBD><EFBFBD>˜¿0
 h
 java:S3776Ÿ"RRefactor this method to reduce its Cognitive Complexity from 28 to the 15 allowed.(ôŒùb
-G
-java:S3398¡"0Move this method into "OnListItemClickListener".(‘ðð¡
+N
+java:S3398¡"0Move this method into "OnListItemClickListener".(‘ðð¡8‰<EFBFBD><EFBFBD>˜¿0
 K
 java:S3398Ã"/Move this method into "BackgroundQueryHandler".(—÷õŽüÿÿÿÿ
+C
+java:S3398á"%Move this method into "ModeCallback".(ãìîí8‰<38><E280B0>˜¿0
 A
-java:S3398×"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ
-<
-java:S3398á"%Move this method into "ModeCallback".(ãìîí
+java:S3398×"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ
--- a/src/Notes1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes1/.idea/sonarlint/issuestore/index.pb
@ -1,19 +1,17 @@

 h
 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+@
+app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
 i
 9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa
 l
 <app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java,0\2\0268ec648e2fc0139b30ed13396174b7392c1ae2
 g
 7app/src/main/java/net/micode/notes/ui/NoteItemData.java,0\8\08c35f02f11c35ae9ebf8db0a482054dfa1cf493
-b
-2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb
-i
-9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236
-m
-=app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4
-@
-app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
+l
+<app/src/main/java/net/micode/notes/ui/NotesListActivity.java,a\d\ad72331a1bed265bb9c0fe838faa74dbf69fce32
+P
+ app/src/main/AndroidManifest.xml,8\c\8c55c3ccc257e5907959013f99656e4c8ec3903e
--- a/src/Notes1/app/build.gradle
+++ b/src/Notes1/app/build.gradle
@ -18,5 +18,9 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
        }
    }
-
+    sourceSets{
+        main(){
+            jniLibs.srcDirs = ['libs']
+        }
+    }
 }
--- a/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
+++ b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
--- a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
+++ b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
--- a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
+++ b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
--- a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
+++ b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
--- a/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,4 +1,4 @@
-#Thu Oct 20 08:41:35 CST 2022
+#Thu Oct 20 21:09:27 CST 2022
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
--- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@ -64,6 +64,7 @@
    <string name="menu_font_normal">Medium</string>
    <string name="menu_font_size">Font size</string>
    <string name="menu_font_small">Small</string>
+    <string name="menu_font_style">font style</string>
    <string name="menu_font_super">Super</string>
    <string name="menu_list_mode">Enter check list</string>
    <string name="menu_move">Move to folder</string>
--- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets"><file name="iflytek/recognize.xml" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\recognize.xml"/><file name="iflytek/voice_bg.9.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_bg.9.png"/><file name="iflytek/voice_empty.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_empty.png"/><file name="iflytek/voice_full.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_full.png"/><file name="iflytek/waiting.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\waiting.png"/><file name="iflytek/warning.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\warning.png"/></source><source path="D:\AndroidTool\AndriodProject\Notes1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets"><file name="iflytek/recognize.xml" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\recognize.xml"/><file name="iflytek/voice_bg.9.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_bg.9.png"/><file name="iflytek/voice_empty.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_empty.png"/><file name="iflytek/voice_full.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\voice_full.png"/><file name="iflytek/waiting.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\waiting.png"/><file name="iflytek/warning.png" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\iflytek\warning.png"/><file name="font/新蒂文征明体.ttf" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\assets\font\新蒂文征明体.ttf"/></source><source path="D:\AndroidTool\AndriodProject\Notes1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\debug\assets"/></dataSet></merger>
--- a/src/Notes1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\jniLibs"><file name="armeabi-v7a/libmsc.so" path="D:\AndroidTool\AndriodProject\Notes1\app\src\main\jniLibs\armeabi-v7a\libmsc.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\libs"><file name="arm64-v8a/libmsc.so" path="D:\AndroidTool\AndriodProject\Notes1\app\libs\arm64-v8a\libmsc.so"/><file name="armeabi-v7a/libmsc.so" path="D:\AndroidTool\AndriodProject\Notes1\app\libs\armeabi-v7a\libmsc.so"/><file name="Msc.jar" path="D:\AndroidTool\AndriodProject\Notes1\app\libs\Msc.jar"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\AndroidTool\AndriodProject\Notes1\app\src\debug\jniLibs"/></dataSet></merger>
--- a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Thu Oct 20 09:16:49 CST 2022
+#Thu Oct 20 21:15:53 CST 2022
 base.0=D\:\\AndroidTool\\AndriodProject\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
--- a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
--- a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
+++ b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
--- a/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -32,241 +32,247 @@
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 27-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:27:5-88
 27-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:27:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:28:5-67
-28-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:28:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:5-72
-29-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:30:5-74
-30-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:30:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:31:5-80
-31-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:31:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:32:5-71
-32-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:32:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:33:5-74
-33-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:33:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:34:5-81
-34-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:34:22-78
-35
-36    <application
-36-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:37:5-152:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:38:9-42
-39        android:label="@string/app_name"
-39-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:40:9-53:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:41:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:42:13-74
-44            android:label="@string/app_name"
-44-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:43:13-45
-45            android:launchMode="singleTop"
-45-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:44:13-43
-46            android:theme="@style/NoteTheme"
-46-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:45:13-45
-47            android:windowSoftInputMode="adjustPan" >
-47-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:47:13-52
-48            <intent-filter>
-48-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:49:13-52:29
-49                <action android:name="android.intent.action.MAIN" />
-49-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:50:17-69
-49-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:50:25-66
-50
-51                <category android:name="android.intent.category.LAUNCHER" />
-51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:17-77
-51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:27-74
-52            </intent-filter>
-53        </activity>
-54        <activity
-54-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:55:9-84:20
-55            android:name="net.micode.notes.ui.NoteEditActivity"
-55-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:56:13-48
-56            android:configChanges="keyboardHidden|orientation|screenSize"
-56-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:57:13-74
-57            android:launchMode="singleTop"
-57-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:58:13-43
-58            android:theme="@style/NoteTheme" >
-58-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:59:13-45
-59            <intent-filter android:scheme="http" >
-59-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:61:13-67:29
-59-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:61:28-49
-60                <action android:name="android.intent.action.VIEW" />
-60-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:63:17-69
-60-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:63:25-66
-61
-62                <category android:name="android.intent.category.DEFAULT" />
-62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:17-76
-62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:27-73
+28    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+28-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:28:5-95
+28-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:28:22-76
+29    <uses-permission android:name="android.permission.INTERNET" />
+29-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:5-83
+29-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:22-64
+30    <uses-permission android:name="android.permission.INTERNET" />
+30-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:5-83
+30-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:29:22-64
+31    <uses-permission android:name="android.permission.READ_CONTACTS" />
+31-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:31:5-72
+31-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:31:22-69
+32    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+32-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:32:5-74
+32-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:32:22-71
+33    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+33-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:33:5-80
+33-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:33:22-77
+34    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+34-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:34:5-71
+34-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:34:22-68
+35    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+35-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:35:5-74
+35-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:35:22-71
+36    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+36-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:36:5-81
+36-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:36:22-78
+37
+38    <application
+38-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:38:5-153:19
+39        android:debuggable="true"
+40        android:icon="@drawable/icon_app"
+40-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:39:9-42
+41        android:label="@string/app_name"
+41-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:40:9-41
+42        android:testOnly="true" >
+43        <activity
+43-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:41:9-54:20
+44            android:name="net.micode.notes.ui.NotesListActivity"
+44-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:42:13-49
+45            android:configChanges="keyboardHidden|orientation|screenSize"
+45-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:43:13-74
+46            android:label="@string/app_name"
+46-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:44:13-45
+47            android:launchMode="singleTop"
+47-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:45:13-43
+48            android:theme="@style/NoteTheme"
+48-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:46:13-45
+49            android:windowSoftInputMode="adjustPan" >
+49-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:48:13-52
+50            <intent-filter>
+50-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:50:13-53:29
+51                <action android:name="android.intent.action.MAIN" />
+51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:17-69
+51-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:51:25-66
+52
+53                <category android:name="android.intent.category.LAUNCHER" />
+53-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:52:17-77
+53-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:52:27-74
+54            </intent-filter>
+55        </activity>
+56        <activity
+56-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:56:9-85:20
+57            android:name="net.micode.notes.ui.NoteEditActivity"
+57-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:57:13-48
+58            android:configChanges="keyboardHidden|orientation|screenSize"
+58-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:58:13-74
+59            android:launchMode="singleTop"
+59-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:59:13-43
+60            android:theme="@style/NoteTheme" >
+60-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:60:13-45
+61            <intent-filter android:scheme="http" >
+61-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:13-68:29
+61-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:62:28-49
+62                <action android:name="android.intent.action.VIEW" />
+62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:17-69
+62-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:25-66
 63
-64                <data android:mimeType="vnd.android.cursor.item/text_note" />
-64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-78
-64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:23-75
-65                <data android:mimeType="vnd.android.cursor.item/call_note" />
-65-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-78
-65-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:23-75
-66            </intent-filter>
-67            <intent-filter>
-67-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:69:13-74:29
-68                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-68-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:70:17-79
-68-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:70:25-76
-69
-70                <category android:name="android.intent.category.DEFAULT" />
-70-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:17-76
-70-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:27-73
+64                <category android:name="android.intent.category.DEFAULT" />
+64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76
+64-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73
+65
+66                <data android:mimeType="vnd.android.cursor.item/text_note" />
+66-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78
+66-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75
+67                <data android:mimeType="vnd.android.cursor.item/call_note" />
+67-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78
+67-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75
+68            </intent-filter>
+69            <intent-filter>
+69-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:70:13-75:29
+70                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+70-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:71:17-79
+70-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:71:25-76
 71
-72                <data android:mimeType="vnd.android.cursor.item/text_note" />
-72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-78
-72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:23-75
-73                <data android:mimeType="vnd.android.cursor.item/call_note" />
-73-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-78
-73-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:23-75
-74            </intent-filter>
-75            <intent-filter>
-75-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:76:13-79:29
-76                <action android:name="android.intent.action.SEARCH" />
-76-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:77:17-71
-76-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:77:25-68
-77
-78                <category android:name="android.intent.category.DEFAULT" />
-78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:17-76
-78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:64:27-73
-79            </intent-filter>
-80
-81            <meta-data
-81-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:81:13-83:54
-82                android:name="android.app.searchable"
-82-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:82:17-54
-83                android:resource="@xml/searchable" />
-83-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:83:17-51
-84        </activity>
-85
-86        <provider
-86-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:86:9-89:43
-87            android:name="net.micode.notes.data.NotesProvider"
-87-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:87:13-63
-88            android:authorities="micode_notes"
-88-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:88:13-47
-89            android:multiprocess="true" />
-89-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:89:13-40
-90
-91        <receiver
-91-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:91:9-103:20
-92            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-92-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:92:13-57
-93            android:label="@string/app_widget2x2" >
-93-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:93:13-50
-94            <intent-filter>
-94-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:94:13-98:29
-95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-95-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:17-84
-95-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:25-81
-96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-96-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:17-85
-96-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:25-82
-97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-97-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:17-85
-97-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:25-82
-98            </intent-filter>
-99
-100            <meta-data
-100-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:100:13-102:58
-101                android:name="android.appwidget.provider"
-101-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:101:17-58
-102                android:resource="@xml/widget_2x_info" />
-102-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:17-55
-103        </receiver>
-104        <receiver
-104-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:104:9-117:20
-105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-105-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:105:13-57
-106            android:label="@string/app_widget4x4" >
-106-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:13-50
-107            <intent-filter>
-107-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:94:13-98:29
-108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-108-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:17-84
-108-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:25-81
-109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:17-85
-109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:25-82
-110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:17-85
-110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:25-82
-111            </intent-filter>
-112
-113            <meta-data
-113-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:100:13-102:58
-114                android:name="android.appwidget.provider"
-114-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:101:17-58
-115                android:resource="@xml/widget_4x_info" />
-115-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:17-55
-116        </receiver>
-117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-117-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:119:9-123:20
-117-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:119:19-55
-118            <intent-filter>
-118-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:120:13-122:29
-119                <action android:name="android.intent.action.BOOT_COMPLETED" />
-119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:121:17-79
-119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:121:25-76
-120            </intent-filter>
-121        </receiver>
-122        <receiver
-122-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:125:9-128:20
-123            android:name="net.micode.notes.ui.AlarmReceiver"
-123-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:126:13-61
-124            android:process=":remote" >
-124-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:127:13-38
-125        </receiver>
-126
-127        <activity
-127-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:130:9-135:20
-128            android:name="net.micode.notes.ui.AlarmAlertActivity"
-128-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:131:13-50
-129            android:label="@string/app_name"
-129-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:132:13-45
-130            android:launchMode="singleInstance"
-130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:133:13-48
-131            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-131-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:134:13-75
-132        </activity>
-133        <activity
-133-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:137:9-142:20
-134            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-134-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:138:13-71
-135            android:label="@string/preferences_title"
-135-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:139:13-54
-136            android:launchMode="singleTop"
-136-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:140:13-43
-137            android:theme="@android:style/Theme.Holo.Light" >
-137-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:141:13-60
-138        </activity>
-139
-140        <service
-140-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:144:9-147:19
-141            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-141-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:145:13-74
-142            android:exported="false" >
-142-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:146:13-37
-143        </service>
-144
-145        <meta-data
-145-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:149:9-151:52
-146            android:name="android.app.default_searchable"
-146-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:150:13-58
-147            android:value=".ui.NoteEditActivity" />
-147-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:151:13-49
-148    </application>
-149
-150</manifest>
+72                <category android:name="android.intent.category.DEFAULT" />
+72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76
+72-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73
+73
+74                <data android:mimeType="vnd.android.cursor.item/text_note" />
+74-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78
+74-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75
+75                <data android:mimeType="vnd.android.cursor.item/call_note" />
+75-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:17-78
+75-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:66:23-75
+76            </intent-filter>
+77            <intent-filter>
+77-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:77:13-80:29
+78                <action android:name="android.intent.action.SEARCH" />
+78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:78:17-71
+78-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:78:25-68
+79
+80                <category android:name="android.intent.category.DEFAULT" />
+80-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:17-76
+80-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:65:27-73
+81            </intent-filter>
+82
+83            <meta-data
+83-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:82:13-84:54
+84                android:name="android.app.searchable"
+84-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:83:17-54
+85                android:resource="@xml/searchable" />
+85-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:84:17-51
+86        </activity>
+87
+88        <provider
+88-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:87:9-90:43
+89            android:name="net.micode.notes.data.NotesProvider"
+89-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:88:13-63
+90            android:authorities="micode_notes"
+90-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:89:13-47
+91            android:multiprocess="true" />
+91-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:90:13-40
+92
+93        <receiver
+93-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:92:9-104:20
+94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+94-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:93:13-57
+95            android:label="@string/app_widget2x2" >
+95-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:94:13-50
+96            <intent-filter>
+96-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:13-99:29
+97                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+97-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:17-84
+97-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:25-81
+98                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+98-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:17-85
+98-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:25-82
+99                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+99-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:17-85
+99-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:25-82
+100            </intent-filter>
+101
+102            <meta-data
+102-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:101:13-103:58
+103                android:name="android.appwidget.provider"
+103-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:17-58
+104                android:resource="@xml/widget_2x_info" />
+104-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:103:17-55
+105        </receiver>
+106        <receiver
+106-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:105:9-118:20
+107            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+107-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:106:13-57
+108            android:label="@string/app_widget4x4" >
+108-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:107:13-50
+109            <intent-filter>
+109-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:95:13-99:29
+110                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:17-84
+110-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:96:25-81
+111                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+111-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:17-85
+111-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:97:25-82
+112                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+112-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:17-85
+112-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:98:25-82
+113            </intent-filter>
+114
+115            <meta-data
+115-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:101:13-103:58
+116                android:name="android.appwidget.provider"
+116-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:102:17-58
+117                android:resource="@xml/widget_4x_info" />
+117-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:103:17-55
+118        </receiver>
+119        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:120:9-124:20
+119-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:120:19-55
+120            <intent-filter>
+120-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:121:13-123:29
+121                <action android:name="android.intent.action.BOOT_COMPLETED" />
+121-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:122:17-79
+121-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:122:25-76
+122            </intent-filter>
+123        </receiver>
+124        <receiver
+124-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:126:9-129:20
+125            android:name="net.micode.notes.ui.AlarmReceiver"
+125-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:127:13-61
+126            android:process=":remote" >
+126-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:128:13-38
+127        </receiver>
+128
+129        <activity
+129-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:131:9-136:20
+130            android:name="net.micode.notes.ui.AlarmAlertActivity"
+130-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:132:13-50
+131            android:label="@string/app_name"
+131-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:133:13-45
+132            android:launchMode="singleInstance"
+132-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:134:13-48
+133            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+133-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:135:13-75
+134        </activity>
+135        <activity
+135-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:138:9-143:20
+136            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+136-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:139:13-71
+137            android:label="@string/preferences_title"
+137-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:140:13-54
+138            android:launchMode="singleTop"
+138-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:141:13-43
+139            android:theme="@android:style/Theme.Holo.Light" >
+139-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:142:13-60
+140        </activity>
+141
+142        <service
+142-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:145:9-148:19
+143            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+143-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:146:13-74
+144            android:exported="false" >
+144-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:147:13-37
+145        </service>
+146
+147        <meta-data
+147-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:150:9-152:52
+148            android:name="android.app.default_searchable"
+148-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:151:13-58
+149            android:value=".ui.NoteEditActivity" />
+149-->D:\AndroidTool\AndriodProject\Notes1\app\src\main\AndroidManifest.xml:152:13-49
+150    </application>
+151
+152</manifest>
--- a/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@ -25,6 +25,8 @@

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
--- a/src/Notes1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@ -25,6 +25,8 @@

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
--- a/src/Notes1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
+++ b/src/Notes1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
--- a/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
+++ b/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
--- a/src/Notes1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
+++ b/src/Notes1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
--- a/src/Notes1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
+++ b/src/Notes1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
--- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -1,10 +1,115 @@
 {
    "logs": [
        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "C:\\Users\\郑皓原\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
            "map": [
                {
-                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "123,127,131,135,138,142,146,150,154,158,162",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "7992,8196,8407,8572,8732,8915,9100,9285,9488,9694,9877",
+                        "endLines": "126,130,134,137,141,145,149,153,157,161,165",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8191,8402,8567,8727,8910,9095,9280,9483,9689,9872,10073"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8180,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8584,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122",
+                        "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2718,2771,2831,2936,3038,3093,3164,3213,3271,3318,3377,3434,3505,3566,3623,3673,3725,3778,3828,3883,3933,3993,4046,4112,4179,4241,4304,4351,4406,4494,4552,4614,4664,4709,4752,4812,4879,4934,4989,5042,5089,5142,5198,5246,5301,5354,5438,5505,5569,5665,5739,5820,5909,6072,6216,6295,6370,6429,6509,6589,6644,6766,6869,6910,6963,7020,7094,7159,7227,7313,7393,7462,7556,7615,7670,7732,7792,7902",
+                        "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,77,52,59,104,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,54,49,59,52,65,66,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,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2713,2766,2826,2931,3033,3088,3159,3208,3266,3313,3372,3429,3500,3561,3618,3668,3720,3773,3823,3878,3928,3988,4041,4107,4174,4236,4299,4346,4401,4489,4547,4609,4659,4704,4747,4807,4874,4929,4984,5037,5084,5137,5193,5241,5296,5349,5433,5500,5564,5660,5734,5815,5904,6067,6211,6290,6365,6424,6504,6584,6639,6761,6864,6905,6958,7015,7089,7154,7222,7308,7388,7457,7551,7610,7665,7727,7787,7897,7987"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "C:\\Users\\郑皓原\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
@ -21,25 +126,6 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
-                },
-                {
-                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6586,3549,3483,3410,3360,827,867,915,6137,6182,6532,6482,1199,3915,3983,3856,3791,3728,4646,4586,4523,4115,2931,1369,1422,4169,3622,6239,3301,3088,1799,2080,2326,1852,2818,2765,2714,2519,2471,2377,2425,2565,2612,2123,3242,2878,2662,3131,2037,2279,2223,2168,3033,1993,2991,1902,1943,3183,1318,1623,1719,1576,1672,1529,1484,1148,1095,5021,4962,5162,6063,5473,5404,5537,5615,5798,5725,5096,5349,5219,5284,4913,5902,5985,6444,6337,6289,6382,1261,4060,4464,4759,4701,4826,4416,4371,4323,4272,963,1029",
-                        "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,52,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": "6758,3617,3544,3478,3405,862,910,958,6177,6234,6581,6527,1256,3978,4055,3910,3851,3786,4696,4641,4581,4164,2986,1417,1479,4249,3698,6284,3355,3126,1847,2118,2372,1897,2873,2813,2760,2560,2514,2420,2466,2607,2657,2163,3296,2926,2709,3178,2075,2321,2274,2218,3083,2032,3028,1938,1988,3237,1364,1667,1763,1618,1714,1571,1524,1194,1143,5091,5016,5214,6132,5532,5468,5610,5720,5897,5793,5157,5399,5279,5344,4957,5980,6058,6477,6377,6332,6439,1313,4110,4518,4821,4754,4883,4459,4411,4366,4318,1024,1090"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
-                        "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",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2910,2962,3014,3057,3104,3160,3215,3270,3314,3356,3397,3447,3506,3557,3606,3655,3702,3749,3796,3841,3892,3945,4020,4079,4136,4210,4274,4343,4421,4531,4635,4708,4774,4829,4894,4959,5008,5091,5169,5207,5252,5300,5362,5419,5474,5533,5600,5658,5720,5768,5813,5861,5912,5978",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2905,2957,3009,3052,3099,3155,3210,3265,3309,3351,3392,3442,3501,3552,3601,3650,3697,3744,3791,3836,3887,3940,4015,4074,4131,4205,4269,4338,4416,4526,4630,4703,4769,4824,4889,4954,5003,5086,5164,5202,5247,5295,5357,5414,5469,5528,5595,5653,5715,5763,5808,5856,5907,5973,6039"
-                    }
                }
            ]
        },
@ -49,11 +135,9 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\colors.xml",
                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                    },
                    "to": {
                        "startLines": "12",
@ -66,12 +150,9 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\arrays.xml",
                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                    },
                    "to": {
                        "startLines": "2,8",
@ -85,49 +166,44 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\styles.xml",
                    "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2853,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "126,130,134,138,141,145,149,153,157,161,165",
+                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8191,8395,8606,8771,8931,9114,9299,9484,9687,9893,10076",
-                        "endLines": "129,133,137,140,144,148,152,156,160,164,168",
+                        "startOffsets": "8246,8450,8661,8826,8986,9169,9354,9539,9742,9948,10131",
+                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8390,8601,8766,8926,9109,9294,9479,9682,9888,10071,10272"
+                        "endOffsets": "8445,8656,8821,8981,9164,9349,9534,9737,9943,10126,10327"
                    }
                },
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8075,3965,4226,4130,4061,827,870,922,7573,7622,8017,7966,1282,4680,4774,4609,4525,4442,5641,5558,5456,4950,2004,1953,3464,1486,1539,5011,2097,4309,7685,3894,3649,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3828,3397,3146,3698,2424,2717,2629,2571,3587,2374,3542,2271,2314,3761,1431,1750,1858,1703,1805,1647,1599,1227,1174,6097,6030,6338,7476,6702,6621,6776,6865,7107,7028,6181,6256,6562,6402,6482,5975,7251,7373,7925,7798,7741,7851,1366,4882,5370,5776,5707,5856,5311,5256,5194,5134,974,1084",
-                        "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,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": "8479,4056,4304,4221,4125,865,917,969,7617,7680,8070,8012,1361,4769,4877,4675,4604,4520,5702,5636,5553,5006,2061,1999,3537,1534,1594,5111,2151,4406,7735,3960,3693,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3889,3459,3203,3756,2466,2767,2712,2624,3644,2419,3582,2309,2369,3823,1481,1800,1906,1745,1853,1698,1642,1277,1222,6176,6092,6397,7567,6771,6697,6860,7023,7246,7102,6251,6333,6616,6477,6557,6025,7368,7471,7961,7846,7793,7920,1426,4945,5451,5851,5771,5945,5365,5306,5251,5189,1079,1169"
+                        "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,104,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2004,1953,-1,-1,-1,-1,2097,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6256,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,104,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,61,50,-1,-1,-1,-1,58,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,81,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8533,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2061,1999,-1,-1,-1,-1,2151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6333,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
-                        "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",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4296,4358,4421,4468,4523,4611,4669,4731,4781,4826,4869,4929,4996,5051,5106,5159,5206,5259,5315,5363,5418,5471,5555,5622,5686,5782,5856,5937,6026,6189,6333,6412,6487,6569,6628,6708,6788,6843,6965,7068,7109,7162,7219,7293,7358,7426,7512,7592,7661,7755,7814,7869,7931,7991,8101",
-                        "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",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4291,4353,4416,4463,4518,4606,4664,4726,4776,4821,4864,4924,4991,5046,5101,5154,5201,5254,5310,5358,5413,5466,5550,5617,5681,5777,5851,5932,6021,6184,6328,6407,6482,6564,6623,6703,6783,6838,6960,7063,7104,7157,7214,7288,7353,7421,7507,7587,7656,7750,7809,7864,7926,7986,8096,8186"
+                        "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,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4055,4105,4165,4218,4284,4351,4413,4476,4523,4578,4666,4724,4786,4836,4881,4924,4984,5051,5106,5161,5214,5261,5314,5370,5418,5473,5526,5610,5677,5741,5837,5911,5992,6081,6244,6388,6467,6542,6624,6683,6763,6843,6898,7020,7123,7164,7217,7274,7348,7413,7481,7567,7647,7716,7810,7869,7924,7986,8046,8156",
+                        "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,57,46,58,56,70,60,56,49,51,52,49,54,49,59,52,65,66,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4050,4100,4160,4213,4279,4346,4408,4471,4518,4573,4661,4719,4781,4831,4876,4919,4979,5046,5101,5156,5209,5256,5309,5365,5413,5468,5521,5605,5672,5736,5832,5906,5987,6076,6239,6383,6462,6537,6619,6678,6758,6838,6893,7015,7118,7159,7212,7269,7343,7408,7476,7562,7642,7711,7805,7864,7919,7981,8041,8151,8241"
                    }
                },
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\dimens.xml",
                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                    },
                    "to": {
                        "startLines": "13,14,15,16,17",
@ -140,29 +216,10 @@
            ]
        },
        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "C:\\Users\\郑皓原\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
            "map": [
                {
-                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-                    "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
-                    }
-                },
-                {
-                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
@ -179,6 +236,25 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "122,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,59,58,57,53,52,50,51,125,54,55,45,67,60,56,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6585,3548,3482,3409,3359,827,867,915,6136,6181,6531,6481,1199,3914,3982,3855,3790,3727,4645,4585,4522,4114,2930,1369,1422,4168,3621,6238,3300,3087,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,6762,2564,2611,2122,3241,2877,2661,3130,2036,2278,2222,2167,3032,1992,2990,1901,1942,3182,1318,1623,1719,1576,1672,1529,1484,1148,1095,5020,4961,5161,6062,5472,5403,5536,5614,5797,5724,5095,5348,5218,5283,4912,5901,5984,6443,6336,6288,6381,1261,4059,4463,4758,4700,4825,4415,4370,4322,4271,963,1029",
+                        "endLines": "124,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,59,58,57,53,52,50,51,125,54,55,45,67,60,56,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,52,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": "6757,3616,3543,3477,3404,862,910,958,6176,6233,6580,6526,1256,3977,4054,3909,3850,3785,4695,4640,4580,4163,2985,1417,1479,4248,3697,6283,3354,3125,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,6806,2606,2656,2162,3295,2925,2708,3177,2074,2320,2273,2217,3082,2031,3027,1937,1987,3236,1364,1667,1763,1618,1714,1571,1524,1194,1143,5090,5015,5213,6131,5531,5467,5609,5719,5896,5792,5156,5398,5278,5343,4956,5979,6057,6476,6376,6331,6438,1313,4109,4517,4820,4753,4882,4458,4410,4365,4317,1024,1090"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
+                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2705,2752,2802,2847,2906,2959,3011,3063,3106,3153,3209,3264,3319,3363,3405,3446,3496,3555,3606,3655,3704,3751,3798,3845,3890,3941,3994,4069,4128,4185,4259,4323,4392,4470,4580,4684,4757,4823,4878,4943,5008,5057,5140,5218,5256,5301,5349,5411,5468,5523,5582,5649,5707,5769,5817,5862,5910,5961,6027",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2700,2747,2797,2842,2901,2954,3006,3058,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022,6088"
+                    }
                }
            ]
        }
--- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@ -25,20 +25,20 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                    "from": {
-                        "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6586,3549,3483,3410,3360,827,867,915,6137,6182,6532,6482,1199,3915,3983,3856,3791,3728,4646,4586,4523,4115,2931,1369,1422,4169,3622,6239,3301,3088,1799,2080,2326,1852,2818,2765,2714,2519,2471,2377,2425,2565,2612,2123,3242,2878,2662,3131,2037,2279,2223,2168,3033,1993,2991,1902,1943,3183,1318,1623,1719,1576,1672,1529,1484,1148,1095,5021,4962,5162,6063,5473,5404,5537,5615,5798,5725,5096,5349,5219,5284,4913,5902,5985,6444,6337,6289,6382,1261,4060,4464,4759,4701,4826,4416,4371,4323,4272,963,1029",
-                        "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,52,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": "6758,3617,3544,3478,3405,862,910,958,6177,6234,6581,6527,1256,3978,4055,3910,3851,3786,4696,4641,4581,4164,2986,1417,1479,4249,3698,6284,3355,3126,1847,2118,2372,1897,2873,2813,2760,2560,2514,2420,2466,2607,2657,2163,3296,2926,2709,3178,2075,2321,2274,2218,3083,2032,3028,1938,1988,3237,1364,1667,1763,1618,1714,1571,1524,1194,1143,5091,5016,5214,6132,5532,5468,5610,5720,5897,5793,5157,5399,5279,5344,4957,5980,6058,6477,6377,6332,6439,1313,4110,4518,4821,4754,4883,4459,4411,4366,4318,1024,1090"
+                        "startLines": "122,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,59,58,57,53,52,50,51,125,54,55,45,67,60,56,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6585,3548,3482,3409,3359,827,867,915,6136,6181,6531,6481,1199,3914,3982,3855,3790,3727,4645,4585,4522,4114,2930,1369,1422,4168,3621,6238,3300,3087,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,6762,2564,2611,2122,3241,2877,2661,3130,2036,2278,2222,2167,3032,1992,2990,1901,1942,3182,1318,1623,1719,1576,1672,1529,1484,1148,1095,5020,4961,5161,6062,5472,5403,5536,5614,5797,5724,5095,5348,5218,5283,4912,5901,5984,6443,6336,6288,6381,1261,4059,4463,4758,4700,4825,4415,4370,4322,4271,963,1029",
+                        "endLines": "124,72,71,70,69,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,61,29,30,82,73,115,68,64,38,44,49,39,59,58,57,53,52,50,51,125,54,55,45,67,60,56,65,43,48,47,46,63,42,62,40,41,66,28,34,36,33,35,32,31,25,24,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,52,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": "6757,3616,3543,3477,3404,862,910,958,6176,6233,6580,6526,1256,3977,4054,3909,3850,3785,4695,4640,4580,4163,2985,1417,1479,4248,3697,6283,3354,3125,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,6806,2606,2656,2162,3295,2925,2708,3177,2074,2320,2273,2217,3082,2031,3027,1937,1987,3236,1364,1667,1763,1618,1714,1571,1524,1194,1143,5090,5015,5213,6131,5531,5467,5609,5719,5896,5792,5156,5398,5278,5343,4956,5979,6057,6476,6376,6331,6438,1313,4109,4517,4820,4753,4882,4458,4410,4365,4317,1024,1090"
                    },
                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
-                        "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",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2910,2962,3014,3057,3104,3160,3215,3270,3314,3356,3397,3447,3506,3557,3606,3655,3702,3749,3796,3841,3892,3945,4020,4079,4136,4210,4274,4343,4421,4531,4635,4708,4774,4829,4894,4959,5008,5091,5169,5207,5252,5300,5362,5419,5474,5533,5600,5658,5720,5768,5813,5861,5912,5978",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2905,2957,3009,3052,3099,3155,3210,3265,3309,3351,3392,3442,3501,3552,3601,3650,3697,3744,3791,3836,3887,3940,4015,4074,4131,4205,4269,4338,4416,4526,4630,4703,4769,4824,4889,4954,5003,5086,5164,5202,5247,5295,5357,5414,5469,5528,5595,5653,5715,5763,5808,5856,5907,5973,6039"
+                        "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",
+                        "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": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2705,2752,2802,2847,2906,2959,3011,3063,3106,3153,3209,3264,3319,3363,3405,3446,3496,3555,3606,3655,3704,3751,3798,3845,3890,3941,3994,4069,4128,4185,4259,4323,4392,4470,4580,4684,4757,4823,4878,4943,5008,5057,5140,5218,5256,5301,5349,5411,5468,5523,5582,5649,5707,5769,5817,5862,5910,5961,6027",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,48,46,49,44,58,52,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2700,2747,2797,2842,2901,2954,3006,3058,3101,3148,3204,3259,3314,3358,3400,3441,3491,3550,3601,3650,3699,3746,3793,3840,3885,3936,3989,4064,4123,4180,4254,4318,4387,4465,4575,4679,4752,4818,4873,4938,5003,5052,5135,5213,5251,5296,5344,5406,5463,5518,5577,5644,5702,5764,5812,5857,5905,5956,6022,6088"
                    }
                }
            ]
--- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -1,16 +1,14 @@
 {
    "logs": [
        {
-            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "outputFile": "C:\\Users\\郑皓原\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
            "map": [
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\colors.xml",
                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                    },
                    "to": {
                        "startLines": "12",
@ -23,12 +21,9 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\arrays.xml",
                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                    },
                    "to": {
                        "startLines": "2,8",
@ -42,49 +37,130 @@
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\styles.xml",
                    "from": {
-                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
-                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2853,2634,1073,1258,1443,1647,1854,890,2056"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "126,130,134,138,141,145,149,153,157,161,165",
+                        "startLines": "123,127,131,135,138,142,146,150,154,158,162",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8191,8395,8606,8771,8931,9114,9299,9484,9687,9893,10076",
-                        "endLines": "129,133,137,140,144,148,152,156,160,164,168",
+                        "startOffsets": "7992,8196,8407,8572,8732,8915,9100,9285,9488,9694,9877",
+                        "endLines": "126,130,134,137,141,145,149,153,157,161,165",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8390,8601,8766,8926,9109,9294,9479,9682,9888,10071,10272"
+                        "endOffsets": "8191,8402,8567,8727,8910,9095,9280,9483,9689,9872,10073"
                    }
                },
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8075,3965,4226,4130,4061,827,870,922,7573,7622,8017,7966,1282,4680,4774,4609,4525,4442,5641,5558,5456,4950,2004,1953,3464,1486,1539,5011,2097,4309,7685,3894,3649,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3828,3397,3146,3698,2424,2717,2629,2571,3587,2374,3542,2271,2314,3761,1431,1750,1858,1703,1805,1647,1599,1227,1174,6097,6030,6338,7476,6702,6621,6776,6865,7107,7028,6181,6256,6562,6402,6482,5975,7251,7373,7925,7798,7741,7851,1366,4882,5370,5776,5707,5856,5311,5256,5194,5134,974,1084",
-                        "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,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": "8479,4056,4304,4221,4125,865,917,969,7617,7680,8070,8012,1361,4769,4877,4675,4604,4520,5702,5636,5553,5006,2061,1999,3537,1534,1594,5111,2151,4406,7735,3960,3693,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3889,3459,3203,3756,2466,2767,2712,2624,3644,2419,3582,2309,2369,3823,1481,1800,1906,1745,1853,1698,1642,1277,1222,6176,6092,6397,7567,6771,6697,6860,7023,7246,7102,6251,6333,6616,6477,6557,6025,7368,7471,7961,7846,7793,7920,1426,4945,5451,5851,5771,5945,5365,5306,5251,5189,1079,1169"
+                        "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8180,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8584,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125",
-                        "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",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4296,4358,4421,4468,4523,4611,4669,4731,4781,4826,4869,4929,4996,5051,5106,5159,5206,5259,5315,5363,5418,5471,5555,5622,5686,5782,5856,5937,6026,6189,6333,6412,6487,6569,6628,6708,6788,6843,6965,7068,7109,7162,7219,7293,7358,7426,7512,7592,7661,7755,7814,7869,7931,7991,8101",
-                        "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",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4291,4353,4416,4463,4518,4606,4664,4726,4776,4821,4864,4924,4991,5046,5101,5154,5201,5254,5310,5358,5413,5466,5550,5617,5681,5777,5851,5932,6021,6184,6328,6407,6482,6564,6623,6703,6783,6838,6960,7063,7104,7157,7214,7288,7353,7421,7507,7587,7656,7750,7809,7864,7926,7986,8096,8186"
+                        "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",
+                        "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2718,2771,2831,2936,3038,3093,3164,3213,3271,3318,3377,3434,3505,3566,3623,3673,3725,3778,3828,3883,3933,3993,4046,4112,4179,4241,4304,4351,4406,4494,4552,4614,4664,4709,4752,4812,4879,4934,4989,5042,5089,5142,5198,5246,5301,5354,5438,5505,5569,5665,5739,5820,5909,6072,6216,6295,6370,6429,6509,6589,6644,6766,6869,6910,6963,7020,7094,7159,7227,7313,7393,7462,7556,7615,7670,7732,7792,7902",
+                        "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,77,52,59,104,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,54,49,59,52,65,66,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,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2713,2766,2826,2931,3033,3088,3159,3208,3266,3313,3372,3429,3500,3561,3618,3668,3720,3773,3823,3878,3928,3988,4041,4107,4174,4236,4299,4346,4401,4489,4547,4609,4659,4704,4747,4807,4874,4929,4984,5037,5084,5137,5193,5241,5296,5349,5433,5500,5564,5660,5734,5815,5904,6067,6211,6290,6365,6424,6504,6584,6639,6761,6864,6905,6958,7015,7089,7154,7222,7308,7388,7457,7551,7610,7665,7727,7787,7897,7987"
                    }
                },
                {
                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\dimens.xml",
                    "from": {
-                        "startLines": "19,20,21,22,18",
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "477,529,582,635,687",
                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8246,8450,8661,8826,8986,9169,9354,9539,9742,9948,10131",
+                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8445,8656,8821,8981,9164,9349,9534,9737,9943,10126,10327"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,104,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2004,1953,-1,-1,-1,-1,2097,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6256,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,39,38,-1,-1,-1,-1,41,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,104,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,61,50,-1,-1,-1,-1,58,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,81,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "8533,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2061,1999,-1,-1,-1,-1,2151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6333,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,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,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4055,4105,4165,4218,4284,4351,4413,4476,4523,4578,4666,4724,4786,4836,4881,4924,4984,5051,5106,5161,5214,5261,5314,5370,5418,5473,5526,5610,5677,5741,5837,5911,5992,6081,6244,6388,6467,6542,6624,6683,6763,6843,6898,7020,7123,7164,7217,7274,7348,7413,7481,7567,7647,7716,7810,7869,7924,7986,8046,8156",
+                        "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,57,46,58,56,70,60,56,49,51,52,49,54,49,59,52,65,66,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4050,4100,4160,4213,4279,4346,4408,4471,4518,4573,4661,4719,4781,4831,4876,4919,4979,5046,5101,5156,5209,5256,5309,5365,5413,5468,5521,5605,5672,5736,5832,5906,5987,6076,6239,6383,6462,6537,6619,6678,6758,6838,6893,7015,7118,7159,7212,7269,7343,7408,7476,7562,7642,7711,7805,7864,7919,7981,8041,8151,8241"
+                    }
+                },
+                {
+                    "source": "D:\\AndroidTool\\AndriodProject\\Notes1\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                    },
                    "to": {
                        "startLines": "13,14,15,16,17",
--- a/src/Notes1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@ -25,6 +25,8 @@

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
--- a/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
--- a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
+++ b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
--- a/Show More
+++ b/Show More