添加了shortcuts功能

4 years ago · 99c9b88f5d
parent 4e8c958d6d
commit 99c9b88f5d
221 changed files with 991 additions and 2332 deletions
--- a/src/Notes-master/.gradle/6.5/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/6.5/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/6.5/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/6.5/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/6.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/6.5/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/6.5/javaCompile/classAnalysis.bin
+++ b/src/Notes-master/.gradle/6.5/javaCompile/classAnalysis.bin
--- a/src/Notes-master/.gradle/6.5/javaCompile/jarAnalysis.bin
+++ b/src/Notes-master/.gradle/6.5/javaCompile/jarAnalysis.bin
--- a/src/Notes-master/.gradle/6.5/javaCompile/javaCompile.lock
+++ b/src/Notes-master/.gradle/6.5/javaCompile/javaCompile.lock
--- a/src/Notes-master/.gradle/6.5/javaCompile/taskHistory.bin
+++ b/src/Notes-master/.gradle/6.5/javaCompile/taskHistory.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.idea/assetWizardSettings.xml
+++ b/src/Notes-master/.idea/assetWizardSettings.xml
@ -100,6 +100,7 @@
                                            <option name="values">
                                              <map>
                                                <entry key="color" value="000000" />
+                                                <entry key="scalingPercent" value="101" />
                                              </map>
                                            </option>
                                          </PersistentState>
@ -129,6 +130,11 @@
                                      </entry>
                                    </map>
                                  </option>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="outputName" value="settings_launcher" />
+                                    </map>
+                                  </option>
                                </PersistentState>
                              </value>
                            </entry>
@ -297,11 +303,6 @@
                            </entry>
                          </map>
                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputIconType" value="ACTIONBAR" />
-                          </map>
-                        </option>
                      </PersistentState>
                    </value>
                  </entry>
--- a/src/Notes-master/.idea/caches/build_file_checksums.ser
+++ b/src/Notes-master/.idea/caches/build_file_checksums.ser
--- a/src/Notes-master/.idea/modules/app/Notes-master.app.iml
+++ b/src/Notes-master/.idea/modules/app/Notes-master.app.iml
@ -41,7 +41,7 @@
      <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
      <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 30 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="library" name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-osgi-4.5.12.jar" level="project" />
    <orderEntry type="library" name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-win-4.5.12.jar" level="project" />
--- a/src/Notes-master/app/build.gradle
+++ b/src/Notes-master/app/build.gradle
@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 22
+    compileSdkVersion 30
    buildToolsVersion "30.0.2"

    defaultConfig {
        applicationId "net.micode.notes"
-        minSdkVersion 22
-        targetSdkVersion 22
+        minSdkVersion 25
+        targetSdkVersion 30
        versionCode 1
        versionName "1.0"
    }
--- a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
+++ b/src/Notes-master/app/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@ -1,4 +1,4 @@
-#Wed Nov 18 13:00:18 CST 2020
+#Thu Nov 19 11:21:38 CST 2020
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable/new_note.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/menu/call_record_folder.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat
@ -18,6 +18,7 @@
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/settings.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_settings.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/layout/note_list.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat
@ -49,6 +50,7 @@
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/menu/sub_folder.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-v24/settings_launcher_foreground.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-v24_settings_launcher_foreground.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/xml/preferences.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat
@ -69,18 +71,18 @@
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable/settings_launcher_background.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable_settings_launcher_background.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/layout/widget_2x.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/search_result.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/color/secondary_text_dark.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat
-/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/animator/background.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/animator_background.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_background_light.jpeg=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background_light.jpeg.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat
-/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/font_small.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/font_small.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/xml/widget_2x_info.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat
@ -97,5 +99,7 @@
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/icon_app_new.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app_new.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/xml/shortcuts.xml=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/xml_shortcuts.xml.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat
 /home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat
+/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/add_note.png=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_add_note.png.flat
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Wed Nov 18 13:00:26 CST 2020
+#Thu Nov 19 14:59:04 CST 2020
 base.0=/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
 path.1=classes.dex
 renamed.1=classes2.dex
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class
--- a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
+++ b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -5,19 +5,21 @@
 5    android:versionName="1.0" >
 6
 7    <uses-sdk
-8        android:minSdkVersion="22"
+8        android:minSdkVersion="25"
 8-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml
-9        android:targetSdkVersion="22" />
+9        android:targetSdkVersion="30" />
 9-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml
-10
-11    <!-- xmlns:android：定义android命名空间，一般为http://schemas.android.com/apk/res/android，这样使得Android中各种标准属性能在文件中使用，提供了大部分元素中的数据。 -->
-12    <!-- package：指定本应用内java主程序包包名、进程默认名、路径名 -->
-13    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 写入SD卡的权限 -->
-13-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:9:5-81
-13-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:9:22-78
-14    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- 创建、删除等有关快捷方式的权限 -->
-14-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:10:5-88
-14-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:10:22-85
+10    <!-- xmlns:android：定义android命名空间，一般为http://schemas.android.com/apk/res/android，这样使得Android中各种标准属性能在文件中使用，提供了大部分元素中的数据。 -->
+11    <!-- package：指定本应用内java主程序包包名、进程默认名、路径名 -->
+12    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 写入SD卡的权限 -->
+12-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:8:5-81
+12-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:8:22-78
+13    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- 创建、删除等有关快捷方式的权限 -->
+13-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:9:5-88
+13-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:9:22-85
+14    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+14-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:10:5-89
+14-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:10:22-87
 15    <uses-permission android:name="android.permission.INTERNET" /> <!-- 访问网络的权限 -->
 15-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:11:5-67
 15-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:11:22-64
@ -41,229 +43,242 @@
 21-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:17:22-78
 22
 23    <application
-23-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:19:5-136:19
+23-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:19:5-143:19
 24        android:debuggable="true"
-25        android:icon="@drawable/icon_app_new"
-25-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:20:9-46
-26        android:label="@string/app_name"
-26-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:21:9-41
-27        android:testOnly="true" >
-28        <activity
-28-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:22:9-32:20
-29            android:name="net.micode.notes.ui.SplashActivity"
-29-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:23:13-46
-30            android:configChanges="orientation|keyboardHidden|screenSize"
-30-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:24:13-74
-31            android:theme="@style/Theme.Notesmaster.Fullscreen" >
-31-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:25:13-64
-32
-33            <!-- 指明本activity可以以什么意图(intent)响应，包含启动动作、额外类别、广播顺序 -->
-34            <intent-filter>
-34-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:27:13-31:29
-35                <action android:name="android.intent.action.MAIN" />
-35-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:28:17-69
-35-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:28:25-66
-36
-37                <category android:name="android.intent.category.LAUNCHER" />
-37-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:30:17-77
-37-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:30:27-74
-38            </intent-filter>
-39        </activity>
-40        <!-- 每一个组件及其属性 -->
-41        <!-- 声明一个实现应用可视化界面的Activity -->
-42        <activity
-42-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:35:9-44:20
-43            android:name="net.micode.notes.ui.NotesListActivity"
-43-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:36:13-49
-44            android:configChanges="keyboardHidden|orientation|screenSize"
-44-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:37:13-74
-45            android:label="@string/app_name"
-45-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:38:13-45
-46            android:launchMode="singleTop"
-46-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:39:13-43
-47            android:theme="@style/NoteTheme"
-47-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:40:13-45
-48            android:windowSoftInputMode="adjustPan" >
-48-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:41:13-52
-49
-50            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
-51        </activity>
-52        <activity
-52-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:45:9-76:20
-53            android:name="net.micode.notes.ui.NoteEditActivity"
-53-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:46:13-48
-54            android:configChanges="keyboardHidden|orientation|screenSize"
-54-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:47:13-74
-55            android:launchMode="singleTop"
-55-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:48:13-43
-56            android:theme="@style/NoteTheme" >
-56-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:49:13-45
-57            <intent-filter>
-57-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:50:13-57:29
-58                <action android:name="android.intent.action.VIEW" />
-58-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:51:17-69
-58-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:51:25-66
-59
-60                <category android:name="android.intent.category.DEFAULT" />
-60-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:17-76
-60-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:27-73
-61
-62                <data android:mimeType="vnd.android.cursor.item/text_note" />
-62-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:17-78
-62-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:23-75
-63                <data android:mimeType="vnd.android.cursor.item/call_note" />
-63-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:17-78
-63-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:23-75
-64            </intent-filter>
-65            <intent-filter>
-65-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:58:13-65:29
-66                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-66-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:59:17-79
-66-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:59:25-76
-67
-68                <category android:name="android.intent.category.DEFAULT" />
-68-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:17-76
-68-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:27-73
-69
-70                <data android:mimeType="vnd.android.cursor.item/text_note" />
-70-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:17-78
-70-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:23-75
-71                <data android:mimeType="vnd.android.cursor.item/call_note" />
-71-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:17-78
-71-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:23-75
-72            </intent-filter>
-73            <intent-filter>
-73-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:66:13-70:29
-74                <action android:name="android.intent.action.SEARCH" />
-74-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:67:17-71
-74-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:67:25-68
-75
-76                <category android:name="android.intent.category.DEFAULT" />
-76-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:17-76
-76-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:27-73
-77            </intent-filter>
-78
-79            <!-- 键值对，用来存储信息(在<activity外>)/配置Activity(在<activity内>) -->
-80            <meta-data
-80-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:73:13-75:54
-81                android:name="android.app.searchable"
-81-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:74:17-54
-82                android:resource="@xml/searchable" />
-82-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:75:17-51
-83        </activity> <!-- 为跨进程提供数据 -->
-84        <provider
-84-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:77:9-80:43
-85            android:name="net.micode.notes.data.NotesProvider"
-85-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:78:13-47
-86            android:authorities="micode_notes"
-86-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:79:13-47
-87            android:multiprocess="true" /> <!-- 负责接收数据和intent -->
-87-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:80:13-40
-88        <receiver
-88-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:81:9-96:20
-89            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-89-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:82:13-57
-90            android:label="@string/app_widget2x2" >
-90-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:83:13-50
-91            <intent-filter>
-91-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:84:13-91:29
-92
-93                <!-- appwidget即桌面小部件，显示在别的应用程序(桌面程序)中，定期接受更新 -->
-94                <!-- action对应小部件的行为 -->
-95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-95-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:17-84
-95-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:25-81
-96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-96-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:17-85
-96-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:25-82
-97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-97-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:90:17-85
-97-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:90:25-82
-98            </intent-filter>
+25        android:extractNativeLibs="false"
+26        android:icon="@drawable/icon_app_new"
+26-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:20:9-46
+27        android:label="@string/app_name"
+27-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:21:9-41
+28        android:testOnly="true" >
+29        <activity
+29-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:22:9-37:20
+30            android:name="net.micode.notes.ui.SplashActivity"
+30-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:23:13-46
+31            android:configChanges="orientation|keyboardHidden|screenSize"
+31-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:24:13-74
+32            android:theme="@style/Theme.Notesmaster.Fullscreen" >
+32-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:25:13-64
+33
+34            <!-- 指明本activity可以以什么意图(intent)响应，包含启动动作、额外类别、广播顺序 -->
+35            <intent-filter>
+35-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:28:13-32:29
+36                <action android:name="android.intent.action.MAIN" />
+36-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:29:17-69
+36-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:29:25-66
+37
+38                <category android:name="android.intent.category.LAUNCHER" />
+38-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:31:17-77
+38-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:31:27-74
+39            </intent-filter>
+40
+41            <meta-data
+41-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:34:13-36:53
+42                android:name="android.app.shortcuts"
+42-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:35:17-53
+43                android:resource="@xml/shortcuts" />
+43-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:36:17-50
+44        </activity> <!-- 每一个组件及其属性 -->
+45        <!-- 声明一个实现应用可视化界面的Activity -->
+46        <activity
+46-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:39:9-51:20
+47            android:name="net.micode.notes.ui.NotesListActivity"
+47-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:40:13-49
+48            android:configChanges="keyboardHidden|orientation|screenSize"
+48-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:41:13-74
+49            android:label="@string/app_name"
+49-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:42:13-45
+50            android:launchMode="singleTop"
+50-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:43:13-43
+51            android:theme="@style/NoteTheme"
+51-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:44:13-45
+52            android:windowSoftInputMode="adjustPan" >
+52-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:45:13-52
+53
+54            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+55            <intent-filter>
+55-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:48:13-50:29
+56                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+56-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:49:17-79
+56-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:49:25-77
+57            </intent-filter>
+58        </activity>
+59        <activity
+59-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:52:9-83:20
+60            android:name="net.micode.notes.ui.NoteEditActivity"
+60-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:53:13-48
+61            android:configChanges="keyboardHidden|orientation|screenSize"
+61-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:54:13-74
+62            android:launchMode="singleTop"
+62-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:13-43
+63            android:theme="@style/NoteTheme" >
+63-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:56:13-45
+64            <intent-filter>
+64-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:57:13-64:29
+65                <action android:name="android.intent.action.VIEW" />
+65-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:58:17-69
+65-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:58:25-66
+66
+67                <category android:name="android.intent.category.DEFAULT" />
+67-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:17-76
+67-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:27-73
+68
+69                <data android:mimeType="vnd.android.cursor.item/text_note" />
+69-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:17-78
+69-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:23-75
+70                <data android:mimeType="vnd.android.cursor.item/call_note" />
+70-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:17-78
+70-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:23-75
+71            </intent-filter>
+72            <intent-filter>
+72-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:13-72:29
+73                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+73-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:66:17-79
+73-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:66:25-76
+74
+75                <category android:name="android.intent.category.DEFAULT" />
+75-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:17-76
+75-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:27-73
+76
+77                <data android:mimeType="vnd.android.cursor.item/text_note" />
+77-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:17-78
+77-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:23-75
+78                <data android:mimeType="vnd.android.cursor.item/call_note" />
+78-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:17-78
+78-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:62:23-75
+79            </intent-filter>
+80            <intent-filter>
+80-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:73:13-77:29
+81                <action android:name="android.intent.action.SEARCH" />
+81-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:74:17-71
+81-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:74:25-68
+82
+83                <category android:name="android.intent.category.DEFAULT" />
+83-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:17-76
+83-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:60:27-73
+84            </intent-filter>
+85
+86            <!-- 键值对，用来存储信息(在<activity外>)/配置Activity(在<activity内>) -->
+87            <meta-data
+87-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:80:13-82:54
+88                android:name="android.app.searchable"
+88-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:81:17-54
+89                android:resource="@xml/searchable" />
+89-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:82:17-51
+90        </activity> <!-- 为跨进程提供数据 -->
+91        <provider
+91-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:84:9-87:43
+92            android:name="net.micode.notes.data.NotesProvider"
+92-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:85:13-47
+93            android:authorities="micode_notes"
+93-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:86:13-47
+94            android:multiprocess="true" /> <!-- 负责接收数据和intent -->
+94-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:87:13-40
+95        <receiver
+95-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:9-103:20
+96            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+96-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:13-57
+97            android:label="@string/app_widget2x2" >
+97-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:90:13-50
+98            <intent-filter>
+98-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:91:13-98:29
 99
