diff --git a/.idea/Notes2.iml b/.idea/Notes2.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/Notes2.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b898c0a..b29bf60 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,6 +6,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6ff4d26..ade1ecd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a5383a8
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Notes2.iml" filepath="$PROJECT_DIR$/.idea/Notes2.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d155f99..13ce9e0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,17 +4,59 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="1505c69a-f2ec-40be-80c6-20552b940498" name="Changes" comment="" />
+    <list default="true" id="967e7b2d-0e66-424b-9c7d-fd88bfec58f4" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <task path="$PROJECT_DIR$/app">
+          <activation />
+        </task>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="Notes2" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="Notes2" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="Notes2" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="Notes2" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="other" type="c8890929:TasksNode$1" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="zjx_branch" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="ProjectId" id="2VO9QfH19bLK3j3qgA20kVJs7JI" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectId" id="2XIJ0eqoavUXVAocxdwAq0qL7ft" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -25,18 +67,41 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.cidr.known.project.marker": "true",
     "cidr.known.project.marker": "true",
-    "last_opened_file_path": "D:/Code/Repository/Android/Notes2/src"
+    "last_opened_file_path": "D:/Code/Repository/Android/Notes2/src/app"
   }
 }]]></component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="1505c69a-f2ec-40be-80c6-20552b940498" name="Changes" comment="" />
-      <created>1694696247469</created>
+      <changelist id="967e7b2d-0e66-424b-9c7d-fd88bfec58f4" name="Changes" comment="" />
+      <created>1698310439063</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1694696247469</updated>
+      <updated>1698310439063</updated>
     </task>
     <servers />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="develop" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/doc/~$模板-开源软件泛读、标注和维护报告文档.docx b/doc/~$模板-开源软件泛读、标注和维护报告文档.docx
deleted file mode 100644
index 8f50a51..0000000
Binary files a/doc/~$模板-开源软件泛读、标注和维护报告文档.docx and /dev/null differ
diff --git a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx
index d56241d..d129725 100644
Binary files a/doc/实践模板-开源软件泛读、标注和维护报告文档.docx and b/doc/实践模板-开源软件泛读、标注和维护报告文档.docx differ
diff --git a/doc/实践模板-开源软件的质量分析报告文档.docx b/doc/实践模板-开源软件的质量分析报告文档.docx
new file mode 100644
index 0000000..08ddabe
Binary files /dev/null and b/doc/实践模板-开源软件的质量分析报告文档.docx differ
diff --git a/gtask.suml b/gtask.suml
new file mode 100644
index 0000000..ec3836e
--- /dev/null
+++ b/gtask.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="net.micode.notes.gtask.remote.GTaskClient" x="787" y="61"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.exception.ActionFailureException" x="50" y="224"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.SqlData" x="382" y="224"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.remote.GTaskSyncService" x="788" y="209"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.exception.NetworkFailureException" x="51" y="153"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.Task" x="347" y="137"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.remote.GTaskManager" x="787" y="135"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.SqlNote" x="507" y="223"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.remote.GTaskASyncTask" x="789" y="281"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.Node" x="372" y="30"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.TaskList" x="516" y="30"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.gtask.data.MetaData" x="515" y="139"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="net.micode.notes.gtask.data.Task" to="net.micode.notes.gtask.data.Node"><anchor constraint="1" type="2" x="403" y="137" /><anchor constraint="1" type="2" x="406" y="97" /><decorator type="2" description="" /></connector><connector from="net.micode.notes.gtask.remote.GTaskManager" to="net.micode.notes.gtask.data.TaskList"><anchor constraint="1" type="2" x="787" y="147" /><anchor constraint="1" type="2" x="647" y="89" /><decorator type="4" description="-  mMetaList" /></connector><connector from="net.micode.notes.gtask.remote.GTaskASyncTask" to="net.micode.notes.gtask.remote.GTaskManager"><anchor constraint="1" type="2" x="880" y="281" /><anchor constraint="1" type="2" x="850" y="202" /><decorator type="4" description="-  mTaskManager" /></connector><connector from="net.micode.notes.gtask.data.Task" to="net.micode.notes.gtask.data.Task"><anchor constraint="1" type="2" x="423" y="204" /><anchor constraint="1" type="1" x="423" y="229" /><anchor constraint="1" type="1" x="467" y="229" /><anchor constraint="1" type="1" x="467" y="170" /><anchor constraint="1" type="2" x="457" y="170" /><decorator type="4" description="-  mPriorSibling" /></connector><connector from="net.micode.notes.gtask.data.Task" to="net.micode.notes.gtask.data.TaskList"><anchor constraint="1" type="2" x="457" y="137" /><anchor constraint="1" type="2" x="524" y="97" /><decorator type="4" description="-  mParent" /></connector><connector from="net.micode.notes.gtask.data.TaskList" to="net.micode.notes.gtask.data.Node"><anchor constraint="1" type="2" x="516" y="63" /><anchor constraint="1" type="2" x="444" y="63" /><decorator type="2" description="" /></connector><connector from="net.micode.notes.gtask.data.MetaData" to="net.micode.notes.gtask.data.Task"><anchor constraint="1" type="2" x="515" y="171" /><anchor constraint="1" type="2" x="457" y="170" /><decorator type="2" description="" /></connector><connector from="net.micode.notes.gtask.remote.GTaskManager" to="net.micode.notes.gtask.remote.GTaskManager"><anchor constraint="1" type="2" x="855" y="202" /><anchor constraint="1" type="1" x="855" y="227" /><anchor constraint="1" type="1" x="899" y="227" /><anchor constraint="1" type="1" x="899" y="168" /><anchor constraint="1" type="2" x="889" y="168" /><decorator type="4" description="-  mInstance" /></connector><connector from="net.micode.notes.gtask.remote.GTaskSyncService" to="net.micode.notes.gtask.remote.GTaskASyncTask"><anchor constraint="1" type="2" x="890" y="276" /><anchor constraint="1" type="2" x="890" y="281" /><decorator type="4" description="-  mSyncTask" /></connector><connector from="net.micode.notes.gtask.remote.GTaskClient" to="net.micode.notes.gtask.remote.GTaskClient"><anchor constraint="1" type="2" x="839" y="128" /><anchor constraint="1" type="1" x="839" y="153" /><anchor constraint="1" type="1" x="883" y="153" /><anchor constraint="1" type="1" x="883" y="94" /><anchor constraint="1" type="2" x="873" y="94" /><decorator type="4" description="-  mInstance" /></connector></connectors></Classdiagram>
diff --git a/mode.suml b/mode.suml
new file mode 100644
index 0000000..a399e04
--- /dev/null
+++ b/mode.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="net.micode.notes.model.WorkingNote" x="236" y="71"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.model.Note" x="148" y="71"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="net.micode.notes.model.WorkingNote" to="net.micode.notes.model.Note"><anchor constraint="1" type="2" x="236" y="104" /><anchor constraint="1" type="2" x="220" y="104" /><decorator type="4" description="-  mNote" /></connector></connectors></Classdiagram>
diff --git a/src/.gradle/7.5/checksums/checksums.lock b/src/.gradle/7.5/checksums/checksums.lock
index 552a29c..309e30f 100644
Binary files a/src/.gradle/7.5/checksums/checksums.lock and b/src/.gradle/7.5/checksums/checksums.lock differ
diff --git a/src/.gradle/7.5/checksums/md5-checksums.bin b/src/.gradle/7.5/checksums/md5-checksums.bin
index 342247e..2eec605 100644
Binary files a/src/.gradle/7.5/checksums/md5-checksums.bin and b/src/.gradle/7.5/checksums/md5-checksums.bin differ
diff --git a/src/.gradle/7.5/checksums/sha1-checksums.bin b/src/.gradle/7.5/checksums/sha1-checksums.bin
index 7bed854..af29f18 100644
Binary files a/src/.gradle/7.5/checksums/sha1-checksums.bin and b/src/.gradle/7.5/checksums/sha1-checksums.bin differ
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin
index 011d079..2015e58 100644
Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock
index 38990f8..faa5051 100644
Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin
index c046e96..8fd1fc0 100644
Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock
index 129b084..5e724f5 100644
Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 10d6291..5f54b99 100644
Binary files a/src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index a26abdd..78b4fc9 100644
Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin
index 624be9c..a092834 100644
Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe
index 93873ad..18ddedd 100644
Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ
diff --git a/src/.idea/aws.xml b/src/.idea/aws.xml
new file mode 100644
index 0000000..b63b642
--- /dev/null
+++ b/src/.idea/aws.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/compiler.xml b/src/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/src/.idea/compiler.xml
+++ b/src/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 64633d5..0000000
--- a/src/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="127.0.0.1:5555" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-09-14T09:58:41.226597700Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/.idea/gradle.xml b/src/.idea/gradle.xml
index 6e5389e..db8e8b3 100644
--- a/src/.idea/gradle.xml
+++ b/src/.idea/gradle.xml
@@ -4,10 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml
index bdd9278..d7916a5 100644
--- a/src/.idea/misc.xml
+++ b/src/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/src/.idea/modules/app/src.app.androidTest.iml b/src/.idea/modules/app/src.app.androidTest.iml
new file mode 100644
index 0000000..29eda6e
--- /dev/null
+++ b/src/.idea/modules/app/src.app.androidTest.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="9d512367-cc80-48b7-85d7-1943b2a7a94c" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/.idea/modules/app/src.app.iml b/src/.idea/modules/app/src.app.iml
new file mode 100644
index 0000000..7226714
--- /dev/null
+++ b/src/.idea/modules/app/src.app.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="0b091a8f-80fd-4c63-b21a-3a6868d6ab63" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/.idea/modules/app/src.app.main.iml b/src/.idea/modules/app/src.app.main.iml
new file mode 100644
index 0000000..7c55c8b
--- /dev/null
+++ b/src/.idea/modules/app/src.app.main.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="5387f3e1-53c6-477f-9522-acdaf8b0df87" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/.idea/modules/app/src.app.unitTest.iml b/src/.idea/modules/app/src.app.unitTest.iml
new file mode 100644
index 0000000..b81245b
--- /dev/null
+++ b/src/.idea/modules/app/src.app.unitTest.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="c13e4016-2950-4012-a9f6-886fd1feb0a0" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/.idea/sonarlint.xml b/src/.idea/sonarlint.xml
new file mode 100644
index 0000000..690ebfa
--- /dev/null
+++ b/src/.idea/sonarlint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SonarLintProjectSettings">
+    <option name="bindingEnabled" value="true" />
+    <option name="projectKey" value="test" />
+    <option name="serverId" value="MiNoteTest" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/src.iml b/src/.idea/src.iml
new file mode 100644
index 0000000..1da73e8
--- /dev/null
+++ b/src/.idea/src.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="ee6a7ea8-8458-4f45-a628-153dc4e501b0" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/app/.idea/.gitignore b/src/app/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/src/app/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/src/app/.idea/gradle.xml b/src/app/.idea/gradle.xml
new file mode 100644
index 0000000..b898c0a
--- /dev/null
+++ b/src/app/.idea/gradle.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app/.idea/misc.xml b/src/app/.idea/misc.xml
new file mode 100644
index 0000000..6ff4d26
--- /dev/null
+++ b/src/app/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app/.idea/vcs.xml b/src/app/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/src/app/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/app/build.gradle b/src/app/build.gradle
index d60f54b..bf0e002 100644
--- a/src/app/build.gradle
+++ b/src/app/build.gradle
@@ -20,18 +20,19 @@ android {
     packagingOptions{
         exclude 'META-INF/DEPENDENCIES'
     }
+
+
 }
 
 dependencies {
-<<<<<<< HEAD
-<<<<<<< HEAD
-    implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'],
-            exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar'])
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+
+//    implementation fileTree(dir: 'E:\\code\\Android\\mi-note\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'],
+//            exclude: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar'])
+
     implementation fileTree(dir: 'D:\\Code\\Repository\\Android\\Notes2\\src\\httpcomponents-client-4.5.14-bin\\lib', include: ['*.aar', '*.jar'], exclude: [],
     excludes: ['commons-codec-1.11.jar','httpclient-4.5.14.jar','httpclient-cache-4.5.14.jar','httpmime-4.5.14.jar','fluent-hc-4.5.14.jar'])
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+
 }
 