-100            <meta-data
-100-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:93:13-95:58
-101                android:name="android.appwidget.provider"
-101-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:94:17-58
-102                android:resource="@xml/widget_2x_info" />
-102-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-55
-103        </receiver>
-104        <receiver
-104-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:9-109:20
-105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-105-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:98:13-57
-106            android:label="@string/app_widget4x4" >
-106-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:99:13-50
-107            <intent-filter>
-107-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:84:13-91:29
-108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-108-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:17-84
-108-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:25-81
-109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-109-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:17-85
-109-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:25-82
-110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-110-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:90:17-85
-110-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:90:25-82
-111            </intent-filter>
-112
-113            <meta-data
-113-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:93:13-95:58
-114                android:name="android.appwidget.provider"
-114-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:94:17-58
-115                android:resource="@xml/widget_4x_info" />
-115-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-55
-116        </receiver>
-117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-117-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:110:9-114:20
-117-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:110:19-55
-118            <intent-filter>
-118-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:111:13-113:29
-119                <action android:name="android.intent.action.BOOT_COMPLETED" />
-119-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:112:17-79
-119-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:112:25-76
-120            </intent-filter>
-121        </receiver>
-122        <receiver
-122-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:115:9-117:50
-123            android:name="net.micode.notes.ui.AlarmReceiver"
-123-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:116:13-45
-124            android:process=":remote" />
-124-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:117:13-38
-125
-126        <activity
-126-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:119:9-123:87
-127            android:name="net.micode.notes.ui.AlarmAlertActivity"
-127-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:120:13-50
-128            android:label="@string/app_name"
-128-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:121:13-45
-129            android:launchMode="singleInstance"
-129-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:122:13-48
-130            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
-130-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:123:13-75
-131        <activity
-131-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:124:9-128:72
-132            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-132-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:125:13-55
-133            android:label="@string/preferences_title"
-133-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:126:13-54
-134            android:launchMode="singleTop"
-134-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:127:13-43
-135            android:theme="@android:style/Theme.Holo.Light" /> <!-- 负责后台进程，且需要与前端Activity通信 -->
-135-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:128:13-60
-136        <service
-136-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:129:9-131:48
-137            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-137-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:130:13-58
-138            android:exported="false" />
-138-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:131:13-37
-139
-140        <meta-data
-140-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:133:9-135:52
-141            android:name="android.app.default_searchable"
-141-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:134:13-58
-142            android:value=".ui.NoteEditActivity" />
-142-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:135:13-49
-143    </application>
-144
-145</manifest>
+100                <!-- appwidget即桌面小部件，显示在别的应用程序(桌面程序)中，定期接受更新 -->
+101                <!-- action对应小部件的行为 -->
+102                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+102-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-84
+102-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:25-81
+103                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+103-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:17-85
+103-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:25-82
+104                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+104-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:17-85
+104-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:25-82
+105            </intent-filter>
+106
+107            <meta-data
+107-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:100:13-102:58
+108                android:name="android.appwidget.provider"
+108-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:101:17-58
+109                android:resource="@xml/widget_2x_info" />
+109-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:102:17-55
+110        </receiver>
+111        <receiver
+111-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:104:9-116:20
+112            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+112-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:105:13-57
+113            android:label="@string/app_widget4x4" >
+113-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:106:13-50
+114            <intent-filter>
+114-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:91:13-98:29
+115                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+115-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-84
+115-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:25-81
+116                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+116-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:17-85
+116-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:25-82
+117                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+117-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:17-85
+117-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:25-82
+118            </intent-filter>
+119
+120            <meta-data
+120-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:100:13-102:58
+121                android:name="android.appwidget.provider"
+121-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:101:17-58
+122                android:resource="@xml/widget_4x_info" />
+122-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:102:17-55
+123        </receiver>
+124        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+124-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:117:9-121:20
+124-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:117:19-55
+125            <intent-filter>
+125-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:118:13-120:29
+126                <action android:name="android.intent.action.BOOT_COMPLETED" />
+126-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:119:17-79
+126-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:119:25-76
+127            </intent-filter>
+128        </receiver>
+129        <receiver
+129-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:122:9-124:41
+130            android:name="net.micode.notes.ui.AlarmReceiver"
+130-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:123:13-45
+131            android:process=":remote" />
+131-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:124:13-38
+132
+133        <activity
+133-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:126:9-130:78
+134            android:name="net.micode.notes.ui.AlarmAlertActivity"
+134-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:127:13-50
+135            android:label="@string/app_name"
+135-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:128:13-45
+136            android:launchMode="singleInstance"
+136-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:129:13-48
+137            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+137-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:130:13-75
+138        <activity
+138-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:131:9-135:63
+139            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+139-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:132:13-55
+140            android:label="@string/preferences_title"
+140-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:133:13-54
+141            android:launchMode="singleTop"
+141-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:134:13-43
+142            android:theme="@android:style/Theme.Holo.Light" /> <!-- 负责后台进程，且需要与前端Activity通信 -->
+142-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:135:13-60
+143        <service
+143-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:136:9-138:40
+144            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+144-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:137:13-58
+145            android:exported="false" />
+145-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:138:13-37
+146
+147        <meta-data
+147-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:140:9-142:52
+148            android:name="android.app.default_searchable"
+148-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:141:13-58
+149            android:value=".ui.NoteEditActivity" />
+149-->/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:142:13-49
+150    </application>
+151
+152</manifest>
--- a/src/Notes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml
@ -5,13 +5,13 @@
    android:versionName="1.0" >

    <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
-
+        android:minSdkVersion="25"
+        android:targetSdkVersion="30" />
    <!-- xmlns:android：定义android命名空间，一般为http://schemas.android.com/apk/res/android，这样使得Android中各种标准属性能在文件中使用，提供了大部分元素中的数据。 -->
    <!-- package：指定本应用内java主程序包包名、进程默认名、路径名 -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 写入SD卡的权限 -->
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- 创建、删除等有关快捷方式的权限 -->
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
    <uses-permission android:name="android.permission.INTERNET" /> <!-- 访问网络的权限 -->
    <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- 读取手机联系人的权限 -->
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <!-- 帐户管理：获取帐户验证信息的权限 -->
@ -22,6 +22,7 @@

    <application
        android:debuggable="true"
+        android:extractNativeLibs="false"
        android:icon="@drawable/icon_app_new"
        android:label="@string/app_name"
        android:testOnly="true" >
@ -36,8 +37,11 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-        </activity>
-        <!-- 每一个组件及其属性 -->
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity> <!-- 每一个组件及其属性 -->
        <!-- 声明一个实现应用可视化界面的Activity -->
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
@ -48,6 +52,9 @@
            android:windowSoftInputMode="adjustPan" >

            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+            </intent-filter>
        </activity>
        <activity
            android:name="net.micode.notes.ui.NoteEditActivity"
--- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@ -5,13 +5,13 @@
    android:versionName="1.0" >

    <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
-
+        android:minSdkVersion="25"
+        android:targetSdkVersion="30" />
    <!-- xmlns:android：定义android命名空间，一般为http://schemas.android.com/apk/res/android，这样使得Android中各种标准属性能在文件中使用，提供了大部分元素中的数据。 -->
    <!-- package：指定本应用内java主程序包包名、进程默认名、路径名 -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 写入SD卡的权限 -->
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- 创建、删除等有关快捷方式的权限 -->
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
    <uses-permission android:name="android.permission.INTERNET" /> <!-- 访问网络的权限 -->
    <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- 读取手机联系人的权限 -->
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <!-- 帐户管理：获取帐户验证信息的权限 -->
@ -22,6 +22,7 @@

    <application
        android:debuggable="true"
+        android:extractNativeLibs="false"
        android:icon="@drawable/icon_app_new"
        android:label="@string/app_name"
        android:testOnly="true" >