+
+
diff --git a/src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java b/src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
new file mode 100644
index 0000000..b067bc1
--- /dev/null
+++ b/src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java
@@ -0,0 +1,10 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package net.micode.notes.test;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String APPLICATION_ID = "net.micode.notes.test";
+  public static final String BUILD_TYPE = "debug";
+}
diff --git a/src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json b/src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json b/src/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/src/app/build/intermediates/annotation_processor_list/debugUnitTest/annotationProcessors.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk
index 786ab92..4e08921 100644
Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar
new file mode 100644
index 0000000..df70a92
Binary files /dev/null and b/src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debugAndroidTest/R.jar differ
diff --git a/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
new file mode 100644
index 0000000..bbefd44
Binary files /dev/null and b/src/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_0/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_1/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_2/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_3/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_4/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_c9a73535fdb22283e7813f2e21e69de004c7cbf9af0206b9e3598d07c2152818_bucket_5/graph.bin and /dev/null differ
diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index cc52e81..74f6083 100644
Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index a3a1b1b..b91cb07 100644
Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out
index 62f9457..bf0d87a 100644
--- a/src/app/build/intermediates/dex_number_of_buckets_file/debug/out
+++ b/src/app/build/intermediates/dex_number_of_buckets_file/debug/out
@@ -1 +1 @@
-6
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index aef4a69..89fd94a 100644
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8=
deleted file mode 100644
index b69f917..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F_HgUjaV6UZkHY+TPHuK_ZyiDU8= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU=
deleted file mode 100644
index 2dca7d3..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HtPFAJsgV6LS7hg+gg2P5ghM1uU= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E=
deleted file mode 100644
index 86da686..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LVjZj2n1g+AwEhZnSBwyUktw85E= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs=
deleted file mode 100644
index 02ce572..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qTp+eSEYAfFSmjFIbtBuPXhxrgs= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8=
deleted file mode 100644
index bff786f..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/siWS+FwfSriB9bO_JjE7vYjVDV8= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw=
deleted file mode 100644
index 208e210..0000000
Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wKRCxGMjwYOFTqmIBhgFzsdFxKw= and /dev/null differ
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index da203f9..f196548 100644
--- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,105 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Thu Sep 14 17:58:45 CST 2023
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-#Fri Sep 15 09:58:37 CST 2023
+#Sun Oct 29 15:51:32 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
@@ -195,7 +94,3 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Code\\Reposit
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
 net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index efb5511..7825991 100644
--- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\res"/><source path="E:\code\Android\mi-note\src\app\build\generated\res\rs\debug"/><source path="E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\res"><file name="primary_text_dark" path="E:\code\Android\mi-note\src\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="E:\code\Android\mi-note\src\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="E:\code\Android\mi-note\src\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="E:\code\Android\mi-note\src\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="E:\code\Android\mi-note\src\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="E:\code\Android\mi-note\src\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="E:\code\Android\mi-note\src\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="E:\code\Android\mi-note\src\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="E:\code\Android\mi-note\src\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="E:\code\Android\mi-note\src\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="E:\code\Android\mi-note\src\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="E:\code\Android\mi-note\src\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="E:\code\Android\mi-note\src\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="E:\code\Android\mi-note\src\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="E:\code\Android\mi-note\src\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="E:\code\Android\mi-note\src\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="E:\code\Android\mi-note\src\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="E:\code\Android\mi-note\src\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="E:\code\Android\mi-note\src\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="E:\code\Android\mi-note\src\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="E:\code\Android\mi-note\src\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="E:\code\Android\mi-note\src\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="E:\code\Android\mi-note\src\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
-=======
 <merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\res"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\res"><file name="primary_text_dark" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-<merger version="3" xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\res"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\res"><file name="primary_text_dark" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -15,27 +7,11 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    </string-array></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
-=======
     </string-array></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
          <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
         
         <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
     </plurals></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-    </string-array></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\dimens.xml" qualifiers=""><dimen name="text_font_size_super">33sp</dimen><dimen name="text_font_size_large">26sp</dimen><dimen name="text_font_size_medium">20sp</dimen><dimen name="text_font_size_normal">17sp</dimen><dimen name="text_font_size_small">14sp</dimen></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">Notes</string><string name="app_widget2x2">Notes 2x2</string><string name="app_widget4x4">Notes 4x4</string><string name="widget_havenot_content">No associated note found, click to create associated note.</string><string name="widget_under_visit_mode">Privacy mode，can not see note content</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">Add note</string><string name="delete_remind_time_message">Delete reminder successfully</string><string name="set_remind_time_message">Set reminder</string><string name="note_alert_expired">Expired</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MMMd kk:mm</string><string name="notealert_ok">Got it</string><string name="notealert_enter">Take a look</string><string name="note_link_tel">Call</string><string name="note_link_email">Send email</string><string name="note_link_web">Browse web</string><string name="note_link_other">Open map</string><string name="file_path">/MIUI/notes/</string><string name="file_name_txt_format">notes_%s.txt</string><string name="format_folder_files_count">(%d)</string><string name="menu_create_folder">New Folder</string><string name="menu_export_text">Export text</string><string name="menu_sync">Sync</string><string name="menu_sync_cancel">Cancel syncing</string><string name="menu_setting">Settings</string><string name="menu_search">Search</string><string name="menu_delete">Delete</string><string name="menu_move">Move to folder</string><string name="menu_select_title">%d selected</string><string name="menu_select_none">Nothing selected, the operation is invalid</string><string name="menu_select_all">Select all</string><string name="menu_deselect_all">Deselect all</string><string name="menu_font_size">Font size</string><string name="menu_font_small">Small</string><string name="menu_font_normal">Medium</string><string name="menu_font_large">Large</string><string name="menu_font_super">Super</string><string name="menu_list_mode">Enter check list</string><string name="menu_normal_mode">Leave check list</string><string name="menu_folder_view">View folder</string><string name="menu_folder_delete">Delete folder</string><string name="menu_folder_change_name">Change folder name</string><string name="folder_exist">The folder %1$s exist, please rename</string><string name="menu_share">Share</string><string name="menu_send_to_desktop">Send to home</string><string name="menu_alert">Remind me</string><string name="menu_remove_remind">Delete reminder</string><string name="menu_title_select_folder">Select folder</string><string name="menu_move_parent_folder">Parent folder</string><string name="info_note_enter_desktop">Note added to home</string><string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string><string name="alert_title_delete">Delete selected notes</string><string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string><string name="alert_message_delete_note">Confirm to delete this note?</string><string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string><string name="error_sdcard_unmounted">SD card busy, not available now</string><string name="error_sdcard_export">Export failed, please check SD card</string><string name="error_note_not_exist">The note is not exist</string><string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string><string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string><string name="success_sdcard_export">Export successful</string><string name="failed_sdcard_export">Export fail</string><string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string><string name="ticker_syncing">Syncing notes...</string><string name="ticker_success">Sync is successful</string><string name="ticker_fail">Sync is failed</string><string name="ticker_cancel">Sync is canceled</string><string name="success_sync_account">Sync is successful with account %1$s</string><string name="error_sync_network">Sync failed, please check network and account settings</string><string name="error_sync_internal">Sync failed, internal error occurs</string><string name="error_sync_cancelled">Sync is canceled</string><string name="sync_progress_login">Logging into %1$s...</string><string name="sync_progress_init_list">Getting remote note list...</string><string name="sync_progress_syncing">Synchronize local notes with Google Task...</string><string name="preferences_title">Settings</string><string name="preferences_account_title">Sync account</string><string name="preferences_account_summary">Sync notes with google task</string><string name="preferences_last_sync_time">Last sync time %1$s</string><string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string><string name="preferences_add_account">Add account</string><string name="preferences_menu_change_account">Change sync account</string><string name="preferences_menu_remove_account">Remove sync account</string><string name="preferences_menu_cancel">Cancel</string><string name="preferences_button_sync_immediately">Sync immediately</string><string name="preferences_button_sync_cancel">Cancel syncing</string><string name="preferences_dialog_change_account_title">Current account %1$s</string><string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string><string name="preferences_dialog_select_account_title">Sync notes</string><string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string><string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string><string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string><string name="preferences_bg_random_appear_title">New note background color random</string><string name="button_delete">Delete</string><string name="call_record_folder_name">Call notes</string><string name="hint_foler_name">Input name</string><string name="search_label">Searching Notes</string><string name="search_hint">Search notes</string><string name="search_setting_description">Text in your notes</string><string name="search">Notes</string><string name="datetime_dialog_ok">set</string><string name="datetime_dialog_cancel">cancel</string><plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values\styles.xml" qualifiers=""><style name="TextAppearanceSuper">
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
         <item name="android:textSize">@dimen/text_font_size_super</item>
         <item name="android:textColorLink">#0000ff</item>
     </style><style name="TextAppearanceLarge">
@@ -67,33 +43,6 @@
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
         <item name="android:displayOptions"/>
         <item name="android:visibility">gone</item>
-<<<<<<< HEAD
-<<<<<<< HEAD
-    </style></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array></file><file path="E:\code\Android\mi-note\src\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals></file><file name="preferences" path="E:\code\Android\mi-note\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="E:\code\Android\mi-note\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="E:\code\Android\mi-note\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="E:\code\Android\mi-note\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="E:\code\Android\mi-note\src\app\build\generated\res\rs\debug"/><source path="E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
-=======
-    </style></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rCN\strings.xml" qualifiers="zh-rCN"><string name="app_name">便签</string><string name="app_widget2x2">便签2x2</string><string name="app_widget4x4">便签4x4</string><string name="widget_havenot_content">没有关联内容，点击新建便签。</string><string name="widget_under_visit_mode">访客模式下，便签内容不可见</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便签</string><string name="delete_remind_time_message">成功删除提醒</string><string name="set_remind_time_message">创建提醒</string><string name="note_alert_expired">已过期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫电话</string><string name="note_link_email">发送邮件</string><string name="note_link_web">浏览网页</string><string name="note_link_other">打开地图</string><string name="menu_create_folder">新建文件夹</string><string name="menu_export_text">导出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">设置</string><string name="menu_search">搜索</string><string name="menu_delete">删除</string><string name="menu_move">移动到文件夹</string><string name="menu_select_title">选中了 %d 项</string><string name="menu_select_none">没有选中项，操作无效</string><string name="menu_select_all">全选</string><string name="menu_deselect_all">取消全选</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">进入清单模式</string><string name="menu_normal_mode">退出清单模式</string><string name="menu_folder_view">查看文件夹</string><string name="menu_folder_delete">刪除文件夹</string><string name="menu_folder_change_name">修改文件夹名称</string><string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">发送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">删除提醒</string><string name="menu_title_select_folder">选择文件夹</string><string name="menu_move_parent_folder">上一级文件夹</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">删除</string><string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string><string name="alert_message_delete_note">确认要删除该条便签吗?</string><string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string><string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string><string name="error_sdcard_unmounted">SD卡被占用，不能操作</string><string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string><string name="error_note_not_exist">要查看的便签不存在</string><string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string><string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string><string name="success_sdcard_export">导出成功</string><string name="failed_sdcard_export">导出失败</string><string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string><string name="ticker_syncing">同步便签...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失败</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">与%1$s同步成功</string><string name="error_sync_network">同步失败，请检查网络和帐号设置</string><string name="error_sync_internal">同步失败，发生内部错误</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登录%1$s...</string><string name="sync_progress_init_list">正在获取服务器便签列表...</string><string name="sync_progress_syncing">正在同步本地便签...</string><string name="preferences_title">设置</string><string name="preferences_account_title">同步账号</string><string name="preferences_account_summary">与google task同步便签记录</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加账号</string><string name="preferences_menu_change_account">更换账号</string><string name="preferences_menu_remove_account">删除账号</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">当前帐号 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string><string name="preferences_dialog_select_account_title">同步便签</string><string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string><string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string><string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string><string name="button_delete">删除</string><string name="call_record_folder_name">通话便签</string><string name="hint_foler_name">请输入名称</string><string name="search_label">正在搜索便签</string><string name="search_hint">搜索便签</string><string name="search_setting_description">便签中的文字</string><string name="search">便签</string><string name="datetime_dialog_ok">设置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
-    </plurals></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
-        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals></file><file name="preferences" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
     </style></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rCN\arrays.xml" qualifiers="zh-rCN"><string-array name="menu_share_ways">
         <item>短信</item>
         <item>邮件</item>
@@ -104,5 +53,4 @@
         <item>郵件</item>
     </string-array></file><file path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\values-zh-rTW\strings.xml" qualifiers="zh-rTW"><string name="app_name">便簽</string><string name="app_widget2x2">便簽2x2</string><string name="app_widget4x4">便簽4x4</string><string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string><string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string><string name="notelist_string_info">...</string><string name="notelist_menu_new">新建便簽</string><string name="delete_remind_time_message">成功刪除提醒</string><string name="set_remind_time_message">創建提醒</string><string name="note_alert_expired">已過期</string><string name="format_date_ymd">yyyyMMdd</string><string name="format_datetime_mdhm">MM月dd日 kk:mm</string><string name="notealert_ok">知道了</string><string name="notealert_enter">查看</string><string name="note_link_tel">呼叫電話</string><string name="note_link_email">發送郵件</string><string name="note_link_web">浏覽網頁</string><string name="note_link_other">打開地圖</string><string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string><string name="menu_create_folder">新建文件夾</string><string name="menu_export_text">導出文本</string><string name="menu_sync">同步</string><string name="menu_sync_cancel">取消同步</string><string name="menu_setting">設置</string><string name="menu_search">搜尋</string><string name="menu_delete">刪除</string><string name="menu_move">移動到文件夾</string><string name="menu_select_title">選中了 %d 項</string><string name="menu_select_none">沒有選中項，操作無效</string><string name="menu_select_all">全選</string><string name="menu_deselect_all">取消全選</string><string name="menu_font_size">文字大小</string><string name="menu_font_small">小</string><string name="menu_font_normal">正常</string><string name="menu_font_large">大</string><string name="menu_font_super">超大</string><string name="menu_list_mode">進入清單模式</string><string name="menu_normal_mode">退出清單模式</string><string name="menu_folder_view">查看文件夾</string><string name="menu_folder_delete">刪除文件夾</string><string name="menu_folder_change_name">修改文件夾名稱</string><string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string><string name="menu_share">分享</string><string name="menu_send_to_desktop">發送到桌面</string><string name="menu_alert">提醒我</string><string name="menu_remove_remind">刪除提醒</string><string name="menu_title_select_folder">選擇文件夾</string><string name="menu_move_parent_folder">上一級文件夾</string><string name="info_note_enter_desktop">已添加到桌面</string><string name="alert_title_delete">刪除</string><string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string><string name="alert_message_delete_note">确认要删除該條便籤嗎?</string><string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string><string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string><string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string><string name="error_note_not_exist">要查看的便籤不存在</string><string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string><string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string><string name="success_sdcard_export">導出成功</string><string name="failed_sdcard_export">導出失敗</string><string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string><string name="ticker_syncing">同步便簽...</string><string name="ticker_success">同步成功</string><string name="ticker_fail">同步失敗</string><string name="ticker_cancel">同步已取消</string><string name="success_sync_account">與%1$s同步成功</string><string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string><string name="error_sync_internal">同步失敗，發生內部錯誤</string><string name="error_sync_cancelled">同步已取消</string><string name="sync_progress_login">登陸%1$s...</string><string name="sync_progress_init_list">正在獲取服務器便籤列表...</string><string name="sync_progress_syncing">正在同步本地便籤...</string><string name="preferences_title">設置</string><string name="preferences_account_title">同步賬號</string><string name="preferences_account_summary">与google task同步便簽記錄</string><string name="preferences_last_sync_time">上次同步于 %1$s</string><string name="preferences_add_account">添加賬號</string><string name="preferences_menu_change_account">更換賬號</string><string name="preferences_menu_remove_account">刪除賬號</string><string name="preferences_menu_cancel">取消</string><string name="preferences_button_sync_immediately">立即同步</string><string name="preferences_button_sync_cancel">取消同步</string><string name="preferences_dialog_change_account_title">當前帳號 %1$s</string><string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string><string name="preferences_dialog_select_account_title">同步便簽</string><string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string><string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string><string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string><string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string><string name="button_delete">刪除</string><string name="call_record_folder_name">通話便籤</string><string name="hint_foler_name">請輸入名稱</string><string name="search_label">正在搜索便籤</string><string name="search_hint">搜索便籤</string><string name="search_setting_description">便籤中的文字</string><string name="search">便籤</string><string name="datetime_dialog_ok">設置</string><string name="datetime_dialog_cancel">取消</string><plurals name="search_results_title">
         <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
-    </plurals></file><file name="preferences" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+    </plurals></file><file name="preferences" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\preferences.xml" qualifiers="" type="xml"/><file name="searchable" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\searchable.xml" qualifiers="" type="xml"/><file name="widget_2x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_2x_info.xml" qualifiers="" type="xml"/><file name="widget_4x_info" path="D:\Code\Repository\Android\Notes2\src\app\src\main\res\xml\widget_4x_info.xml" qualifiers="" type="xml"/></source><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
new file mode 100644
index 0000000..386dd55
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -0,0 +1 @@
+#Sun Oct 29 15:51:33 CST 2023
diff --git a/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..698903f
--- /dev/null
+++ b/src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\androidTest\res"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\androidTest\res"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\androidTest\debug"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index e3848ef..54cd298 100644
--- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\assets"/><source path="E:\code\Android\mi-note\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\debug\assets"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\assets"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\assets"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\assets"/><source path="D:\Code\Repository\Android\Notes2\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 1f19c3a..01d6a2a 100644
--- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\debug\jniLibs"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\jniLibs"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\jniLibs"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index f6e6f24..c6118da 100644
--- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,10 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\code\Android\mi-note\src\app\src\debug\shaders"/></dataSet></merger>
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\shaders"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\shaders"/></dataSet></merger>
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Code\Repository\Android\Notes2\src\app\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 2bf927a..9115a16 100644
--- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,14 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Thu Sep 14 18:02:40 CST 2023
-base.0=E\:\\code\\Android\\mi-note\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-=======
-#Sun Sep 17 16:46:56 CST 2023
+#Sun Oct 29 15:17:31 CST 2023
 base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-#Sun Sep 17 16:46:56 CST 2023