@ -36,8 +37,11 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-        </activity>
-        <!-- 每一个组件及其属性 -->
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity> <!-- 每一个组件及其属性 -->
        <!-- 声明一个实现应用可视化界面的Activity -->
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
@ -48,6 +52,9 @@
            android:windowSoftInputMode="adjustPan" >

            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+            </intent-filter>
        </activity>
        <activity
            android:name="net.micode.notes.ui.NoteEditActivity"
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -996,19 +996,19 @@
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/strings.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,126,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,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",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6684,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6727,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6722,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6765,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,132,131,130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,4,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,7041,6988,6934,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6873,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,60,52,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,7097,7036,6983,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6929,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "6,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",
-                        "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,1651,1723,1789,1862,1912,1952,2000,2048,2093,2150,2204,2254,2316,2384,2461,2520,2586,2649,2704,2764,2827,2881,2941,2994,3056,3140,3220,3270,3329,3372,3415,3468,3511,3562,3612,3672,3725,3776,3822,3870,3918,3964,4011,4061,4106,4165,4217,4269,4312,4359,4415,4470,4525,4569,4611,4652,4702,4761,4804,4855,4904,4953,5000,5047,5094,5139,5190,5243,5318,5377,5434,5508,5572,5641,5719,5829,5933,6006,6072,6127,6192,6257,6306,6389,6467,6505,6550,6598,6660,6717,6772,6831,6898,6956,7018,7066,7111,7159,7210,7276",
-                        "endLines": "8,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",
-                        "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,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,42,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,1718,1784,1857,1907,1947,1995,2043,2088,2145,2199,2249,2311,2379,2456,2515,2581,2644,2699,2759,2822,2876,2936,2989,3051,3135,3215,3265,3324,3367,3410,3463,3506,3557,3607,3667,3720,3771,3817,3865,3913,3959,4006,4056,4101,4160,4212,4264,4307,4354,4410,4465,4520,4564,4606,4647,4697,4756,4799,4850,4899,4948,4995,5042,5089,5134,5185,5238,5313,5372,5429,5503,5567,5636,5714,5824,5928,6001,6067,6122,6187,6252,6301,6384,6462,6500,6545,6593,6655,6712,6767,6826,6893,6951,7013,7061,7106,7154,7205,7271,7337"
+                        "startLines": "6,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,127",
+                        "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,4,4",
+                        "startOffsets": "215,1651,1712,1765,1819,1891,1957,2030,2080,2120,2168,2216,2261,2318,2372,2422,2484,2552,2629,2688,2754,2817,2872,2932,2995,3049,3109,3162,3224,3308,3388,3438,3497,3540,3583,3636,3679,3730,3780,3840,3893,3944,3990,4038,4086,4132,4179,4229,4274,4333,4385,4437,4480,4527,4583,4638,4693,4737,4779,4820,4870,4929,4972,5023,5072,5121,5168,5215,5262,5307,5358,5411,5486,5545,5602,5676,5740,5809,5887,5997,6101,6174,6240,6295,6360,6425,6474,6557,6635,6673,6718,6766,6828,6885,6946,6997,7049,7104,7163,7230,7288,7350,7398,7443,7491,7542,7608",
+                        "endLines": "8,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,127",
+                        "endColumns": "14,60,52,53,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,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,42,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,60,50,51,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,1707,1760,1814,1886,1952,2025,2075,2115,2163,2211,2256,2313,2367,2417,2479,2547,2624,2683,2749,2812,2867,2927,2990,3044,3104,3157,3219,3303,3383,3433,3492,3535,3578,3631,3674,3725,3775,3835,3888,3939,3985,4033,4081,4127,4174,4224,4269,4328,4380,4432,4475,4522,4578,4633,4688,4732,4774,4815,4865,4924,4967,5018,5067,5116,5163,5210,5257,5302,5353,5406,5481,5540,5597,5671,5735,5804,5882,5992,6096,6169,6235,6290,6355,6420,6469,6552,6630,6668,6713,6761,6823,6880,6941,6992,7044,7099,7158,7225,7283,7345,7393,7438,7486,7537,7603,7669"
                    }
                },
                {
@ -1039,31 +1039,31 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,286,299,300,301,302,303,310,311,315,319,324,330,337,341,345,350,354,358,362,366,370,374,378,382,386,388,390,394,398,402,407,411,414,418,422,426,430,434,438,443,446,449,452,455,458,461,464,466,468,469,470,473,475,477,479,484,485,489,495,499,500,502,513,514,518,524,528,529,530,534,561,565,593,738,760,905,927,934,939,960,965,970,980,989,1000,1004,1011,1019,1026,1027,1036,1039,1042,1047,1051,1054,1057,1061,1065,1073,1078,1085,1091,1092,1096,1101,1103,1105,1108,1111,1113,1117,1124,1127,1130,1134,1136,1140,1142,1148,1150,1154,1166,1172,1177,1192,1195,1200,1210,1230,1268,1307,1317,1326,1328,1332,1336,1339,1342,1345,1348,1352,1355,1358,1361,1365,1368,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1388,1390,1391,1392,1393,1395,1397,1398,1399,1400,1401,1402,1403,1405,1407,1409,1411,1413,1415,1416,1418,1419,1421,1423,1425,1426,1427,1428,1429,1430,1431,1432,1434,1436,1466,1467,1468,1469,1470,1471,1473,1474,1475,1476,1477,1478,1480,1484,1495,1496,1497,1498,1499,1504,1506,1508,1510,1512,1514,1515,1516,1517,1519,1521,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1536,1537,1538,1540,1542,1543,1545,1546,1548,1550,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1564,1566,1567,1568,1570,1571,1572,1574,1576,1578,1580,1582,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593",
+                        "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,292,305,306,307,308,309,316,317,321,325,330,336,343,347,351,356,360,364,368,372,376,380,384,388,392,394,396,400,404,408,413,417,420,424,428,432,436,440,444,449,452,455,458,461,464,467,470,472,474,475,476,479,481,483,485,490,491,495,501,505,506,508,519,520,524,530,534,535,536,540,567,571,599,744,766,911,933,940,945,966,971,976,986,995,1006,1010,1017,1025,1032,1033,1042,1045,1048,1053,1057,1060,1063,1067,1071,1079,1084,1091,1097,1098,1102,1107,1109,1111,1114,1117,1119,1123,1130,1133,1136,1140,1142,1146,1148,1154,1156,1160,1172,1178,1183,1198,1201,1206,1216,1236,1274,1313,1323,1332,1334,1338,1342,1345,1348,1351,1354,1358,1361,1364,1367,1371,1374,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1394,1396,1397,1398,1399,1401,1403,1404,1405,1406,1407,1408,1409,1411,1413,1415,1417,1419,1421,1422,1424,1425,1427,1429,1431,1432,1433,1434,1435,1436,1437,1438,1440,1442,1472,1473,1474,1475,1476,1477,1479,1480,1481,1482,1483,1484,1486,1490,1501,1502,1503,1504,1505,1510,1512,1514,1516,1518,1520,1521,1522,1523,1525,1527,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1539,1542,1543,1544,1546,1548,1549,1551,1552,1554,1556,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1570,1572,1573,1574,1576,1577,1578,1580,1582,1584,1586,1588,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599",
                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11218,11292,11370,11463,11533,11611,11665,11735,11820,11872,11945,12019,12088,12163,12237,12311,12400,18880,19853,19931,20021,20109,20205,20706,20795,21042,21323,21608,22001,22478,22700,22922,23190,23417,23647,23877,24107,24337,24564,24803,25029,25274,25404,25534,25764,26012,26231,26514,26722,26853,27080,27326,27551,27800,28021,28266,28561,28783,29021,29235,29465,29688,29903,30111,30235,30359,30464,30581,30795,30941,31081,31167,31515,31603,31833,32235,32468,32550,32648,33240,33340,33576,33984,34223,34317,34375,34612,36630,36872,39022,47736,49003,57827,59108,59644,59974,61097,61353,61589,62136,62630,63303,63518,64046,64610,64985,65103,65641,65798,65942,66262,66432,66573,66702,67001,67304,67863,68125,68475,68828,68922,69228,69490,69615,69742,69981,70192,70311,70504,70959,71140,71262,71521,71634,71821,71923,72367,72491,72776,73663,73957,74287,75207,75379,75715,76381,77418,80245,83213,83801,84395,84508,84737,85075,85235,85387,85558,85725,85968,86138,86311,86482,86756,86955,87202,87286,87382,87478,87576,87676,87778,87880,87982,88084,88186,88286,88382,88494,88623,88746,88900,89054,89152,89266,89360,89500,89634,89730,89842,89942,90058,90154,90266,90406,90554,90718,90860,91018,91168,91309,91453,91588,91724,91866,92008,92120,92260,92328,92401,92475,92548,92622,92768,92912,94396,94462,94552,94632,94724,94822,94932,95010,95116,95208,95312,95422,95544,95707,96257,96337,96437,96527,96637,96963,97063,97175,97289,97405,97521,97615,97729,97847,97949,98069,98191,98273,98377,98497,98623,98717,98805,98917,99033,99155,99267,99442,99558,99644,99756,99880,99947,100073,100141,100269,100413,100541,100610,100705,100820,100933,101032,101141,101252,101363,101464,101569,101681,101811,101902,102025,102137,102223,102327,102435,102535,102653,102757,102861,102987,103075,103165,103275,103359,103413,103535,103641,103751,103835",
-                        "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,286,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1214,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1437,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1487,1495,1496,1497,1498,1499,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593",
+                        "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11218,11292,11370,11463,11533,11611,11665,11735,11820,11872,11945,12019,12088,12163,12237,12311,12400,19249,20222,20300,20390,20478,20574,21075,21164,21411,21692,21977,22370,22847,23069,23291,23559,23786,24016,24246,24476,24706,24933,25172,25398,25643,25773,25903,26133,26381,26600,26883,27091,27222,27449,27695,27920,28169,28390,28635,28930,29152,29390,29604,29834,30057,30272,30480,30604,30728,30833,30950,31164,31310,31450,31536,31884,31972,32202,32604,32837,32919,33017,33609,33709,33945,34353,34592,34686,34744,34981,36999,37241,39391,48105,49372,58196,59477,60013,60343,61466,61722,61958,62505,62999,63672,63887,64415,64979,65354,65472,66010,66167,66311,66631,66801,66942,67071,67370,67673,68232,68494,68844,69197,69291,69597,69859,69984,70111,70350,70561,70680,70873,71328,71509,71631,71890,72003,72190,72292,72736,72860,73145,74032,74326,74656,75576,75748,76084,76750,77787,80614,83582,84170,84764,84877,85106,85444,85604,85756,85927,86094,86337,86507,86680,86851,87125,87324,87571,87655,87751,87847,87945,88045,88147,88249,88351,88453,88555,88655,88751,88863,88992,89115,89269,89423,89521,89635,89729,89869,90003,90099,90211,90311,90427,90523,90635,90775,90923,91087,91229,91387,91537,91678,91822,91957,92093,92235,92377,92489,92629,92697,92770,92844,92917,92991,93137,93281,94765,94831,94921,95001,95093,95191,95301,95379,95485,95577,95681,95791,95913,96076,96626,96706,96806,96896,97006,97332,97432,97544,97658,97774,97890,97984,98098,98216,98318,98438,98560,98642,98746,98866,98992,99086,99174,99286,99402,99524,99636,99811,99927,100013,100125,100249,100316,100442,100510,100638,100782,100910,100979,101074,101189,101302,101401,101510,101621,101732,101833,101938,102050,102180,102271,102394,102506,102592,102696,102804,102904,103022,103126,103230,103356,103444,103534,103644,103728,103782,103904,104010,104120,104204",
+                        "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,292,305,306,307,308,315,316,320,324,329,335,342,346,350,355,359,363,367,371,375,379,383,387,391,393,395,399,403,407,412,416,419,423,427,431,435,439,443,448,451,454,457,460,463,466,469,471,473,474,475,478,480,482,484,489,490,494,500,504,505,507,518,519,523,529,533,534,535,539,566,570,598,743,765,910,932,939,944,965,970,975,985,994,1005,1009,1016,1024,1031,1032,1041,1044,1047,1052,1056,1059,1062,1066,1070,1078,1083,1090,1096,1097,1101,1106,1108,1110,1113,1116,1118,1122,1129,1132,1135,1139,1141,1145,1147,1153,1155,1159,1171,1177,1182,1197,1200,1205,1215,1220,1273,1312,1322,1331,1333,1337,1341,1344,1347,1350,1353,1357,1360,1363,1366,1370,1373,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1393,1395,1396,1397,1398,1400,1402,1403,1404,1405,1406,1407,1408,1410,1412,1414,1416,1418,1420,1421,1423,1424,1426,1428,1430,1431,1432,1433,1434,1435,1436,1437,1439,1441,1443,1472,1473,1474,1475,1476,1478,1479,1480,1481,1482,1483,1485,1489,1493,1501,1502,1503,1504,1505,1511,1513,1515,1517,1519,1520,1521,1522,1524,1526,1528,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1541,1542,1543,1545,1547,1548,1550,1551,1553,1555,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1569,1571,1572,1573,1575,1576,1577,1579,1581,1583,1585,1587,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599",
                        "endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
-                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11287,11365,11458,11528,11606,11660,11730,11815,11867,11940,12014,12083,12158,12232,12306,12395,12465,18946,19926,20016,20104,20200,20701,20790,21037,21318,21603,21996,22473,22695,22917,23185,23412,23642,23872,24102,24332,24559,24798,25024,25269,25399,25529,25759,26007,26226,26509,26717,26848,27075,27321,27546,27795,28016,28261,28556,28778,29016,29230,29460,29683,29898,30106,30230,30354,30459,30576,30790,30936,31076,31162,31510,31598,31828,32230,32463,32545,32643,33235,33335,33571,33979,34218,34312,34370,34607,36625,36867,39017,47731,48998,57822,59103,59639,59969,61092,61348,61584,62131,62625,63298,63513,64041,64605,64980,65098,65636,65793,65937,66257,66427,66568,66697,66996,67299,67858,68120,68470,68823,68917,69223,69485,69610,69737,69976,70187,70306,70499,70954,71135,71257,71516,71629,71816,71918,72362,72486,72771,73658,73952,74282,75202,75374,75710,76376,76661,80240,83208,83796,84390,84503,84732,85070,85230,85382,85553,85720,85963,86133,86306,86477,86751,86950,87197,87281,87377,87473,87571,87671,87773,87875,87977,88079,88181,88281,88377,88489,88618,88741,88895,89049,89147,89261,89355,89495,89629,89725,89837,89937,90053,90149,90261,90401,90549,90713,90855,91013,91163,91304,91448,91583,91719,91861,92003,92115,92255,92323,92396,92470,92543,92617,92763,92907,93045,94457,94547,94627,94719,94817,94927,95005,95111,95203,95307,95417,95539,95702,95859,96332,96432,96522,96632,96724,97058,97170,97284,97400,97516,97610,97724,97842,97944,98064,98186,98268,98372,98492,98618,98712,98800,98912,99028,99150,99262,99437,99553,99639,99751,99875,99942,100068,100136,100264,100408,100536,100605,100700,100815,100928,101027,101136,101247,101358,101459,101564,101676,101806,101897,102020,102132,102218,102322,102430,102530,102648,102752,102856,102982,103070,103160,103270,103354,103408,103530,103636,103746,103830,103956"
+                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11287,11365,11458,11528,11606,11660,11730,11815,11867,11940,12014,12083,12158,12232,12306,12395,12465,19315,20295,20385,20473,20569,21070,21159,21406,21687,21972,22365,22842,23064,23286,23554,23781,24011,24241,24471,24701,24928,25167,25393,25638,25768,25898,26128,26376,26595,26878,27086,27217,27444,27690,27915,28164,28385,28630,28925,29147,29385,29599,29829,30052,30267,30475,30599,30723,30828,30945,31159,31305,31445,31531,31879,31967,32197,32599,32832,32914,33012,33604,33704,33940,34348,34587,34681,34739,34976,36994,37236,39386,48100,49367,58191,59472,60008,60338,61461,61717,61953,62500,62994,63667,63882,64410,64974,65349,65467,66005,66162,66306,66626,66796,66937,67066,67365,67668,68227,68489,68839,69192,69286,69592,69854,69979,70106,70345,70556,70675,70868,71323,71504,71626,71885,71998,72185,72287,72731,72855,73140,74027,74321,74651,75571,75743,76079,76745,77030,80609,83577,84165,84759,84872,85101,85439,85599,85751,85922,86089,86332,86502,86675,86846,87120,87319,87566,87650,87746,87842,87940,88040,88142,88244,88346,88448,88550,88650,88746,88858,88987,89110,89264,89418,89516,89630,89724,89864,89998,90094,90206,90306,90422,90518,90630,90770,90918,91082,91224,91382,91532,91673,91817,91952,92088,92230,92372,92484,92624,92692,92765,92839,92912,92986,93132,93276,93414,94826,94916,94996,95088,95186,95296,95374,95480,95572,95676,95786,95908,96071,96228,96701,96801,96891,97001,97093,97427,97539,97653,97769,97885,97979,98093,98211,98313,98433,98555,98637,98741,98861,98987,99081,99169,99281,99397,99519,99631,99806,99922,100008,100120,100244,100311,100437,100505,100633,100777,100905,100974,101069,101184,101297,101396,101505,101616,101727,101828,101933,102045,102175,102266,102389,102501,102587,102691,102799,102899,103017,103121,103225,103351,103439,103529,103639,103723,103777,103899,104005,104115,104199,104325"
                    }
                },
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values/strings.xml",
                    "from": {
-                        "startLines": "127,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,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,4,-1,-1",
-                        "startOffsets": "8004,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8481,8535,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8412,-1,-1",
-                        "endLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,68,-1,-1",
-                        "endOffsets": "8407,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8530,8587,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8476,-1,-1"
+                        "startLines": "127,142,141,140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8004,8988,8931,8873,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "131,142,141,140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,72,56,57,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8407,9056,8983,8926,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,287,288,289,290,291,292,293,294,295,296,297,298",
-                        "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,4,4,4",
-                        "startOffsets": "10826,12470,12566,12649,12745,12814,12857,12909,12961,13010,13073,13131,13182,13266,13320,13377,13471,13579,13650,13734,13817,13883,13966,14068,14129,14191,14242,14320,14373,14433,14538,14597,14699,14754,14825,14875,14924,14982,15029,15088,15145,15216,15277,15334,15384,15436,15489,15539,15589,15649,15702,15768,15830,15893,15940,15995,16083,16141,16203,16253,16298,16341,16401,16468,16518,16573,16628,16681,16728,16781,16837,16885,16940,16993,17077,17144,17208,17304,17378,17459,17548,17711,17855,17934,18009,18091,18150,18230,18310,18365,18487,18590,18631,18684,18741,18815,18951,19019,19105,19185,19254,19348,19407,19462,19524,19584,19653,19763",
-                        "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,287,288,289,290,291,292,293,294,295,296,297,298",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,49,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,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,68,109,89",
-                        "endOffsets": "11213,12561,12644,12740,12809,12852,12904,12956,13005,13068,13126,13177,13261,13315,13372,13466,13574,13645,13729,13812,13878,13961,14063,14124,14186,14237,14315,14368,14428,14533,14592,14694,14749,14820,14870,14919,14977,15024,15083,15140,15211,15272,15329,15379,15431,15484,15534,15584,15644,15697,15763,15825,15888,15935,15990,16078,16136,16198,16248,16293,16336,16396,16463,16513,16568,16623,16676,16723,16776,16832,16880,16935,16988,17072,17139,17203,17299,17373,17454,17543,17706,17850,17929,18004,18086,18145,18225,18305,18360,18482,18585,18626,18679,18736,18810,18875,19014,19100,19180,19249,19343,19402,19457,19519,19579,19648,19758,19848"
+                        "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,293,294,295,296,297,298,299,300,301,302,303,304",
+                        "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,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "10826,12470,12543,12600,12658,12754,12837,12933,13002,13045,13097,13149,13198,13261,13319,13370,13454,13508,13565,13659,13767,13838,13922,14005,14071,14154,14256,14317,14379,14430,14508,14561,14621,14726,14785,14887,14942,15013,15063,15112,15170,15217,15276,15333,15404,15465,15522,15572,15624,15677,15727,15777,15837,15890,15956,16018,16081,16128,16183,16271,16329,16391,16441,16486,16529,16589,16656,16706,16761,16816,16869,16916,16969,17025,17073,17128,17181,17265,17332,17396,17492,17566,17647,17736,17899,18043,18122,18197,18279,18338,18418,18498,18553,18675,18778,18819,18872,18929,19003,19068,19134,19191,19320,19388,19474,19554,19623,19717,19776,19831,19893,19953,20022,20132",
+                        "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,293,294,295,296,297,298,299,300,301,302,303,304",
+                        "endColumns": "14,72,56,57,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,49,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,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,65,56,57,67,85,79,68,93,58,54,61,59,68,109,89",
+                        "endOffsets": "11213,12538,12595,12653,12749,12832,12928,12997,13040,13092,13144,13193,13256,13314,13365,13449,13503,13560,13654,13762,13833,13917,14000,14066,14149,14251,14312,14374,14425,14503,14556,14616,14721,14780,14882,14937,15008,15058,15107,15165,15212,15271,15328,15399,15460,15517,15567,15619,15672,15722,15772,15832,15885,15951,16013,16076,16123,16178,16266,16324,16386,16436,16481,16524,16584,16651,16701,16756,16811,16864,16911,16964,17020,17068,17123,17176,17260,17327,17391,17487,17561,17642,17731,17894,18038,18117,18192,18274,18333,18413,18493,18548,18670,18773,18814,18867,18924,18998,19063,19129,19186,19244,19383,19469,19549,19618,19712,19771,19826,19888,19948,20017,20127,20217"
                    }
                },
                {
@ -1074,12 +1074,12 @@
                        "startOffsets": "-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "1488,1489,1500",
+                        "startLines": "1494,1495,1506",
                        "startColumns": "4,4,4",
-                        "startOffsets": "95864,95933,96729",
-                        "endLines": "1488,1494,1503",
+                        "startOffsets": "96233,96302,97098",
+                        "endLines": "1494,1500,1509",
                        "endColumns": "68,12,12",
-                        "endOffsets": "95928,96252,96958"
+                        "endOffsets": "96297,96621,97327"
                    }
                },
                {
@ -1090,12 +1090,12 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "1215,1219,1223,1227,1438,1442,1446,1450,1454,1458,1462,1594,1597",
+                        "startLines": "1221,1225,1229,1233,1444,1448,1452,1456,1460,1464,1468,1600,1603",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "76666,76874,77085,77258,93050,93233,93418,93603,93806,94012,94195,103961,104143",
-                        "endLines": "1218,1222,1226,1229,1441,1445,1449,1453,1457,1461,1465,1596,1600",
+                        "startOffsets": "77035,77243,77454,77627,93419,93602,93787,93972,94175,94381,94564,104330,104512",
+                        "endLines": "1224,1228,1232,1235,1447,1451,1455,1459,1463,1467,1471,1602,1606",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "76869,77080,77253,77413,93228,93413,93598,93801,94007,94190,94391,104138,104374"
+                        "endOffsets": "77238,77449,77622,77782,93597,93782,93967,94170,94376,94559,94760,104507,104743"
                    }
                },
                {
@ -1939,19 +1939,19 @@
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/strings.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,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",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6709,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6752,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6747,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6790,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,131,130,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,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,4,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,7066,7013,6959,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,60,52,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,7122,7061,7008,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6954,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "6,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",
-                        "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,1649,1722,1788,1861,1911,1951,1999,2047,2092,2149,2203,2253,2315,2383,2460,2519,2584,2647,2702,2762,2825,2879,2939,2992,3054,3139,3220,3270,3329,3372,3415,3468,3511,3562,3612,3672,3725,3776,3822,3870,3918,3964,4011,4061,4106,4165,4217,4269,4312,4359,4415,4470,4525,4569,4611,4652,4702,4761,4804,4855,4904,4953,5000,5047,5094,5139,5190,5243,5318,5377,5434,5508,5572,5641,5719,5829,5933,6006,6072,6127,6192,6257,6306,6389,6467,6505,6550,6598,6660,6717,6772,6831,6898,6956,7018,7066,7111,7159,7210,7276",
-                        "endLines": "8,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",
-                        "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,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,42,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,1717,1783,1856,1906,1946,1994,2042,2087,2144,2198,2248,2310,2378,2455,2514,2579,2642,2697,2757,2820,2874,2934,2987,3049,3134,3215,3265,3324,3367,3410,3463,3506,3557,3607,3667,3720,3771,3817,3865,3913,3959,4006,4056,4101,4160,4212,4264,4307,4354,4410,4465,4520,4564,4606,4647,4697,4756,4799,4850,4899,4948,4995,5042,5089,5134,5185,5238,5313,5372,5429,5503,5567,5636,5714,5824,5928,6001,6067,6122,6187,6252,6301,6384,6462,6500,6545,6593,6655,6712,6767,6826,6893,6951,7013,7061,7106,7154,7205,7271,7337"
+                        "startLines": "6,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,127",
+                        "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,4,4",
+                        "startOffsets": "215,1649,1710,1763,1817,1890,1956,2029,2079,2119,2167,2215,2260,2317,2371,2421,2483,2551,2628,2687,2752,2815,2870,2930,2993,3047,3107,3160,3222,3307,3388,3438,3497,3540,3583,3636,3679,3730,3780,3840,3893,3944,3990,4038,4086,4132,4179,4229,4274,4333,4385,4437,4480,4527,4583,4638,4693,4737,4779,4820,4870,4929,4972,5023,5072,5121,5168,5215,5262,5307,5358,5411,5486,5545,5602,5676,5740,5809,5887,5997,6101,6174,6240,6295,6360,6425,6474,6557,6635,6673,6718,6766,6828,6885,6946,6997,7049,7104,7163,7230,7288,7350,7398,7443,7491,7542,7608",
+                        "endLines": "8,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,127",
+                        "endColumns": "14,60,52,53,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,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,42,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,60,50,51,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,1705,1758,1812,1885,1951,2024,2074,2114,2162,2210,2255,2312,2366,2416,2478,2546,2623,2682,2747,2810,2865,2925,2988,3042,3102,3155,3217,3302,3383,3433,3492,3535,3578,3631,3674,3725,3775,3835,3888,3939,3985,4033,4081,4127,4174,4224,4269,4328,4380,4432,4475,4522,4578,4633,4688,4732,4774,4815,4865,4924,4967,5018,5067,5116,5163,5210,5257,5302,5353,5406,5481,5540,5597,5671,5735,5804,5882,5992,6096,6169,6235,6290,6355,6420,6469,6552,6630,6668,6713,6761,6823,6880,6941,6992,7044,7099,7158,7225,7283,7345,7393,7438,7486,7537,7603,7669"
                    }
                }
            ]
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@ -37,19 +37,19 @@
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/strings.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,124,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,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",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6709,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6752,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6747,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6790,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,131,130,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,128,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,4,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,7066,7013,6959,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6898,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,60,52,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,7122,7061,7008,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6954,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "6,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",
-                        "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,1649,1722,1788,1861,1911,1951,1999,2047,2092,2149,2203,2253,2315,2383,2460,2519,2584,2647,2702,2762,2825,2879,2939,2992,3054,3139,3220,3270,3329,3372,3415,3468,3511,3562,3612,3672,3725,3776,3822,3870,3918,3964,4011,4061,4106,4165,4217,4269,4312,4359,4415,4470,4525,4569,4611,4652,4702,4761,4804,4855,4904,4953,5000,5047,5094,5139,5190,5243,5318,5377,5434,5508,5572,5641,5719,5829,5933,6006,6072,6127,6192,6257,6306,6389,6467,6505,6550,6598,6660,6717,6772,6831,6898,6956,7018,7066,7111,7159,7210,7276",
-                        "endLines": "8,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",
-                        "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,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,42,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,1717,1783,1856,1906,1946,1994,2042,2087,2144,2198,2248,2310,2378,2455,2514,2579,2642,2697,2757,2820,2874,2934,2987,3049,3134,3215,3265,3324,3367,3410,3463,3506,3557,3607,3667,3720,3771,3817,3865,3913,3959,4006,4056,4101,4160,4212,4264,4307,4354,4410,4465,4520,4564,4606,4647,4697,4756,4799,4850,4899,4948,4995,5042,5089,5134,5185,5238,5313,5372,5429,5503,5567,5636,5714,5824,5928,6001,6067,6122,6187,6252,6301,6384,6462,6500,6545,6593,6655,6712,6767,6826,6893,6951,7013,7061,7106,7154,7205,7271,7337"
+                        "startLines": "6,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,127",
+                        "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,4,4",
+                        "startOffsets": "215,1649,1710,1763,1817,1890,1956,2029,2079,2119,2167,2215,2260,2317,2371,2421,2483,2551,2628,2687,2752,2815,2870,2930,2993,3047,3107,3160,3222,3307,3388,3438,3497,3540,3583,3636,3679,3730,3780,3840,3893,3944,3990,4038,4086,4132,4179,4229,4274,4333,4385,4437,4480,4527,4583,4638,4693,4737,4779,4820,4870,4929,4972,5023,5072,5121,5168,5215,5262,5307,5358,5411,5486,5545,5602,5676,5740,5809,5887,5997,6101,6174,6240,6295,6360,6425,6474,6557,6635,6673,6718,6766,6828,6885,6946,6997,7049,7104,7163,7230,7288,7350,7398,7443,7491,7542,7608",
+                        "endLines": "8,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,127",
+                        "endColumns": "14,60,52,53,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,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,42,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,60,50,51,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,1705,1758,1812,1885,1951,2024,2074,2114,2162,2210,2255,2312,2366,2416,2478,2546,2623,2682,2747,2810,2865,2925,2988,3042,3102,3155,3217,3302,3383,3433,3492,3535,3578,3631,3674,3725,3775,3835,3888,3939,3985,4033,4081,4127,4174,4224,4269,4328,4380,4432,4475,4522,4578,4633,4688,4732,4774,4815,4865,4924,4967,5018,5067,5116,5163,5210,5257,5302,5353,5406,5481,5540,5597,5671,5735,5804,5882,5992,6096,6169,6235,6290,6355,6420,6469,6552,6630,6668,6713,6761,6823,6880,6941,6992,7044,7099,7158,7225,7283,7345,7393,7438,7486,7537,7603,7669"
                    }
                }
            ]
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@ -22,19 +22,19 @@
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/strings.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,125,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,126,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,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",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6684,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6727,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,42,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6722,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6765,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "-1,132,131,130,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,4,4,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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,7041,6988,6934,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6873,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "-1,60,52,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,60,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "-1,7097,7036,6983,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6929,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "6,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",
-                        "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,1651,1723,1789,1862,1912,1952,2000,2048,2093,2150,2204,2254,2316,2384,2461,2520,2586,2649,2704,2764,2827,2881,2941,2994,3056,3140,3220,3270,3329,3372,3415,3468,3511,3562,3612,3672,3725,3776,3822,3870,3918,3964,4011,4061,4106,4165,4217,4269,4312,4359,4415,4470,4525,4569,4611,4652,4702,4761,4804,4855,4904,4953,5000,5047,5094,5139,5190,5243,5318,5377,5434,5508,5572,5641,5719,5829,5933,6006,6072,6127,6192,6257,6306,6389,6467,6505,6550,6598,6660,6717,6772,6831,6898,6956,7018,7066,7111,7159,7210,7276",
-                        "endLines": "8,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",
-                        "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,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,42,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,1718,1784,1857,1907,1947,1995,2043,2088,2145,2199,2249,2311,2379,2456,2515,2581,2644,2699,2759,2822,2876,2936,2989,3051,3135,3215,3265,3324,3367,3410,3463,3506,3557,3607,3667,3720,3771,3817,3865,3913,3959,4006,4056,4101,4160,4212,4264,4307,4354,4410,4465,4520,4564,4606,4647,4697,4756,4799,4850,4899,4948,4995,5042,5089,5134,5185,5238,5313,5372,5429,5503,5567,5636,5714,5824,5928,6001,6067,6122,6187,6252,6301,6384,6462,6500,6545,6593,6655,6712,6767,6826,6893,6951,7013,7061,7106,7154,7205,7271,7337"
+                        "startLines": "6,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,127",
+                        "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,4,4",
+                        "startOffsets": "215,1651,1712,1765,1819,1891,1957,2030,2080,2120,2168,2216,2261,2318,2372,2422,2484,2552,2629,2688,2754,2817,2872,2932,2995,3049,3109,3162,3224,3308,3388,3438,3497,3540,3583,3636,3679,3730,3780,3840,3893,3944,3990,4038,4086,4132,4179,4229,4274,4333,4385,4437,4480,4527,4583,4638,4693,4737,4779,4820,4870,4929,4972,5023,5072,5121,5168,5215,5262,5307,5358,5411,5486,5545,5602,5676,5740,5809,5887,5997,6101,6174,6240,6295,6360,6425,6474,6557,6635,6673,6718,6766,6828,6885,6946,6997,7049,7104,7163,7230,7288,7350,7398,7443,7491,7542,7608",
+                        "endLines": "8,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,127",
+                        "endColumns": "14,60,52,53,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,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,42,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,60,50,51,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,1707,1760,1814,1886,1952,2025,2075,2115,2163,2211,2256,2313,2367,2417,2479,2547,2624,2683,2749,2812,2867,2927,2990,3044,3104,3157,3219,3303,3383,3433,3492,3535,3578,3631,3674,3725,3775,3835,3888,3939,3985,4033,4081,4127,4174,4224,4269,4328,4380,4432,4475,4522,4578,4633,4688,4732,4774,4815,4865,4924,4967,5018,5067,5116,5163,5210,5257,5302,5353,5406,5481,5540,5597,5671,5735,5804,5882,5992,6096,6169,6235,6290,6355,6420,6469,6552,6630,6668,6713,6761,6823,6880,6941,6992,7044,7099,7158,7225,7283,7345,7393,7438,7486,7537,7603,7669"
                    }
                },
                {
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -11,31 +11,31 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,286,299,300,301,302,303,310,311,315,319,324,330,337,341,345,350,354,358,362,366,370,374,378,382,386,388,390,394,398,402,407,411,414,418,422,426,430,434,438,443,446,449,452,455,458,461,464,466,468,469,470,473,475,477,479,484,485,489,495,499,500,502,513,514,518,524,528,529,530,534,561,565,593,738,760,905,927,934,939,960,965,970,980,989,1000,1004,1011,1019,1026,1027,1036,1039,1042,1047,1051,1054,1057,1061,1065,1073,1078,1085,1091,1092,1096,1101,1103,1105,1108,1111,1113,1117,1124,1127,1130,1134,1136,1140,1142,1148,1150,1154,1166,1172,1177,1192,1195,1200,1210,1230,1268,1307,1317,1326,1328,1332,1336,1339,1342,1345,1348,1352,1355,1358,1361,1365,1368,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1388,1390,1391,1392,1393,1395,1397,1398,1399,1400,1401,1402,1403,1405,1407,1409,1411,1413,1415,1416,1418,1419,1421,1423,1425,1426,1427,1428,1429,1430,1431,1432,1434,1436,1466,1467,1468,1469,1470,1471,1473,1474,1475,1476,1477,1478,1480,1484,1495,1496,1497,1498,1499,1504,1506,1508,1510,1512,1514,1515,1516,1517,1519,1521,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1536,1537,1538,1540,1542,1543,1545,1546,1548,1550,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1564,1566,1567,1568,1570,1571,1572,1574,1576,1578,1580,1582,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593",
+                        "startLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,292,305,306,307,308,309,316,317,321,325,330,336,343,347,351,356,360,364,368,372,376,380,384,388,392,394,396,400,404,408,413,417,420,424,428,432,436,440,444,449,452,455,458,461,464,467,470,472,474,475,476,479,481,483,485,490,491,495,501,505,506,508,519,520,524,530,534,535,536,540,567,571,599,744,766,911,933,940,945,966,971,976,986,995,1006,1010,1017,1025,1032,1033,1042,1045,1048,1053,1057,1060,1063,1067,1071,1079,1084,1091,1097,1098,1102,1107,1109,1111,1114,1117,1119,1123,1130,1133,1136,1140,1142,1146,1148,1154,1156,1160,1172,1178,1183,1198,1201,1206,1216,1236,1274,1313,1323,1332,1334,1338,1342,1345,1348,1351,1354,1358,1361,1364,1367,1371,1374,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1394,1396,1397,1398,1399,1401,1403,1404,1405,1406,1407,1408,1409,1411,1413,1415,1417,1419,1421,1422,1424,1425,1427,1429,1431,1432,1433,1434,1435,1436,1437,1438,1440,1442,1472,1473,1474,1475,1476,1477,1479,1480,1481,1482,1483,1484,1486,1490,1501,1502,1503,1504,1505,1510,1512,1514,1516,1518,1520,1521,1522,1523,1525,1527,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1539,1542,1543,1544,1546,1548,1549,1551,1552,1554,1556,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1570,1572,1573,1574,1576,1577,1578,1580,1582,1584,1586,1588,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599",
                        "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,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,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": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11218,11292,11370,11463,11533,11611,11665,11735,11820,11872,11945,12019,12088,12163,12237,12311,12400,18880,19853,19931,20021,20109,20205,20706,20795,21042,21323,21608,22001,22478,22700,22922,23190,23417,23647,23877,24107,24337,24564,24803,25029,25274,25404,25534,25764,26012,26231,26514,26722,26853,27080,27326,27551,27800,28021,28266,28561,28783,29021,29235,29465,29688,29903,30111,30235,30359,30464,30581,30795,30941,31081,31167,31515,31603,31833,32235,32468,32550,32648,33240,33340,33576,33984,34223,34317,34375,34612,36630,36872,39022,47736,49003,57827,59108,59644,59974,61097,61353,61589,62136,62630,63303,63518,64046,64610,64985,65103,65641,65798,65942,66262,66432,66573,66702,67001,67304,67863,68125,68475,68828,68922,69228,69490,69615,69742,69981,70192,70311,70504,70959,71140,71262,71521,71634,71821,71923,72367,72491,72776,73663,73957,74287,75207,75379,75715,76381,77418,80245,83213,83801,84395,84508,84737,85075,85235,85387,85558,85725,85968,86138,86311,86482,86756,86955,87202,87286,87382,87478,87576,87676,87778,87880,87982,88084,88186,88286,88382,88494,88623,88746,88900,89054,89152,89266,89360,89500,89634,89730,89842,89942,90058,90154,90266,90406,90554,90718,90860,91018,91168,91309,91453,91588,91724,91866,92008,92120,92260,92328,92401,92475,92548,92622,92768,92912,94396,94462,94552,94632,94724,94822,94932,95010,95116,95208,95312,95422,95544,95707,96257,96337,96437,96527,96637,96963,97063,97175,97289,97405,97521,97615,97729,97847,97949,98069,98191,98273,98377,98497,98623,98717,98805,98917,99033,99155,99267,99442,99558,99644,99756,99880,99947,100073,100141,100269,100413,100541,100610,100705,100820,100933,101032,101141,101252,101363,101464,101569,101681,101811,101902,102025,102137,102223,102327,102435,102535,102653,102757,102861,102987,103075,103165,103275,103359,103413,103535,103641,103751,103835",
-                        "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,286,299,300,301,302,309,310,314,318,323,329,336,340,344,349,353,357,361,365,369,373,377,381,385,387,389,393,397,401,406,410,413,417,421,425,429,433,437,442,445,448,451,454,457,460,463,465,467,468,469,472,474,476,478,483,484,488,494,498,499,501,512,513,517,523,527,528,529,533,560,564,592,737,759,904,926,933,938,959,964,969,979,988,999,1003,1010,1018,1025,1026,1035,1038,1041,1046,1050,1053,1056,1060,1064,1072,1077,1084,1090,1091,1095,1100,1102,1104,1107,1110,1112,1116,1123,1126,1129,1133,1135,1139,1141,1147,1149,1153,1165,1171,1176,1191,1194,1199,1209,1214,1267,1306,1316,1325,1327,1331,1335,1338,1341,1344,1347,1351,1354,1357,1360,1364,1367,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1387,1389,1390,1391,1392,1394,1396,1397,1398,1399,1400,1401,1402,1404,1406,1408,1410,1412,1414,1415,1417,1418,1420,1422,1424,1425,1426,1427,1428,1429,1430,1431,1433,1435,1437,1466,1467,1468,1469,1470,1472,1473,1474,1475,1476,1477,1479,1483,1487,1495,1496,1497,1498,1499,1505,1507,1509,1511,1513,1514,1515,1516,1518,1520,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1535,1536,1537,1539,1541,1542,1544,1545,1547,1549,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1563,1565,1566,1567,1569,1570,1571,1573,1575,1577,1579,1581,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593",
+                        "startOffsets": "420,475,520,569,610,665,728,804,866,939,1007,1085,1166,1227,1302,1378,1455,1533,1603,1674,1735,1847,1924,2002,2108,2214,2293,2373,2430,2488,2562,2637,2702,2768,2835,2903,3007,3319,3399,3480,3539,3598,3657,3716,3775,3838,3902,3960,4019,4090,4162,4234,4307,4364,4422,4495,4569,4643,4718,4790,4863,4933,5061,5130,5200,5270,5347,5426,5502,5579,5643,5708,5777,5854,5929,5998,6066,6143,6209,6306,6371,6440,6539,6598,6656,6713,6772,6844,6912,6980,7039,7102,7192,7283,7343,7409,7476,7542,7612,7676,7729,7842,7900,7965,8029,8078,8139,8200,8261,8323,8387,8451,8515,8580,8643,8703,8764,8823,8883,8945,9016,9076,9144,9211,9279,9347,9415,9501,9588,9650,9711,10030,10102,10159,10207,10256,10307,10341,10388,10437,10483,10515,10579,10641,10696,10756,11218,11292,11370,11463,11533,11611,11665,11735,11820,11872,11945,12019,12088,12163,12237,12311,12400,19249,20222,20300,20390,20478,20574,21075,21164,21411,21692,21977,22370,22847,23069,23291,23559,23786,24016,24246,24476,24706,24933,25172,25398,25643,25773,25903,26133,26381,26600,26883,27091,27222,27449,27695,27920,28169,28390,28635,28930,29152,29390,29604,29834,30057,30272,30480,30604,30728,30833,30950,31164,31310,31450,31536,31884,31972,32202,32604,32837,32919,33017,33609,33709,33945,34353,34592,34686,34744,34981,36999,37241,39391,48105,49372,58196,59477,60013,60343,61466,61722,61958,62505,62999,63672,63887,64415,64979,65354,65472,66010,66167,66311,66631,66801,66942,67071,67370,67673,68232,68494,68844,69197,69291,69597,69859,69984,70111,70350,70561,70680,70873,71328,71509,71631,71890,72003,72190,72292,72736,72860,73145,74032,74326,74656,75576,75748,76084,76750,77787,80614,83582,84170,84764,84877,85106,85444,85604,85756,85927,86094,86337,86507,86680,86851,87125,87324,87571,87655,87751,87847,87945,88045,88147,88249,88351,88453,88555,88655,88751,88863,88992,89115,89269,89423,89521,89635,89729,89869,90003,90099,90211,90311,90427,90523,90635,90775,90923,91087,91229,91387,91537,91678,91822,91957,92093,92235,92377,92489,92629,92697,92770,92844,92917,92991,93137,93281,94765,94831,94921,95001,95093,95191,95301,95379,95485,95577,95681,95791,95913,96076,96626,96706,96806,96896,97006,97332,97432,97544,97658,97774,97890,97984,98098,98216,98318,98438,98560,98642,98746,98866,98992,99086,99174,99286,99402,99524,99636,99811,99927,100013,100125,100249,100316,100442,100510,100638,100782,100910,100979,101074,101189,101302,101401,101510,101621,101732,101833,101938,102050,102180,102271,102394,102506,102592,102696,102804,102904,103022,103126,103230,103356,103444,103534,103644,103728,103782,103904,104010,104120,104204",
+                        "endLines": "12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,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,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,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,292,305,306,307,308,315,316,320,324,329,335,342,346,350,355,359,363,367,371,375,379,383,387,391,393,395,399,403,407,412,416,419,423,427,431,435,439,443,448,451,454,457,460,463,466,469,471,473,474,475,478,480,482,484,489,490,494,500,504,505,507,518,519,523,529,533,534,535,539,566,570,598,743,765,910,932,939,944,965,970,975,985,994,1005,1009,1016,1024,1031,1032,1041,1044,1047,1052,1056,1059,1062,1066,1070,1078,1083,1090,1096,1097,1101,1106,1108,1110,1113,1116,1118,1122,1129,1132,1135,1139,1141,1145,1147,1153,1155,1159,1171,1177,1182,1197,1200,1205,1215,1220,1273,1312,1322,1331,1333,1337,1341,1344,1347,1350,1353,1357,1360,1363,1366,1370,1373,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1393,1395,1396,1397,1398,1400,1402,1403,1404,1405,1406,1407,1408,1410,1412,1414,1416,1418,1420,1421,1423,1424,1426,1428,1430,1431,1432,1433,1434,1435,1436,1437,1439,1441,1443,1472,1473,1474,1475,1476,1478,1479,1480,1481,1482,1483,1485,1489,1493,1501,1502,1503,1504,1505,1511,1513,1515,1517,1519,1520,1521,1522,1524,1526,1528,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1541,1542,1543,1545,1547,1548,1550,1551,1553,1555,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1569,1571,1572,1573,1575,1576,1577,1579,1581,1583,1585,1587,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599",
                        "endColumns": "54,44,48,40,54,62,75,61,72,67,77,80,60,74,75,76,77,69,70,60,61,76,77,105,105,78,79,56,57,73,74,64,65,66,67,103,105,79,80,58,58,58,58,58,62,63,57,58,70,71,71,72,56,57,72,73,73,74,71,72,69,70,68,69,69,76,78,75,76,63,64,68,76,74,68,67,76,65,96,64,68,98,58,57,56,58,71,67,67,58,62,89,90,59,65,66,65,69,63,52,112,57,64,63,48,60,60,60,61,63,63,63,64,62,59,60,58,59,61,70,59,67,66,67,67,67,85,86,61,60,56,71,56,47,48,50,33,46,48,45,31,63,61,54,59,69,73,77,92,69,77,53,69,84,51,72,73,68,74,73,73,88,69,70,77,89,87,95,12,88,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,104,116,12,12,12,12,12,87,12,12,12,81,12,12,99,12,12,12,93,57,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,117,12,12,12,12,12,12,12,12,12,12,12,12,12,93,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,83,95,95,97,99,101,101,101,101,101,99,95,111,128,122,12,12,97,113,93,12,12,95,111,99,115,95,111,12,12,12,12,12,12,140,12,134,12,12,12,111,139,67,72,73,72,73,12,12,12,65,89,79,91,97,12,77,105,91,103,109,12,12,12,79,99,89,109,91,12,12,12,12,12,93,113,117,12,12,12,81,103,119,125,93,87,111,115,121,111,12,115,85,12,12,66,12,67,12,12,12,68,94,114,112,98,108,110,110,100,104,12,12,90,122,12,85,103,12,12,12,12,12,12,87,89,109,83,53,121,105,109,83,125",
-                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11287,11365,11458,11528,11606,11660,11730,11815,11867,11940,12014,12083,12158,12232,12306,12395,12465,18946,19926,20016,20104,20200,20701,20790,21037,21318,21603,21996,22473,22695,22917,23185,23412,23642,23872,24102,24332,24559,24798,25024,25269,25399,25529,25759,26007,26226,26509,26717,26848,27075,27321,27546,27795,28016,28261,28556,28778,29016,29230,29460,29683,29898,30106,30230,30354,30459,30576,30790,30936,31076,31162,31510,31598,31828,32230,32463,32545,32643,33235,33335,33571,33979,34218,34312,34370,34607,36625,36867,39017,47731,48998,57822,59103,59639,59969,61092,61348,61584,62131,62625,63298,63513,64041,64605,64980,65098,65636,65793,65937,66257,66427,66568,66697,66996,67299,67858,68120,68470,68823,68917,69223,69485,69610,69737,69976,70187,70306,70499,70954,71135,71257,71516,71629,71816,71918,72362,72486,72771,73658,73952,74282,75202,75374,75710,76376,76661,80240,83208,83796,84390,84503,84732,85070,85230,85382,85553,85720,85963,86133,86306,86477,86751,86950,87197,87281,87377,87473,87571,87671,87773,87875,87977,88079,88181,88281,88377,88489,88618,88741,88895,89049,89147,89261,89355,89495,89629,89725,89837,89937,90053,90149,90261,90401,90549,90713,90855,91013,91163,91304,91448,91583,91719,91861,92003,92115,92255,92323,92396,92470,92543,92617,92763,92907,93045,94457,94547,94627,94719,94817,94927,95005,95111,95203,95307,95417,95539,95702,95859,96332,96432,96522,96632,96724,97058,97170,97284,97400,97516,97610,97724,97842,97944,98064,98186,98268,98372,98492,98618,98712,98800,98912,99028,99150,99262,99437,99553,99639,99751,99875,99942,100068,100136,100264,100408,100536,100605,100700,100815,100928,101027,101136,101247,101358,101459,101564,101676,101806,101897,102020,102132,102218,102322,102430,102530,102648,102752,102856,102982,103070,103160,103270,103354,103408,103530,103636,103746,103830,103956"
+                        "endOffsets": "470,515,564,605,660,723,799,861,934,1002,1080,1161,1222,1297,1373,1450,1528,1598,1669,1730,1792,1919,1997,2103,2209,2288,2368,2425,2483,2557,2632,2697,2763,2830,2898,3002,3108,3394,3475,3534,3593,3652,3711,3770,3833,3897,3955,4014,4085,4157,4229,4302,4359,4417,4490,4564,4638,4713,4785,4858,4928,4999,5125,5195,5265,5342,5421,5497,5574,5638,5703,5772,5849,5924,5993,6061,6138,6204,6301,6366,6435,6534,6593,6651,6708,6767,6839,6907,6975,7034,7097,7187,7278,7338,7404,7471,7537,7607,7671,7724,7837,7895,7960,8024,8073,8134,8195,8256,8318,8382,8446,8510,8575,8638,8698,8759,8818,8878,8940,9011,9071,9139,9206,9274,9342,9410,9496,9583,9645,9706,9763,10097,10154,10202,10251,10302,10336,10383,10432,10478,10510,10574,10636,10691,10751,10821,11287,11365,11458,11528,11606,11660,11730,11815,11867,11940,12014,12083,12158,12232,12306,12395,12465,19315,20295,20385,20473,20569,21070,21159,21406,21687,21972,22365,22842,23064,23286,23554,23781,24011,24241,24471,24701,24928,25167,25393,25638,25768,25898,26128,26376,26595,26878,27086,27217,27444,27690,27915,28164,28385,28630,28925,29147,29385,29599,29829,30052,30267,30475,30599,30723,30828,30945,31159,31305,31445,31531,31879,31967,32197,32599,32832,32914,33012,33604,33704,33940,34348,34587,34681,34739,34976,36994,37236,39386,48100,49367,58191,59472,60008,60338,61461,61717,61953,62500,62994,63667,63882,64410,64974,65349,65467,66005,66162,66306,66626,66796,66937,67066,67365,67668,68227,68489,68839,69192,69286,69592,69854,69979,70106,70345,70556,70675,70868,71323,71504,71626,71885,71998,72185,72287,72731,72855,73140,74027,74321,74651,75571,75743,76079,76745,77030,80609,83577,84165,84759,84872,85101,85439,85599,85751,85922,86089,86332,86502,86675,86846,87120,87319,87566,87650,87746,87842,87940,88040,88142,88244,88346,88448,88550,88650,88746,88858,88987,89110,89264,89418,89516,89630,89724,89864,89998,90094,90206,90306,90422,90518,90630,90770,90918,91082,91224,91382,91532,91673,91817,91952,92088,92230,92372,92484,92624,92692,92765,92839,92912,92986,93132,93276,93414,94826,94916,94996,95088,95186,95296,95374,95480,95572,95676,95786,95908,96071,96228,96701,96801,96891,97001,97093,97427,97539,97653,97769,97885,97979,98093,98211,98313,98433,98555,98637,98741,98861,98987,99081,99169,99281,99397,99519,99631,99806,99922,100008,100120,100244,100311,100437,100505,100633,100777,100905,100974,101069,101184,101297,101396,101505,101616,101727,101828,101933,102045,102175,102266,102389,102501,102587,102691,102799,102899,103017,103121,103225,103351,103439,103529,103639,103723,103777,103899,104005,104115,104199,104325"
                    }
                },
                {
                    "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/values/strings.xml",
                    "from": {
-                        "startLines": "127,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1",
-                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,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,4,-1,-1",
-                        "startOffsets": "8004,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8481,8535,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8412,-1,-1",
-                        "endLines": "131,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,133,134,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,-1,-1",
-                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,56,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,68,-1,-1",
-                        "endOffsets": "8407,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8530,8587,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8476,-1,-1"
+                        "startLines": "127,142,141,140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,4,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8004,8988,8931,8873,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "131,142,141,140,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,72,56,57,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8407,9056,8983,8926,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,287,288,289,290,291,292,293,294,295,296,297,298",
-                        "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,4,4,4",
-                        "startOffsets": "10826,12470,12566,12649,12745,12814,12857,12909,12961,13010,13073,13131,13182,13266,13320,13377,13471,13579,13650,13734,13817,13883,13966,14068,14129,14191,14242,14320,14373,14433,14538,14597,14699,14754,14825,14875,14924,14982,15029,15088,15145,15216,15277,15334,15384,15436,15489,15539,15589,15649,15702,15768,15830,15893,15940,15995,16083,16141,16203,16253,16298,16341,16401,16468,16518,16573,16628,16681,16728,16781,16837,16885,16940,16993,17077,17144,17208,17304,17378,17459,17548,17711,17855,17934,18009,18091,18150,18230,18310,18365,18487,18590,18631,18684,18741,18815,18951,19019,19105,19185,19254,19348,19407,19462,19524,19584,19653,19763",
-                        "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,287,288,289,290,291,292,293,294,295,296,297,298",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,49,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,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,68,109,89",
-                        "endOffsets": "11213,12561,12644,12740,12809,12852,12904,12956,13005,13068,13126,13177,13261,13315,13372,13466,13574,13645,13729,13812,13878,13961,14063,14124,14186,14237,14315,14368,14428,14533,14592,14694,14749,14820,14870,14919,14977,15024,15083,15140,15211,15272,15329,15379,15431,15484,15534,15584,15644,15697,15763,15825,15888,15935,15990,16078,16136,16198,16248,16293,16336,16396,16463,16513,16568,16623,16676,16723,16776,16832,16880,16935,16988,17072,17139,17203,17299,17373,17454,17543,17706,17850,17929,18004,18086,18145,18225,18305,18360,18482,18585,18626,18679,18736,18810,18875,19014,19100,19180,19249,19343,19402,19457,19519,19579,19648,19758,19848"
+                        "startLines": "169,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,293,294,295,296,297,298,299,300,301,302,303,304",
+                        "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,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "10826,12470,12543,12600,12658,12754,12837,12933,13002,13045,13097,13149,13198,13261,13319,13370,13454,13508,13565,13659,13767,13838,13922,14005,14071,14154,14256,14317,14379,14430,14508,14561,14621,14726,14785,14887,14942,15013,15063,15112,15170,15217,15276,15333,15404,15465,15522,15572,15624,15677,15727,15777,15837,15890,15956,16018,16081,16128,16183,16271,16329,16391,16441,16486,16529,16589,16656,16706,16761,16816,16869,16916,16969,17025,17073,17128,17181,17265,17332,17396,17492,17566,17647,17736,17899,18043,18122,18197,18279,18338,18418,18498,18553,18675,18778,18819,18872,18929,19003,19068,19134,19191,19320,19388,19474,19554,19623,19717,19776,19831,19893,19953,20022,20132",
+                        "endLines": "173,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,293,294,295,296,297,298,299,300,301,302,303,304",
+                        "endColumns": "14,72,56,57,95,82,95,68,42,51,51,48,62,57,50,83,53,56,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,49,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,49,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,65,56,57,67,85,79,68,93,58,54,61,59,68,109,89",
+                        "endOffsets": "11213,12538,12595,12653,12749,12832,12928,12997,13040,13092,13144,13193,13256,13314,13365,13449,13503,13560,13654,13762,13833,13917,14000,14066,14149,14251,14312,14374,14425,14503,14556,14616,14721,14780,14882,14937,15008,15058,15107,15165,15212,15271,15328,15399,15460,15517,15567,15619,15672,15722,15772,15832,15885,15951,16013,16076,16123,16178,16266,16324,16386,16436,16481,16524,16584,16651,16701,16756,16811,16864,16911,16964,17020,17068,17123,17176,17260,17327,17391,17487,17561,17642,17731,17894,18038,18117,18192,18274,18333,18413,18493,18548,18670,18773,18814,18867,18924,18998,19063,19129,19186,19244,19383,19469,19549,19618,19712,19771,19826,19888,19948,20017,20127,20217"
                    }
                },
                {
@ -46,12 +46,12 @@
                        "startOffsets": "-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "1488,1489,1500",
+                        "startLines": "1494,1495,1506",
                        "startColumns": "4,4,4",
-                        "startOffsets": "95864,95933,96729",
-                        "endLines": "1488,1494,1503",
+                        "startOffsets": "96233,96302,97098",
+                        "endLines": "1494,1500,1509",
                        "endColumns": "68,12,12",
-                        "endOffsets": "95928,96252,96958"
+                        "endOffsets": "96297,96621,97327"
                    }
                },
                {
@ -62,12 +62,12 @@
                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "1215,1219,1223,1227,1438,1442,1446,1450,1454,1458,1462,1594,1597",
+                        "startLines": "1221,1225,1229,1233,1444,1448,1452,1456,1460,1464,1468,1600,1603",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "76666,76874,77085,77258,93050,93233,93418,93603,93806,94012,94195,103961,104143",
-                        "endLines": "1218,1222,1226,1229,1441,1445,1449,1453,1457,1461,1465,1596,1600",
+                        "startOffsets": "77035,77243,77454,77627,93419,93602,93787,93972,94175,94381,94564,104330,104512",
+                        "endLines": "1224,1228,1232,1235,1447,1451,1455,1459,1463,1467,1471,1602,1606",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "76869,77080,77253,77413,93228,93413,93598,93801,94007,94190,94391,104138,104374"
+                        "endOffsets": "77238,77449,77622,77782,93597,93782,93967,94170,94376,94559,94760,104507,104743"
                    }
                },
                {
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@ -159,10 +159,18 @@
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/raw-zh-rCN/introduction"
    },