-base.0=D\:\\Code\\Repository\\Android\\Notes2\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
 renamed.0=classes.dex
 path.0=classes.dex
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 7a72c5d..580aca0 100644
Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
index 5e55930..71e3dab 100644
Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class
index fc1d9a2..38ff8c9 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 79598f6..2b1d0b1 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
index c3ee8d8..1db6c46 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
index 4812c99..0aa6669 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
index 0754ffc..9ebe061 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
index dc60fe0..7ae8c83 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index ff95cab..fecb501 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 75a9a17..c9eaebc 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 81d6513..ffce8e9 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index 66c9e6f..27317ad 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 86cabc1..d11f5bf 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 4064ac0..92a3d52 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index 19383ea..7ac402d 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 29d4cf9..506a0e5 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index ad7cce4..024f278 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index 6e0f050..1de3fa1 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 93cd34b..63a2a9f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 6019ab9..e087897 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 2c9c086..4b2d550 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index 3c717dd..204a0a0 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 4d67cc2..bbb0303 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index e4bb0ec..f7d5ea4 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 32e1554..43090a8 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 2806728..583d22f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index df0b0f2..5afa794 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 4d603dc..31b8227 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 2dafd06..04bd75e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index 4af37e9..dc3e2d0 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 28e9059..92dc30a 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 1539e13..f615588 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 3cd4c7a..7409a83 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index f786267..5f76dfc 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 9e7f8c3..0ce94a4 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 7598ed0..0a9dee2 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 573ba34..eb2280f 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index a1c7178..1133cb0 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index c01fcae..ffc4505 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index d7027b9..90c206e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index eb4eff7..7ff90f9 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index 245633b..9b5b504 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index bcc1f6d..85b6fda 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 5053337..8ba5f19 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index f6e1ed8..86d6d09 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class b/src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class
new file mode 100644
index 0000000..6e280eb
Binary files /dev/null and b/src/app/build/intermediates/javac/debugAndroidTest/classes/net/micode/notes/test/BuildConfig.class differ
diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 994b310..1be60a3 100644
--- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,547 +20,6 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-<<<<<<< HEAD
-<<<<<<< HEAD
-22-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-23        android:minSdkVersion="14"
-23-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:15-41
-24        android:targetSdkVersion="33" />
-24-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:5-81
-26-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:5-88
-27-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:5-67
-28-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:5-72
-29-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:5-74
-30-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:5-80
-31-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:5-71
-32-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:5-74
-33-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:5-81
-34-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:22-78
-35
-36    <application
-36-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:36:5-159:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:37:9-42
-39        android:label="@string/app_name"
-39-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:38:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:39:9-53:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:41:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:42:13-74
-44            android:exported="true"
-44-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:40:13-36
-45            android:label="@string/app_name"
-45-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:43:13-45
-46            android:launchMode="singleTop"
-46-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:44:13-43
-47            android:theme="@style/NoteTheme"
-47-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:45:13-45
-48            android:uiOptions="splitActionBarWhenNarrow"
-48-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:46:13-57
-49            android:windowSoftInputMode="adjustPan" >
-49-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:47:13-52
-50            <intent-filter>
-50-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:49:13-52:29
-51                <action android:name="android.intent.action.MAIN" />
-51-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:17-69
-51-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:25-66
-52
-53                <category android:name="android.intent.category.LAUNCHER" />
-53-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:17-77
-53-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:27-74
-54            </intent-filter>
-55        </activity>
-56        <activity
-56-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:55:9-85:20
-57            android:name="net.micode.notes.ui.NoteEditActivity"
-57-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:57:13-48
-58            android:configChanges="keyboardHidden|orientation|screenSize"
-58-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:58:13-74
-59            android:exported="true"
-59-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:56:13-36
-60            android:launchMode="singleTop"
-60-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:59:13-43
-61            android:theme="@style/NoteTheme" >
-61-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:60:13-45
-62            <intent-filter android:scheme="http" >
-62-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:13-68:29
-62-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:28-49
-63                <action android:name="android.intent.action.VIEW" />
-63-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:17-69
-63-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:25-66
-64
-65                <category android:name="android.intent.category.DEFAULT" />
-65-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76
-65-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73
-66
-67                <data android:mimeType="vnd.android.cursor.item/text_note" />
-67-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78
-67-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75
-68                <data android:mimeType="vnd.android.cursor.item/call_note" />
-68-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78
-68-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75
-69            </intent-filter>
-70            <intent-filter>
-70-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:70:13-75:29
-71                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-71-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:17-79
-71-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:25-76
-72
-73                <category android:name="android.intent.category.DEFAULT" />
-73-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76
-73-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73
-74
-75                <data android:mimeType="vnd.android.cursor.item/text_note" />
-75-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78
-75-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75
-76                <data android:mimeType="vnd.android.cursor.item/call_note" />
-76-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78
-76-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75
-77            </intent-filter>
-78            <intent-filter>
-78-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:77:13-80:29
-79                <action android:name="android.intent.action.SEARCH" />
-79-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:17-71
-79-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:25-68
-80
-81                <category android:name="android.intent.category.DEFAULT" />
-81-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76
-81-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73
-82            </intent-filter>
-83
-84            <meta-data
-84-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:82:13-84:54
-85                android:name="android.app.searchable"
-85-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:83:17-54
-86                android:resource="@xml/searchable" />
-86-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:84:17-51
-87        </activity>
-88
-89        <provider
-89-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:87:9-91:43
-90            android:name="net.micode.notes.data.NotesProvider"
-90-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:89:13-63
-91            android:authorities="micode_notes"
-91-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:90:13-47
-92            android:exported="false"
-92-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:88:13-37
-93            android:multiprocess="true" />
-93-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:91:13-40
-94
-95        <receiver
-95-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:93:9-106:20
-96            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-96-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:95:13-57
-97            android:exported="false"
-97-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:94:13-37
-98            android:label="@string/app_widget2x2" >
-98-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:96:13-50
-99            <intent-filter>
-99-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29
-100                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-100-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84
-100-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81
-101                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-101-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85
-101-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82
-102                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-102-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85
-102-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82
-103            </intent-filter>
-104
-105            <meta-data
-105-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58
-106                android:name="android.appwidget.provider"
-106-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58
-107                android:resource="@xml/widget_2x_info" />
-107-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55
-108        </receiver>
-109        <receiver
-109-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:107:9-121:20
-110            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-110-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:109:13-57
-111            android:exported="true"
-111-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:108:13-36
-112            android:label="@string/app_widget4x4" >
-112-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:110:13-50
-113            <intent-filter>
-113-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29
-114                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-114-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84
-114-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81
-115                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-115-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85
-115-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82
-116                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-116-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85
-116-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82
-117            </intent-filter>
-118
-119            <meta-data
-119-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58
-120                android:name="android.appwidget.provider"
-120-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58
-121                android:resource="@xml/widget_4x_info" />
-121-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55
-122        </receiver>
-123        <receiver
-123-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:9-127:20
-124            android:name="net.micode.notes.ui.AlarmInitReceiver"
-124-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:19-55
-125            android:exported="false" >
-125-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:56-80
-126            <intent-filter>
-126-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:124:13-126:29
-127                <action android:name="android.intent.action.BOOT_COMPLETED" />
-127-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:17-79
-127-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:25-76
-128            </intent-filter>
-129        </receiver>
-130        <receiver
-130-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:129:9-133:20
-131            android:name="net.micode.notes.ui.AlarmReceiver"
-131-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:131:13-61
-132            android:exported="false"
-132-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:130:13-37
-133            android:process=":remote" >
-133-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:132:13-38
-134        </receiver>
-135
-136        <activity
-136-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:135:9-141:20
-137            android:name="net.micode.notes.ui.AlarmAlertActivity"
-137-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:137:13-50
-138            android:exported="false"
-138-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:136:13-37
-139            android:label="@string/app_name"
-139-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:138:13-45
-140            android:launchMode="singleInstance"
-140-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:139:13-48
-141            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-141-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:140:13-75
-142        </activity>
-143        <activity
-143-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:143:9-149:20
-144            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-144-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:145:13-71
-145            android:exported="false"
-145-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:144:13-37
-146            android:label="@string/preferences_title"
-146-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:146:13-54
-147            android:launchMode="singleTop"
-147-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:147:13-43
-148            android:theme="@android:style/Theme.Holo.Light" >
-148-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:148:13-60
-149        </activity>
-150
-151        <service
-151-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:151:9-154:19
-152            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-152-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:152:13-74
-153            android:exported="false" >
-153-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:153:13-37
-154        </service>
-155
-156        <meta-data
-156-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:156:9-158:52
-157            android:name="android.app.default_searchable"
-157-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58
-158            android:value=".ui.NoteEditActivity" />
-158-->E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49
-=======
-22-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-23        android:minSdkVersion="14"
-23-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41
-24        android:targetSdkVersion="33" />
-24-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-25
-26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:5-81
-26-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:22-78
-27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:5-88
-27-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:22-85
-28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:5-67
-28-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:22-64
-29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:5-72
-29-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:22-69
-30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:5-74
-30-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:22-71
-31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:5-80
-31-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:22-77
-32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:5-71
-32-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:22-68
-33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:5-74
-33-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:22-71
-34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:5-81
-34-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:22-78
-35
-36    <application
-36-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:36:5-159:19
-37        android:debuggable="true"
-38        android:icon="@drawable/icon_app"
-38-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42
-39        android:label="@string/app_name"
-39-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74
-44            android:exported="true"
-44-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36
-45            android:label="@string/app_name"
-45-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45
-46            android:launchMode="singleTop"
-46-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43
-47            android:theme="@style/NoteTheme"
-47-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45
-48            android:uiOptions="splitActionBarWhenNarrow"
-48-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57
-49            android:windowSoftInputMode="adjustPan" >
-49-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52
-50            <intent-filter>
-50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29
-51                <action android:name="android.intent.action.MAIN" />
-51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69
-51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66
-52
-53                <category android:name="android.intent.category.LAUNCHER" />
-53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77
-53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74
-54            </intent-filter>
-55        </activity>
-56        <activity
-56-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20
-57            android:name="net.micode.notes.ui.NoteEditActivity"
-57-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48
-58            android:configChanges="keyboardHidden|orientation|screenSize"
-58-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74
-59            android:exported="true"
-59-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36
-60            android:launchMode="singleTop"
-60-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43
-61            android:theme="@style/NoteTheme" >
-61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45
-62            <intent-filter android:scheme="http" >
-62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29
-62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49
-63                <action android:name="android.intent.action.VIEW" />
-63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69
-63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66
-64
-65                <category android:name="android.intent.category.DEFAULT" />
-65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-66
-67                <data android:mimeType="vnd.android.cursor.item/text_note" />
-67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-68                <data android:mimeType="vnd.android.cursor.item/call_note" />
-68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-69            </intent-filter>
-70            <intent-filter>
-70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29
-71                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79
-71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76
-72
-73                <category android:name="android.intent.category.DEFAULT" />
-73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-74
-75                <data android:mimeType="vnd.android.cursor.item/text_note" />
-75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-76                <data android:mimeType="vnd.android.cursor.item/call_note" />
-76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-77            </intent-filter>
-78            <intent-filter>
-78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29
-79                <action android:name="android.intent.action.SEARCH" />
-79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71
-79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68
-80
-81                <category android:name="android.intent.category.DEFAULT" />
-81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-82            </intent-filter>
-83
-84            <meta-data
-84-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54
-85                android:name="android.app.searchable"
-85-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54
-86                android:resource="@xml/searchable" />
-86-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51
-87        </activity>
-88
-89        <provider
-89-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43
-90            android:name="net.micode.notes.data.NotesProvider"
-90-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63
-91            android:authorities="micode_notes"
-91-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47
-92            android:exported="false"
-92-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37
-93            android:multiprocess="true" />
-93-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40
-94
-95        <receiver
-95-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20
-96            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-96-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57
-97            android:exported="false"
-97-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37
-98            android:label="@string/app_widget2x2" >
-98-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50
-99            <intent-filter>
-99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
-100                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
-100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
-101                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
-101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
-102                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
-102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
-103            </intent-filter>
-104
-105            <meta-data
-105-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
-106                android:name="android.appwidget.provider"
-106-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
-107                android:resource="@xml/widget_2x_info" />
-107-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
-108        </receiver>
-109        <receiver
-109-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20
-110            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-110-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57
-111            android:exported="true"
-111-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36
-112            android:label="@string/app_widget4x4" >
-112-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50
-113            <intent-filter>
-113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
-114                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
-114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
-115                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
-115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
-116                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
-116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
-117            </intent-filter>
-118
-119            <meta-data
-119-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
-120                android:name="android.appwidget.provider"
-120-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
-121                android:resource="@xml/widget_4x_info" />
-121-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
-122        </receiver>
-123        <receiver
-123-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20
-124            android:name="net.micode.notes.ui.AlarmInitReceiver"
-124-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55
-125            android:exported="false" >
-125-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80
-126            <intent-filter>
-126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29
-127                <action android:name="android.intent.action.BOOT_COMPLETED" />
-127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79
-127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76
-128            </intent-filter>
-129        </receiver>
-130        <receiver
-130-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20
-131            android:name="net.micode.notes.ui.AlarmReceiver"
-131-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61
-132            android:exported="false"
-132-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37
-133            android:process=":remote" >
-133-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38
-134        </receiver>
-135
-136        <activity
-136-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20
-137            android:name="net.micode.notes.ui.AlarmAlertActivity"
-137-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50
-138            android:exported="false"
-138-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37
-139            android:label="@string/app_name"
-139-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45
-140            android:launchMode="singleInstance"
-140-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48
-141            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-141-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75
-142        </activity>
-143        <activity
-143-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20
-144            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-144-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71
-145            android:exported="false"
-145-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37
-146            android:label="@string/preferences_title"
-146-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54
-147            android:launchMode="singleTop"
-147-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43
-148            android:theme="@android:style/Theme.Holo.Light" >
-148-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60
-149        </activity>
-150
-151        <service
-151-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19
-152            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-152-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74
-153            android:exported="false" >
-153-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37
-154        </service>
-155
-156        <meta-data
-156-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52
-157            android:name="android.app.default_searchable"
-157-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
-158            android:value=".ui.NoteEditActivity" />
-158-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
 22-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
 23        android:minSdkVersion="14"
 23-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41
@@ -600,236 +59,234 @@
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
 38-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42
-39        android:label="@string/app_name"
+39        android:label="@string/app_name" >
 39-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41
-40        android:testOnly="true" >
-41        <activity
-41-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20
-42            android:name="net.micode.notes.ui.NotesListActivity"
-42-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49
-43            android:configChanges="keyboardHidden|orientation|screenSize"
-43-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74
-44            android:exported="true"
-44-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36
-45            android:label="@string/app_name"
-45-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45
-46            android:launchMode="singleTop"
-46-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43
-47            android:theme="@style/NoteTheme"
-47-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45
-48            android:uiOptions="splitActionBarWhenNarrow"
-48-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57
-49            android:windowSoftInputMode="adjustPan" >
-49-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52
-50            <intent-filter>
-50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29
-51                <action android:name="android.intent.action.MAIN" />
-51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69
-51-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66
-52
-53                <category android:name="android.intent.category.LAUNCHER" />
-53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77
-53-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74
-54            </intent-filter>
-55        </activity>
-56        <activity
-56-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20
-57            android:name="net.micode.notes.ui.NoteEditActivity"
-57-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48
-58            android:configChanges="keyboardHidden|orientation|screenSize"
-58-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74
-59            android:exported="true"
-59-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36
-60            android:launchMode="singleTop"
-60-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43
-61            android:theme="@style/NoteTheme" >
-61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45
-62            <intent-filter android:scheme="http" >
-62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29
-62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49
-63                <action android:name="android.intent.action.VIEW" />
-63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69
-63-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66
-64
-65                <category android:name="android.intent.category.DEFAULT" />
-65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-65-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-66
-67                <data android:mimeType="vnd.android.cursor.item/text_note" />
+40        <activity
+40-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20
+41            android:name="net.micode.notes.ui.NotesListActivity"
+41-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49
+42            android:configChanges="keyboardHidden|orientation|screenSize"
+42-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74
+43            android:exported="true"
+43-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36
+44            android:label="@string/app_name"
+44-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45
+45            android:launchMode="singleTop"
+45-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43
+46            android:theme="@style/NoteTheme"
+46-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45
+47            android:uiOptions="splitActionBarWhenNarrow"
+47-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57
+48            android:windowSoftInputMode="adjustPan" >
+48-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52
+49            <intent-filter>
+49-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29
+50                <action android:name="android.intent.action.MAIN" />
+50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69
+50-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66
+51
+52                <category android:name="android.intent.category.LAUNCHER" />
+52-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77
+52-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74
+53            </intent-filter>
+54        </activity>
+55        <activity
+55-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20
+56            android:name="net.micode.notes.ui.NoteEditActivity"
+56-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48
+57            android:configChanges="keyboardHidden|orientation|screenSize"
+57-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74
+58            android:exported="true"
+58-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36
+59            android:launchMode="singleTop"
+59-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43
+60            android:theme="@style/NoteTheme" >
+60-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45
+61            <intent-filter android:scheme="http" >
+61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29
+61-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49
+62                <action android:name="android.intent.action.VIEW" />
+62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69
+62-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66
+63
+64                <category android:name="android.intent.category.DEFAULT" />
+64-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
+64-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
+65
+66                <data android:mimeType="vnd.android.cursor.item/text_note" />
+66-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
+66-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
+67                <data android:mimeType="vnd.android.cursor.item/call_note" />
 67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
 67-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-68                <data android:mimeType="vnd.android.cursor.item/call_note" />
-68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-68-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-69            </intent-filter>
-70            <intent-filter>
-70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29
-71                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79
-71-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76
-72
-73                <category android:name="android.intent.category.DEFAULT" />
-73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-73-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-74
-75                <data android:mimeType="vnd.android.cursor.item/text_note" />
+68            </intent-filter>
+69            <intent-filter>
+69-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29
+70                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79
+70-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76
+71
+72                <category android:name="android.intent.category.DEFAULT" />
+72-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
+72-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
+73
+74                <data android:mimeType="vnd.android.cursor.item/text_note" />
+74-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
+74-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
+75                <data android:mimeType="vnd.android.cursor.item/call_note" />
 75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
 75-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-76                <data android:mimeType="vnd.android.cursor.item/call_note" />
-76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-76-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-77            </intent-filter>
-78            <intent-filter>
-78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29
-79                <action android:name="android.intent.action.SEARCH" />
-79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71
-79-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68
-80
-81                <category android:name="android.intent.category.DEFAULT" />
-81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-81-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-82            </intent-filter>
-83
-84            <meta-data
-84-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54
-85                android:name="android.app.searchable"
-85-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54
-86                android:resource="@xml/searchable" />
-86-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51
-87        </activity>
-88
-89        <provider
-89-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43
-90            android:name="net.micode.notes.data.NotesProvider"
-90-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63
-91            android:authorities="micode_notes"
-91-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47
-92            android:exported="false"
-92-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37
-93            android:multiprocess="true" />
-93-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40
-94
-95        <receiver
-95-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20
-96            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-96-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57
-97            android:exported="false"
-97-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37
-98            android:label="@string/app_widget2x2" >
-98-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50
-99            <intent-filter>
-99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
-100                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
-100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
-101                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
-101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
-102                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
-102-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
-103            </intent-filter>
-104
-105            <meta-data
-105-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
-106                android:name="android.appwidget.provider"
-106-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
-107                android:resource="@xml/widget_2x_info" />
-107-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
-108        </receiver>
-109        <receiver
-109-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20
-110            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-110-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57
-111            android:exported="true"
-111-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36
-112            android:label="@string/app_widget4x4" >
-112-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50
-113            <intent-filter>
-113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
-114                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
-114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
-115                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
-115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
-116                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
-116-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
-117            </intent-filter>
-118
-119            <meta-data
-119-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
-120                android:name="android.appwidget.provider"
-120-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
-121                android:resource="@xml/widget_4x_info" />
-121-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
-122        </receiver>
-123        <receiver
-123-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20
-124            android:name="net.micode.notes.ui.AlarmInitReceiver"
-124-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55
-125            android:exported="false" >
-125-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80
-126            <intent-filter>
-126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29
-127                <action android:name="android.intent.action.BOOT_COMPLETED" />
-127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79
-127-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76
-128            </intent-filter>
-129        </receiver>
-130        <receiver
-130-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20
-131            android:name="net.micode.notes.ui.AlarmReceiver"
-131-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61
-132            android:exported="false"
-132-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37
-133            android:process=":remote" >
-133-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38
-134        </receiver>
-135
-136        <activity
-136-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20
-137            android:name="net.micode.notes.ui.AlarmAlertActivity"
-137-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50
-138            android:exported="false"
-138-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37
-139            android:label="@string/app_name"
-139-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45
-140            android:launchMode="singleInstance"
-140-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48
-141            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-141-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75
-142        </activity>
-143        <activity
-143-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20
-144            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-144-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71
-145            android:exported="false"
-145-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37
-146            android:label="@string/preferences_title"
-146-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54
-147            android:launchMode="singleTop"
-147-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43
-148            android:theme="@android:style/Theme.Holo.Light" >
-148-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60
-149        </activity>
-150
-151        <service
-151-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19
-152            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-152-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74
-153            android:exported="false" >
-153-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37
-154        </service>
-155
-156        <meta-data
-156-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52
-157            android:name="android.app.default_searchable"
-157-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
-158            android:value=".ui.NoteEditActivity" />
-158-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-159    </application>
-160
-161</manifest>
+76            </intent-filter>
+77            <intent-filter>
+77-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29
+78                <action android:name="android.intent.action.SEARCH" />
+78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71
+78-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68
+79
+80                <category android:name="android.intent.category.DEFAULT" />
+80-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
+80-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
+81            </intent-filter>
+82
+83            <meta-data
+83-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54
+84                android:name="android.app.searchable"
+84-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54
+85                android:resource="@xml/searchable" />
+85-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51
+86        </activity>
+87
+88        <provider
+88-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43
+89            android:name="net.micode.notes.data.NotesProvider"
+89-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63
+90            android:authorities="micode_notes"
+90-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47
+91            android:exported="false"
+91-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37
+92            android:multiprocess="true" />
+92-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40
+93
+94        <receiver
+94-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20
+95            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+95-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57
+96            android:exported="false"
+96-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37
+97            android:label="@string/app_widget2x2" >
+97-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50
+98            <intent-filter>
+98-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
+99                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
+99-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
+100                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
+100-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
+101                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
+101-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
+102            </intent-filter>
+103
+104            <meta-data
+104-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
+105                android:name="android.appwidget.provider"
+105-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
+106                android:resource="@xml/widget_2x_info" />
+106-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
+107        </receiver>
+108        <receiver
+108-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20
+109            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+109-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57
+110            android:exported="true"
+110-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36
+111            android:label="@string/app_widget4x4" >
+111-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50
+112            <intent-filter>
+112-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
+113                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
+113-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
+114                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
+114-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
+115                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
+115-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
+116            </intent-filter>
+117
+118            <meta-data
+118-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
+119                android:name="android.appwidget.provider"
+119-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
+120                android:resource="@xml/widget_4x_info" />
+120-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
+121        </receiver>
+122        <receiver
+122-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20
+123            android:name="net.micode.notes.ui.AlarmInitReceiver"
+123-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55
+124            android:exported="false" >
+124-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80
+125            <intent-filter>
+125-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29
+126                <action android:name="android.intent.action.BOOT_COMPLETED" />
+126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79
+126-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76
+127            </intent-filter>
+128        </receiver>
+129        <receiver
+129-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20
+130            android:name="net.micode.notes.ui.AlarmReceiver"
+130-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61
+131            android:exported="false"
+131-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37
+132            android:process=":remote" >
+132-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38
+133        </receiver>
+134
+135        <activity
+135-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20
+136            android:name="net.micode.notes.ui.AlarmAlertActivity"
+136-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50
+137            android:exported="false"
+137-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37
+138            android:label="@string/app_name"
+138-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45
+139            android:launchMode="singleInstance"
+139-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48
+140            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+140-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75
+141        </activity>
+142        <activity
+142-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20
+143            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+143-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71
+144            android:exported="false"
+144-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37
+145            android:label="@string/preferences_title"
+145-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54
+146            android:launchMode="singleTop"
+146-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43
+147            android:theme="@android:style/Theme.Holo.Light" >
+147-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60
+148        </activity>
+149
+150        <service
+150-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19
+151            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+151-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74
+152            android:exported="false" >
+152-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37
+153        </service>
+154
+155        <meta-data
+155-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52
+156            android:name="android.app.default_searchable"
+156-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
+157            android:value=".ui.NoteEditActivity" />
+157-->D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
+158    </application>
+159
+160</manifest>
diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
new file mode 100644
index 0000000..72d7858
--- /dev/null
+++ b/src/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -0,0 +1,32 @@
+1<?xml version="1.0" encoding="utf-8"?>
+2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+3    package="net.micode.notes.test" >
+4
+5    <uses-sdk
+5-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:5:5-74
+6        android:minSdkVersion="14"
+6-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:5:15-41
+7        android:targetSdkVersion="33" />
+7-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:5:42-71
+8
+9    <instrumentation
+9-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:11:5-15:66
+10        android:name="android.test.InstrumentationTestRunner"
+10-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:11:22-75
+11        android:functionalTest="false"
+11-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:14:22-52
+12        android:handleProfiling="false"
+12-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:13:22-53
+13        android:label="Tests for net.micode.notes"
+13-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:15:22-64
+14        android:targetPackage="net.micode.notes" />
+14-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:12:22-62
+15
+16    <application android:debuggable="true" >
+16-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:7:5-9:19
+17        <uses-library android:name="android.test.runner" />
+17-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:8:9-60
+17-->D:\Code\Repository\Android\Notes2\src\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16925158102512687504.xml:8:23-57
+18    </application>
+19
+20</manifest>
diff --git a/src/app/build/intermediates/merged_java_res/debug/base.jar b/src/app/build/intermediates/merged_java_res/debug/base.jar
index 59a4a7c..e673fb5 100644
Binary files a/src/app/build/intermediates/merged_java_res/debug/base.jar and b/src/app/build/intermediates/merged_java_res/debug/base.jar differ
diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 99bc97a..702093d 100644
--- a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -36,8 +36,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 99bc97a..702093d 100644
--- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -36,8 +36,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
index 16cf2ef..31f73d7 100644
Binary files a/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
index b3d34f5..0134a9e 100644
Binary files a/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 951dd2f..af3c835 100644
Binary files a/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
index 2ae3d38..9b5e48b 100644
Binary files a/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 75b2b1b..ae81c50 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -4,12 +4,6 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@@ -30,10 +24,6 @@
                 },
                 {
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -50,25 +40,6 @@
                         "endColumns": "19",
                         "endOffsets": "210"
                     }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