+    {
+        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-v24_settings_launcher_foreground.xml.flat",
+        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-v24/settings_launcher_foreground.xml"
+    },
    {
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/menu/note_edit.xml"
    },
+    {
+        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_settings.png.flat",
+        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/settings.png"
+    },
    {
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/menu/note_list_dropdown.xml"
@ -355,10 +363,18 @@
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/search_result.png"
    },
+    {
+        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_add_note.png.flat",
+        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/add_note.png"
+    },
    {
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png"
    },
+    {
+        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable_settings_launcher_background.xml.flat",
+        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable/settings_launcher_background.xml"
+    },
    {
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/layout/datetime_picker.xml"
@ -371,6 +387,10 @@
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/xml/searchable.xml"
    },
+    {
+        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/xml_shortcuts.xml.flat",
+        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/xml/shortcuts.xml"
+    },
    {
        "merged": "/home/xf1001/AndroidStudioProjects/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat",
        "source": "/home/xf1001/AndroidStudioProjects/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png"
--- a/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@ -5,13 +5,13 @@
    android:versionName="1.0" >

    <uses-sdk
-        android:minSdkVersion="22"
-        android:targetSdkVersion="22" />
-
+        android:minSdkVersion="25"
+        android:targetSdkVersion="30" />
    <!-- xmlns:android：定义android命名空间，一般为http://schemas.android.com/apk/res/android，这样使得Android中各种标准属性能在文件中使用，提供了大部分元素中的数据。 -->
    <!-- package：指定本应用内java主程序包包名、进程默认名、路径名 -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- 写入SD卡的权限 -->
    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> <!-- 创建、删除等有关快捷方式的权限 -->
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
    <uses-permission android:name="android.permission.INTERNET" /> <!-- 访问网络的权限 -->
    <uses-permission android:name="android.permission.READ_CONTACTS" /> <!-- 读取手机联系人的权限 -->
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <!-- 帐户管理：获取帐户验证信息的权限 -->
@ -22,6 +22,7 @@

    <application
        android:debuggable="true"
+        android:extractNativeLibs="false"
        android:icon="@drawable/icon_app_new"
        android:label="@string/app_name"
        android:testOnly="true" >
@ -36,8 +37,11 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-        </activity>
-        <!-- 每一个组件及其属性 -->
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+        </activity> <!-- 每一个组件及其属性 -->
        <!-- 声明一个实现应用可视化界面的Activity -->
        <activity
            android:name="net.micode.notes.ui.NotesListActivity"
@ -48,6 +52,9 @@
            android:windowSoftInputMode="adjustPan" >

            <!-- android:uiOptions="splitActionBarWhenNarrow" -->
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+            </intent-filter>
        </activity>
        <activity
            android:name="net.micode.notes.ui.NoteEditActivity"
--- a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_0.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_0.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_1.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_1.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_2.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_2.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_3.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_3.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_4.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_4.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_5.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/0a4562ada526c67a714de9c80af2c9675fc6e883d55de4dd1562cfa6ced1b530_5.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_0.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_0.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_1.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_1.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_2.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_2.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_3.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_3.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_4.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_4.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_5.jar
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/a467e177adcf70ce4f0859393c50c26f7b97958e1957bb447533e4e4f2d01e11_5.jar
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/SplashActivity$1.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/SplashActivity$1.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/SplashActivity.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/SplashActivity.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
--- a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
+++ b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
--- a/Show More
+++ b/Show More