-                    }
                 }
             ]
         },
@@ -76,49 +47,7 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml",
-=======
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
-                    "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
@@ -137,12 +66,6 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml",
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
                         "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
@@ -197,10 +120,6 @@
                 },
                 {
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml",
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@@ -217,31 +136,6 @@
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
                         "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
                     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                 }
             ]
         },
@@ -249,34 +143,7 @@
             "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-                    "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-=======
-                    "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 017ccb3..f39d3c9 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -4,12 +4,6 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                     "from": {
                         "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@@ -30,10 +24,6 @@
                 },
                 {
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
@@ -50,25 +40,6 @@
                         "endColumns": "19",
                         "endOffsets": "210"
                     }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
-                    }
                 }
             ]
         }
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 7099761..d519186 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -4,34 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-                    "from": {
-                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
-                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
-=======
-                    "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index dc1211c..52569f8 100644
--- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -4,49 +4,7 @@
             "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
             "map": [
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\arrays.xml",
-=======
-                    "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\arrays.xml",
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
@@ -65,12 +23,6 @@
                     }
                 },
                 {
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\styles.xml",
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
                         "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
@@ -125,10 +77,6 @@
                 },
                 {
                     "source": "D:\\Code\\Repository\\Android\\Notes2\\src\\app\\src\\main\\res\\values\\styles.xml",
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
@@ -145,31 +93,6 @@
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
                         "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
                     }
-<<<<<<< HEAD
-<<<<<<< HEAD
-                },
-                {
-                    "source": "E:\\code\\Android\\mi-note\\src\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
-                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
                 }
             ]
         }
diff --git a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 99bc97a..702093d 100644
--- a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -36,8 +36,7 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name"
-        android:testOnly="true" >
+        android:label="@string/app_name" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml
new file mode 100644
index 0000000..923a76f
--- /dev/null
+++ b/src/app/build/intermediates/packaged_manifests/debugAndroidTest/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="net.micode.notes.test" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="33" />
+
+    <instrumentation
+        android:name="android.test.InstrumentationTestRunner"
+        android:functionalTest="false"
+        android:handleProfiling="false"
+        android:label="Tests for net.micode.notes"
+        android:targetPackage="net.micode.notes" />
+
+    <application android:debuggable="true" >
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json b/src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json
new file mode 100644
index 0000000..890157a
--- /dev/null
+++ b/src/app/build/intermediates/packaged_manifests/debugAndroidTest/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "PACKAGED_MANIFESTS",
+    "kind": "Directory"
+  },
+  "applicationId": "net.micode.notes.test",
+  "variantName": "debugAndroidTest",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "outputFile": "AndroidManifest.xml"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index c114b64..0ad8f55 100644
Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json b/src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json
new file mode 100644
index 0000000..9932b33
--- /dev/null
+++ b/src/app/build/intermediates/processed_res/debugAndroidTest/out/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "PROCESSED_RES",
+    "kind": "Directory"
+  },
+  "applicationId": "net.micode.notes.test",
+  "variantName": "debugAndroidTest",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 0,
+      "versionName": "",
+      "outputFile": "resources-debugAndroidTest.ap_"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ b/src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_
new file mode 100644
index 0000000..fffdd42
Binary files /dev/null and b/src/app/build/intermediates/processed_res/debugAndroidTest/out/resources-debugAndroidTest.ap_ differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar b/src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar
similarity index 100%
rename from src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar
rename to src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_1.jar
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex
index ebf79ba..4a21e88 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/BuildConfig.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
index 1f9ff81..2ef7405 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index 82a2f92..98a180e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex
index 2fbf54b..1c0dee7 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
index a2176a6..f666e3c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index 7302df1..3e6ef4e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index c17c922..7205bbf 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
index ca6099e..3902e9b 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex
index 0138acd..00400e4 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index c514f8d..d9a2ab4 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
index 39f0ab3..8d4f4ce 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
index edca6c2..a55abb8 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
index 43fbb95..e43108d 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
index c804edb..a626869 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
index 7a975d2..fa9fd36 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 24984cf..137bd02 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
index 8fa92ab..82a15e2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex
index 7484169..ff466b5 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex
index aa009a0..c3c8e6a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
index aadcebf..ea943a8 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex
index 6b5778b..9db738a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index 1322b1a..313a26c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
index 0edc3e3..5dd84b4 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
index 3f534f4..c2dc1d7 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex
index 66440b5..e65e5b6 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex
index db641dc..cc8addf 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
index 7d8a2cc..234fe74 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
index f34ea10..00800a0 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex
index 6f5252f..4cc87c9 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index d8d0af5..2c8f09c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 36627fa..4617463 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index 16a8e64..acb28d1 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
index 7193315..5a1f843 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
index 5888fc6..fc4e994 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
index 86f7f9f..f187bd2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
index ef2fe6c..089c92c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
index a49e587..032a641 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
index 296ff56..7e5f050 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
index 602aad6..61a84ce 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 93f17cb..0228589 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index 54adcf9..07ef22e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
index c6e8fd8..9278ab0 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index c38244b..cbd9b6a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index b7482d9..92543fe 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index 2d3dad9..e9d6f92 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index 288c6fd..666c773 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex
index c129c9e..0df2655 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index bd744fe..1265184 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index ac6117e..ff5d433 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex
index 7201f1d..d9419a5 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 1fb0182..1efe84c 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 1cbdbb2..8287c95 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 6c5293d..b0b7fdf 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 3083cf6..461fe18 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index 568f2d9..cc12bfd 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index d76f231..6c47fc1 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 0d3d400..1bcd9a2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 33ac2d5..612d829 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index 5c48404..3a9b0bf 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 4146280..d229acb 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 6f0d01c..e66e2ae 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex
index 312fbad..1323e64 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 5b91144..34297f2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index 503889d..7a60e57 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 9e1d7e8..276c180 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 83d4a33..580eea7 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 72a0974..de90f31 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 04af6e4..9ade848 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 5d294d6..191fc2a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index ee2be4f..593b9e2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 5791a99..dc52356 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 0e99723..d06c10f 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 54f179b..e32b577 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 808c2bc..0e887b8 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
index 023b1ef..0b52d19 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 4c5708b..be3f06e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index e59992a..570fd93 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 20a2587..2dd9a3e 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index f91a5a0..4d02f21 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index 2533848..1f313d6 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index c8ac013..7f6ffd1 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
index 7654a04..30aea0f 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index 2d74d57..5de8b1a 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index ca0cc07..d9434d7 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 3884261..8589e08 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index b125b7f..9ffb128 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index ea4d3bb..bc5a1ad 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
index 303cd9e..93d4b86 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index 55eeca3..979c459 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 4ff53c2..880c5d2 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index 2559347..6349564 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index 1b88930..95d6608 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index aae067f..d5f1f60 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 2c28295..7908ca3 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index 61db915..069e7fd 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
index c8c3677..ea364a4 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
index affae58..8370b1d 100644
Binary files a/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/src/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt b/src/app/build/intermediates/runtime_symbol_list/debugAndroidTest/R.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt
index 2477f37..d17920c 100644
--- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -1,16 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-net.micode.notes.app-pngs-0 E:\code\Android\mi-note\src\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 E:\code\Android\mi-note\src\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 E:\code\Android\mi-note\src\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 E:\code\Android\mi-note\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 E:\code\Android\mi-note\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 E:\code\Android\mi-note\src\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 E:\code\Android\mi-note\src\app\src\debug\res
-net.micode.notes.app-main-7 E:\code\Android\mi-note\src\app\src\main\res
-=======
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
 net.micode.notes.app-pngs-0 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\pngs\debug
 net.micode.notes.app-resValues-1 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\debug
 net.micode.notes.app-rs-2 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\debug
@@ -19,7 +6,3 @@ net.micode.notes.app-mergeDebugResources-4 D:\Code\Repository\Android\Notes2\src
 net.micode.notes.app-merged_res-5 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\merged_res\debug
 net.micode.notes.app-debug-6 D:\Code\Repository\Android\Notes2\src\app\src\debug\res
 net.micode.notes.app-main-7 D:\Code\Repository\Android\Notes2\src\app\src\main\res
-<<<<<<< HEAD
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
diff --git a/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
new file mode 100644
index 0000000..ac1bea5
--- /dev/null
+++ b/src/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@@ -0,0 +1,5 @@
+net.micode.notes.test.app-androidTest-0 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\resValues\androidTest\debug
+net.micode.notes.test.app-androidTest-1 D:\Code\Repository\Android\Notes2\src\app\build\generated\res\rs\androidTest\debug
+net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
+net.micode.notes.test.app-mergeDebugAndroidTestResources-3 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
+net.micode.notes.test.app-merged_res-4 D:\Code\Repository\Android\Notes2\src\app\build\intermediates\merged_res\debugAndroidTest
diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt
index ee5158e..30f706f 100644
--- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,524 +1,5 @@
 -- Merging decision tree log ---
 manifest
-<<<<<<< HEAD
-<<<<<<< HEAD
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:1-160:12
-	package
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:20:5-31
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:22:5-30
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:19:5-51
-	xmlns:android
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:18:11-69
-	android:versionCode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:21:5-28
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-	android:targetSdkVersion
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:5-44
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-	android:minSdkVersion
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:24:15-41
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-		INJECTED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:5-81
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:26:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:5-88
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:27:22-85
-uses-permission#android.permission.INTERNET
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:5-67
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:28:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:5-72
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:29:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:5-74
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:30:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:5-80
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:31:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:5-71
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:32:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:5-74
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:33:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:5-81
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:34:22-78
-application
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:36:5-159:19
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:38:9-41
-	android:icon
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:37:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:39:9-53:20
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:43:13-45
-	android:launchMode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:44:13-43
-	android:windowSoftInputMode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:47:13-52
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:40:13-36
-	android:uiOptions
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:46:13-57
-	android:configChanges
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:42:13-74
-	android:theme
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:45:13-45
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:41:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:49:13-52:29
-action#android.intent.action.MAIN
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:17-69
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:50:25-66
-category#android.intent.category.LAUNCHER
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:17-77
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:51:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:55:9-85:20
-	android:launchMode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:59:13-43
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:56:13-36
-	android:configChanges
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:58:13-74
-	android:theme
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:60:13-45
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:57:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:13-68:29
-	android:scheme
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:62:28-49
-	tools:ignore
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:63:17-47
-action#android.intent.action.VIEW
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:17-69
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:64:25-66
-category#android.intent.category.DEFAULT
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:17-76
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:65:27-73
-data
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:17-78
-	android:mimeType
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:66:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:70:13-75:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:17-79
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:71:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:77:13-80:29
-action#android.intent.action.SEARCH
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:17-71
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:78:25-68
-meta-data#android.app.searchable
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:82:13-84:54
-	android:resource
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:84:17-51
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:83:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:87:9-91:43
-	android:authorities
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:90:13-47
-	android:multiprocess
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:91:13-40
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:88:13-37
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:89:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:93:9-106:20
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:96:13-50
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:94:13-37
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:95:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:97:13-101:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:17-84
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:98:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:17-85
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:99:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:17-85
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:100:25-82
-meta-data#android.appwidget.provider
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:103:13-105:58
-	android:resource
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:105:17-55
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:104:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:107:9-121:20
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:110:13-50
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:108:13-36
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:109:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:9-127:20
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:56-80
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:123:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:124:13-126:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:17-79
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:125:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:129:9-133:20
-	android:process
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:132:13-38
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:130:13-37
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:131:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:135:9-141:20
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:138:13-45
-	android:launchMode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:139:13-48
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:136:13-37
-	android:theme
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:140:13-75
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:137:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:143:9-149:20
-	android:label
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:146:13-54
-	android:launchMode
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:147:13-43
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:144:13-37
-	android:theme
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:148:13-60
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:145:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:151:9-154:19
-	android:exported
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:153:13-37
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:152:13-74
-meta-data#android.app.default_searchable
-ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:156:9-158:52
-	android:value
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:158:13-49
-	android:name
-		ADDED from E:\code\Android\mi-note\src\app\src\main\AndroidManifest.xml:157:13-58
-=======
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
-	package
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:20:5-31
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:22:5-30
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:19:5-51
-	xmlns:android
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:11-69
-	android:versionCode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:21:5-28
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-	android:targetSdkVersion
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:5-44
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-	android:minSdkVersion
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:24:15-41
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-		INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:5-81
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:26:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:5-88
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:27:22-85
-uses-permission#android.permission.INTERNET
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:5-67
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:28:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:5-72
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:29:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:5-74
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:30:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:5-80
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:31:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:5-71
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:32:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:5-74
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:33:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:5-81
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:34:22-78
-application
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:36:5-159:19
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:38:9-41
-	android:icon
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:37:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:39:9-53:20
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:43:13-45
-	android:launchMode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:44:13-43
-	android:windowSoftInputMode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:47:13-52
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:40:13-36
-	android:uiOptions
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:46:13-57
-	android:configChanges
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:42:13-74
-	android:theme
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:45:13-45
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:41:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:49:13-52:29
-action#android.intent.action.MAIN
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:17-69
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:50:25-66
-category#android.intent.category.LAUNCHER
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:17-77
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:51:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:55:9-85:20
-	android:launchMode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:59:13-43
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:56:13-36
-	android:configChanges
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:58:13-74
-	android:theme
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:60:13-45
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:57:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:13-68:29
-	android:scheme
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:62:28-49
-	tools:ignore
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:63:17-47
-action#android.intent.action.VIEW
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:17-69
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:64:25-66
-category#android.intent.category.DEFAULT
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:17-76
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:65:27-73
-data
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:17-78
-	android:mimeType
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:66:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:70:13-75:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:17-79
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:71:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:77:13-80:29
-action#android.intent.action.SEARCH
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:17-71
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:78:25-68
-meta-data#android.app.searchable
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:82:13-84:54
-	android:resource
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:84:17-51
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:83:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:87:9-91:43
-	android:authorities
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:90:13-47
-	android:multiprocess
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:91:13-40
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:88:13-37
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:89:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:93:9-106:20
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:96:13-50
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:94:13-37
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:95:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:97:13-101:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:17-84
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:98:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:17-85
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:99:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:17-85
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:100:25-82
-meta-data#android.appwidget.provider
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:103:13-105:58
-	android:resource
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:105:17-55
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:104:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:107:9-121:20
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:110:13-50
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:108:13-36
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:109:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:9-127:20
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:56-80
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:123:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:124:13-126:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:17-79
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:125:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:129:9-133:20
-	android:process
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:132:13-38
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:130:13-37
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:131:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:135:9-141:20
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:138:13-45
-	android:launchMode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:139:13-48
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:136:13-37
-	android:theme
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:140:13-75
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:137:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:143:9-149:20
-	android:label
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:146:13-54
-	android:launchMode
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:147:13-43
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:144:13-37
-	android:theme
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:148:13-60
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:145:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:151:9-154:19
-	android:exported
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:153:13-37
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:152:13-74
-meta-data#android.app.default_searchable
-ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:156:9-158:52
-	android:value
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
-	android:name
-		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
-=======
 ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
 INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
 INJECTED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:18:1-160:12
@@ -776,4 +257,3 @@ ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xm
 		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:158:13-49
 	android:name
 		ADDED from D:\Code\Repository\Android\Notes2\src\app\src\main\AndroidManifest.xml:157:13-58
->>>>>>> 2751d654ea91b8b8fb950088f44adff929c242f5
diff --git a/src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin
new file mode 100644
index 0000000..b44882d
Binary files /dev/null and b/src/app/build/tmp/compileDebugAndroidTestJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 67a36ee..6b624f1 100644
Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/app/local.properties b/src/app/local.properties
new file mode 100644
index 0000000..fd02646
--- /dev/null
+++ b/src/app/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Oct 26 16:55:17 CST 2023
+sdk.dir=D\:\\Code\\CodeTools\\IDE\\Android\\AndroidSDK
diff --git a/src/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java
index 2a14982..472ea9d 100644
--- a/src/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -35,6 +35,9 @@ import java.util.ArrayList;
 import java.util.HashSet;
 
 
+/**
+ * 数据操作工具类
+ */
 public class DataUtils {
     public static final String TAG = "DataUtils";
     public static boolean batchDeleteNotes(ContentResolver resolver, HashSet<Long> ids) {
diff --git a/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..9da9365 100644
--- a/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -40,6 +40,7 @@ import net.micode.notes.tool.DataUtils;
 import java.io.IOException;
 
 
+//闹铃响起活动
 public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
     private long mNoteId;
     private String mSnippet;
diff --git a/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..960f4e7 100644
--- a/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -28,6 +28,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.NumberPicker;
 
+//
 public class DateTimePicker extends FrameLayout {
 
     private static final boolean DEFAULT_ENABLE_STATE = true;
diff --git a/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..d820e94 100644
--- a/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -29,6 +29,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.text.format.DateFormat;
 import android.text.format.DateUtils;
 
+//自定义时间选择对话框
 public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
 
     private Calendar mDate = Calendar.getInstance();
diff --git a/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..7eb39bb 100644
--- a/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -27,6 +27,7 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import net.micode.notes.R;
 
+//下部菜单
 public class DropdownMenu {
     private Button mButton;
     private PopupMenu mPopupMenu;
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 1ae5a77..6dddab3 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -505,6 +505,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return true;
     }
 
+    /**
+     * 菜单选择事件
+     * @param item The menu item that was selected.
+     *
+     * @return
+     */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
diff --git a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..862d4df 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -37,6 +37,7 @@ import net.micode.notes.R;
 import java.util.HashMap;
 import java.util.Map;
 
+//自定义便签编辑文本域类
 public class NoteEditText extends EditText {
     private static final String TAG = "NoteEditText";
     private int mIndex;
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index a96bd53..7567ff5 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -74,7 +74,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     private static final int MENU_FOLDER_CHANGE_NAME = 2;
 
-    private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";  //单行超过80个字符
+    private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
 
     private enum ListEditState {
         NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
@@ -121,15 +121,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     private final static int REQUEST_CODE_NEW_NODE  = 103;
 
     @Override
-    protected void onCreate(final Bundle savedInstanceState) {  //需要是final类型   根据程序上下文环境，Java关键字final有“这是无法改变的”或者“终态的”含义，它可以修饰非抽象类、非抽象类成员方法和变量。你可能出于两种理解而需要阻止改变：设计或效率。
-        // final类不能被继承，没有子类，final类中的方法默认是final的。
-        //final方法不能被子类的方法覆盖，但可以被继承。
-        //final成员变量表示常量，只能被赋值一次，赋值后值不再改变。
-        //final不能用于修饰构造方法。
-        super.onCreate(savedInstanceState); // 调用父类的onCreate函数
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.note_list);
         initResources();
-
         /**
          * Insert an introduction when user firstly use this application
          */
@@ -150,7 +145,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     private void setAppInfoFromRawRes() {
-        // Android平台给我们提供了一个SharedPreferences类，它是一个轻量级的存储类，特别适合用于保存软件配置参数。
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
         if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
             StringBuilder sb = new StringBuilder();
@@ -203,17 +197,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     @Override
     protected void onStart() {
         super.onStart();
+        // 异步加载便签列表数据
         startAsyncNotesListQuery();
     }
 
     // 初始化资源
     private void initResources() {
-        mContentResolver = this.getContentResolver(); // 获取应用程序的数据，得到类似数据表的东西
+        mContentResolver = this.getContentResolver(); // 获取应用程序的数据，操纵应用数据表
         mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
-        mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+        mCurrentFolderId = Notes.ID_ROOT_FOLDER;//当前文件夹ID初始化为根目录ID
 
-        // findViewById 是安卓编程的定位函数，主要是引用.R文件里的引用名
-        mNotesListView = (ListView) findViewById(R.id.notes_list); // 绑定XML中的ListView，作为Item的容器
+        mNotesListView = (ListView) findViewById(R.id.notes_list);
         mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
                 null, false);
         mNotesListView.setOnItemClickListener(new OnListItemClickListener());
@@ -240,7 +234,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         public boolean onCreateActionMode(ActionMode mode, Menu menu) {
             getMenuInflater().inflate(R.menu.note_list_options, menu);
             menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
-            mMoveMenu = menu.findItem(R.id.move);
+            mMoveMenu = menu.findItem(R.id.move);//移动便签按钮
+            //如果该便签的父节点ID为。。或用户总文件夹个数为0，则移动变迁按钮隐藏
             if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
                     || DataUtils.getUserFolderCount(mContentResolver) == 0) {
                 mMoveMenu.setVisible(false);
@@ -249,13 +244,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                 mMoveMenu.setOnMenuItemClickListener(this);
             }
             mActionMode = mode;
-            mNotesListAdapter.setChoiceMode(true);
-            mNotesListView.setLongClickable(false);
-            mAddNewNote.setVisibility(View.GONE);
+            mNotesListAdapter.setChoiceMode(true);//选择模式开启
+            mNotesListView.setLongClickable(false);//长按功能关闭
+            mAddNewNote.setVisibility(View.GONE);//新建便签按钮隐藏
 
             View customView = LayoutInflater.from(NotesListActivity.this).inflate(
                     R.layout.note_list_dropdown_menu, null);
             mode.setCustomView(customView);
+            //TODO mDropDownMenu暂时没显示出来，暂时不知原因
             mDropDownMenu = new DropdownMenu(NotesListActivity.this,
                     (Button) customView.findViewById(R.id.selection_menu),
                     R.menu.note_list_dropdown);
@@ -299,9 +295,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
 
         public void onDestroyActionMode(ActionMode mode) {
-            mNotesListAdapter.setChoiceMode(false);
-            mNotesListView.setLongClickable(true);
-            mAddNewNote.setVisibility(View.VISIBLE);
+            mNotesListAdapter.setChoiceMode(false);//关闭选择模式
+            mNotesListView.setLongClickable(true);//打开长按功能
+            mAddNewNote.setVisibility(View.VISIBLE);//显示新建便签按钮
         }
 
         public void finishActionMode() {
@@ -414,6 +410,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
 
     };
 
+    /**
+     * 查询便签列表数据
+     */
     private void startAsyncNotesListQuery() {
         String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
                 : NORMAL_SELECTION;
@@ -448,12 +447,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
+    /**
+     * 移动便签是产生选择文件夹弹窗列表
+     */
     private void showFolderListMenu(Cursor cursor) {
         AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
         builder.setTitle(R.string.menu_title_select_folder);
         final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
         builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
-
+            //点击后调用工具类方法移动便签
             public void onClick(DialogInterface dialog, int which) {
                 DataUtils.batchMoveToFolder(mContentResolver,
                         mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
@@ -469,6 +471,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         builder.show();
     }
 
+    /**
+     * 新建便签
+     */
     private void createNewNote() {
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
@@ -476,6 +481,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
     }
 
+    /**
+     * 删除便签
+     */
     private void batchDelete() {
         new AsyncTask<Void, Void, HashSet<AppWidgetAttribute>>() {
             protected HashSet<AppWidgetAttribute> doInBackground(Void... unused) {
@@ -522,7 +530,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         HashSet<Long> ids = new HashSet<Long>();
         ids.add(folderId);
         HashSet<AppWidgetAttribute> widgets = DataUtils.getFolderNoteWidget(mContentResolver,
-                folderId);
+                folderId); //若是有便签文件夹的桌面小部件，也需要删除
         if (!isSyncMode()) {
             // if not synced, delete folder directly
             DataUtils.batchDeleteNotes(mContentResolver, ids);
@@ -922,7 +930,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     /**
-     * 函数功能：实现对便签列表项的点击事件（短按）
+     * 类功能：实现对便签列表项的点击事件（短按）
      */
     private class OnListItemClickListener implements OnItemClickListener {
 
@@ -967,7 +975,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
     }
 
     /**
-     * 查询目标文件
+     * 查询目标文件,移动便签
      */
     private void startQueryDestinationFolders() {
         String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
diff --git a/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..41aedf7 100644
--- a/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -47,7 +47,7 @@ import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.gtask.remote.GTaskSyncService;
 
-
+//设置活动界面
 public class NotesPreferenceActivity extends PreferenceActivity {
     public static final String PREFERENCE_NAME = "notes_preferences";
 
@@ -64,6 +64,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
     private PreferenceCategory mAccountCategory;
 
     private GTaskReceiver mReceiver;
+    
 
     private Account[] mOriAccounts;
 
diff --git a/src/app/src/main/res/layout/datetime_picker.xml b/src/app/src/main/res/layout/datetime_picker.xml
index f10d592..2f10f8a 100644
--- a/src/app/src/main/res/layout/datetime_picker.xml
+++ b/src/app/src/main/res/layout/datetime_picker.xml
@@ -13,6 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<!-- 闹钟时间选择弹窗布局 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:layout_gravity="center_horizontal"
diff --git a/src/app/src/main/res/layout/folder_list_item.xml b/src/app/src/main/res/layout/folder_list_item.xml
index 77e8148..391694a 100644
--- a/src/app/src/main/res/layout/folder_list_item.xml
+++ b/src/app/src/main/res/layout/folder_list_item.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 
+<!-- 文件夹列表项布局 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/src/app/src/main/res/layout/note_edit.xml b/src/app/src/main/res/layout/note_edit.xml
index 10b2aa7..2c6fbd7 100644
--- a/src/app/src/main/res/layout/note_edit.xml
+++ b/src/app/src/main/res/layout/note_edit.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 
+<!-- 便签编辑页面 -->
 <FrameLayout
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
diff --git a/src/app/src/main/res/layout/note_item.xml b/src/app/src/main/res/layout/note_item.xml
index d541f6a..cb6e3a1 100644
--- a/src/app/src/main/res/layout/note_item.xml
+++ b/src/app/src/main/res/layout/note_item.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 
+<!-- 便签列表项布局 -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/note_item"
diff --git a/src/app/src/main/res/layout/note_list.xml b/src/app/src/main/res/layout/note_list.xml
index 6b25d38..6981f2e 100644
--- a/src/app/src/main/res/layout/note_list.xml
+++ b/src/app/src/main/res/layout/note_list.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
+<!-- 列表布局 -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
diff --git a/src/build.gradle b/src/build.gradle
index 4138047..c738d22 100644
--- a/src/build.gradle
+++ b/src/build.gradle
@@ -9,6 +9,21 @@ buildscript {
     }
 }
 
+plugins {
+    id "org.sonarqube" version "2.7"
+}
+
+apply plugin: "org.sonarqube"
+
+sonarqube {
+    properties {
+        property "sonar.host.url", "http://localhost:9000"
+        property "sonar.login", "admin"
+        property "sonar.password", "admin"
+    }
+}
+
+
 allprojects {
     repositories {
         jcenter()
diff --git a/src/build/sonar/.sonar_lock b/src/build/sonar/.sonar_lock
new file mode 100644
index 0000000..e69de29
diff --git a/src/build/sonar/report-task.txt b/src/build/sonar/report-task.txt
new file mode 100644
index 0000000..fab49b8
--- /dev/null
+++ b/src/build/sonar/report-task.txt
@@ -0,0 +1,6 @@
+projectKey=src
+serverUrl=http://localhost:9000
+serverVersion=7.9.6.41879
+dashboardUrl=http://localhost:9000/dashboard?id=src
+ceTaskId=AYt6a0Uy-yRTbx64kKnC
+ceTaskUrl=http://localhost:9000/api/ce/task?id=AYt6a0Uy-yRTbx64kKnC
diff --git a/src/local.properties b/src/local.properties
index c6f5e1a..5f521cc 100644
--- a/src/local.properties
+++ b/src/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Sep 14 17:55:12 CST 2023
-sdk.dir=E\:\\sdk
+#Thu Oct 26 21:49:47 CST 2023
+sdk.dir=D\:\\Code\\CodeTools\\IDE\\Android\\AndroidSDK
diff --git a/ui.suml b/ui.suml
new file mode 100644
index 0000000..2803648
--- /dev/null
+++ b/ui.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="net.micode.notes.ui.NotesListActivity" x="26" y="223"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NotesListItem" x="242" y="74"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NoteEditActivity" x="530" y="53"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NotesListAdapter" x="758" y="38"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NoteItemData" x="145" y="75"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NotesPreferenceActivity" x="294" y="255"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.DateTimePicker" x="401" y="36"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.AlarmAlertActivity" x="62" y="162"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.FoldersListAdapter" x="497" y="179"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.DropdownMenu" x="365" y="48"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.DateTimePickerDialog" x="377" y="90"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.AlarmReceiver" x="394" y="65"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.AlarmInitReceiver" x="17" y="204"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.ui.NoteEditText" x="287" y="39"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="net.micode.notes.ui.NotesListItem" to="net.micode.notes.ui.NoteItemData"><anchor constraint="1" type="2" x="242" y="107" /><anchor constraint="1" type="2" x="238" y="107" /><decorator type="4" description="-  mItemData" /></connector><connector from="net.micode.notes.ui.DateTimePickerDialog" to="net.micode.notes.ui.DateTimePicker"><anchor constraint="1" type="2" x="0" y="0" /><anchor constraint="1" type="2" x="0" y="0" /><decorator type="4" description="-  mDateTimePicker" /></connector><connector from="net.micode.notes.ui.NotesListActivity" to="net.micode.notes.ui.NotesListAdapter"><anchor constraint="1" type="2" x="281" y="235" /><anchor constraint="1" type="2" x="758" y="102" /><decorator type="4" description="-  mNotesListAdapter" /></connector><connector from="net.micode.notes.ui.NotesListActivity" to="net.micode.notes.ui.NoteItemData"><anchor constraint="1" type="2" x="164" y="223" /><anchor constraint="1" type="2" x="183" y="142" /><decorator type="4" description="-  mFocusNoteDataItem" /></connector></connectors></Classdiagram>
diff --git a/widget.suml b/widget.suml
new file mode 100644
index 0000000..63cd871
--- /dev/null
+++ b/widget.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="net.micode.notes.widget.NoteWidgetProvider" x="136" y="217"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.widget.NoteWidgetProvider_2x" x="456" y="220"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="net.micode.notes.widget.NoteWidgetProvider_4x" x="128" y="327"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="net.micode.notes.widget.NoteWidgetProvider_2x" to="net.micode.notes.widget.NoteWidgetProvider"><anchor constraint="1" type="2" x="456" y="251" /><anchor constraint="1" type="2" x="399" y="251" /><decorator type="2" description="" /></connector><connector from="net.micode.notes.widget.NoteWidgetProvider_4x" to="net.micode.notes.widget.NoteWidgetProvider"><anchor constraint="1" type="2" x="269" y="327" /><anchor constraint="1" type="2" x="267" y="284" /><decorator type="2" description="" /></connector></connectors></Classdiagram>