diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin
index 1c59e2c..743b40c 100644
Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.bin and b/src/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock
index ea62195..f835b74 100644
Binary files a/src/.gradle/5.4.1/executionHistory/executionHistory.lock and b/src/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin
index f7f09b4..8023d77 100644
Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.bin and b/src/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.lock b/src/.gradle/5.4.1/fileHashes/fileHashes.lock
index 9fb1e58..42c45c7 100644
Binary files a/src/.gradle/5.4.1/fileHashes/fileHashes.lock and b/src/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index e55e77e..d1c01fc 100644
Binary files a/src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin and b/src/.gradle/5.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/src/.gradle/5.4.1/javaCompile/javaCompile.lock b/src/.gradle/5.4.1/javaCompile/javaCompile.lock
index baad6c2..ec44a8a 100644
Binary files a/src/.gradle/5.4.1/javaCompile/javaCompile.lock and b/src/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 548f769..5e9a245 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 03a14f9..1baf61a 100644
Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/.idea/caches/build_file_checksums.ser b/src/.idea/caches/build_file_checksums.ser
index 321d8e6..b56af0d 100644
Binary files a/src/.idea/caches/build_file_checksums.ser and b/src/.idea/caches/build_file_checksums.ser differ
diff --git a/src/.idea/caches/gradle_models.ser b/src/.idea/caches/gradle_models.ser
index 3032002..a22af00 100644
Binary files a/src/.idea/caches/gradle_models.ser and b/src/.idea/caches/gradle_models.ser differ
diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml
index 5267568..d732034 100644
--- a/src/.idea/workspace.xml
+++ b/src/.idea/workspace.xml
@@ -5,38 +5,51 @@
       <config />
     </shared>
   </component>
+  <component name="AndroidLogFilters">
+    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="">
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/ui/NoteEditActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/widget/NoteWidgetProvider.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -48,7 +61,7 @@
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_24" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_21" />
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
@@ -58,55 +71,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="294" column="26" selection-start-line="294" selection-start-column="26" selection-end-line="294" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="310">
-              <caret line="411" column="1" lean-forward="true" selection-start-line="411" selection-start-column="1" selection-end-line="411" selection-end-column="1" />
-              <folding>
-                <element signature="e#9079#9080#0" expanded="true" />
-                <element signature="e#9136#9137#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
+        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="37" column="3" lean-forward="true" selection-start-line="37" selection-start-column="3" selection-end-line="37" selection-end-column="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-          <provider editor-type-id="android-manifest" />
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="83" column="25" lean-forward="true" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="201">
-              <caret line="76" column="32" selection-start-line="76" selection-start-column="32" selection-end-line="76" selection-end-column="32" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="260">
+              <caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -124,6 +93,7 @@
       <find>TAG</find>
       <find>increase_folder_count_on_update</find>
       <find>createNoteTable</find>
+      <find>getInstance</find>
     </findStrings>
     <replaceStrings>
       <replace>WRONGNOTEID</replace>
@@ -146,7 +116,6 @@
       <list>
         <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
-        <option value="$PROJECT_DIR$/app/build.gradle" />
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java" />
@@ -162,6 +131,7 @@
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java" />
+        <option value="$PROJECT_DIR$/app/build.gradle" />
       </list>
     </option>
   </component>
@@ -177,6 +147,17 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="src" type="58d84e3e:PackageViewProjectNode" />
+              <item name="app" type="616d4139:PackageViewModuleNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="Scope">
         <subPane subId="Scope '产品'; set:产品; class com.intellij.psi.search.scope.ProjectProductionScope">
           <expand>
@@ -320,17 +301,6 @@
         </subPane>
       </pane>
       <pane id="AndroidView" />
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="src" type="58d84e3e:PackageViewProjectNode" />
-              <item name="app" type="616d4139:PackageViewModuleNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -383,16 +353,6 @@
               <item name="notes" type="462c0819:PsiDirectoryNode" />
               <item name="data" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="src" type="b2602c69:ProjectViewProjectNode" />
-              <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="notes" type="462c0819:PsiDirectoryNode" />
-              <item name="gtask" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="src" type="b2602c69:ProjectViewProjectNode" />
               <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
@@ -413,16 +373,6 @@
               <item name="notes" type="462c0819:PsiDirectoryNode" />
               <item name="ui" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="src" type="b2602c69:ProjectViewProjectNode" />
-              <item name="src" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="notes" type="462c0819:PsiDirectoryNode" />
-              <item name="widget" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -431,11 +381,14 @@
   </component>
   <component name="PropertiesComponent">
     <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_XL_API_14" />
-    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2019-09-19T08:10:56.437Z" />
+    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_21" />
+    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2019-09-20T13:06:36.808Z" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
     <property name="android.sdk.path" value="D:/Android_SDK/SDK" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.17" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RunDashboard">
@@ -600,7 +553,21 @@
       <option name="project" value="LOCAL" />
       <updated>1568887009467</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="comment">
+      <created>1568942719673</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1568942719673</updated>
+    </task>
+    <task id="LOCAL-00013" summary="comment">
+      <created>1568943282822</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1568943282823</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TodoView">
@@ -614,10 +581,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="878" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
-      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.16601562" />
+      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17024128" />
       <window_info id="设计器" order="2" />
       <window_info id="Resources Explorer" order="3" weight="0.3297587" />
       <window_info id="Structure" order="4" side_tool="true" />
@@ -627,15 +593,15 @@
       <window_info id="Favorites" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Run" order="0" weight="0.3294271" />
       <window_info anchor="bottom" id="SonarLint" order="1" weight="0.3297587" />
-      <window_info anchor="bottom" id="Logcat" order="2" />
-      <window_info anchor="bottom" id="TODO" order="3" weight="0.3297587" />
+      <window_info anchor="bottom" x="0" y="305" width="1536" height="253" id="Logcat" order="2" sideWeight="0.49934897" weight="0.3190104" />
+      <window_info anchor="bottom" id="TODO" order="3" weight="0.31903484" />
       <window_info anchor="bottom" id="Android Profiler" order="4" show_stripe_button="false" />
       <window_info anchor="bottom" id="Find" order="5" weight="0.3297587" />
       <window_info anchor="bottom" id="Debug" order="6" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.3297587" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.3294271" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.3297587" />
-      <window_info anchor="bottom" id="Build" order="10" visible="true" weight="0.3059896" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32841823" />
+      <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50065106" side_tool="true" weight="0.3190104" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32841823" />
+      <window_info anchor="bottom" id="Build" order="10" visible="true" weight="0.3150134" />
       <window_info anchor="bottom" id="Messages" order="11" weight="0.3297587" />
       <window_info anchor="right" id="Gradle" order="0" />
       <window_info anchor="right" id="Device File Explorer" order="1" side_tool="true" />
@@ -655,6 +621,46 @@
       </list>
     </option>
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="AS run version" />
     <MESSAGE value="correct some error by sonarlint" />
@@ -670,8 +676,8 @@
       <provider selected="true" editor-type-id="ninepatcheditor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml">
-      <provider selected="true" editor-type-id="android-designer2" />
       <provider editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="android-designer2" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/widget_2x_info.xml">
       <provider selected="true" editor-type-id="text-editor" />
@@ -691,15 +697,8 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/datetime_picker.xml">
-      <provider selected="true" editor-type-id="android-designer2" />
       <provider editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="android-designer2" />
     </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
@@ -822,13 +821,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="116" column="23" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/drawable-hdpi/title_alert.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -893,20 +885,6 @@
     <entry file="file://$PROJECT_DIR$/app/app.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-981">
-          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/DataUtils.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -928,13 +906,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="45" column="48" selection-start-line="45" selection-start-column="36" selection-end-line="45" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/DropdownMenu.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -942,6 +913,63 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="17" column="9" lean-forward="true" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-22">
+          <caret line="280" column="26" selection-start-line="280" selection-start-column="26" selection-end-line="280" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="411" column="1" selection-start-line="411" selection-start-column="1" selection-end-line="411" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="418">
+          <caret line="192" column="30" selection-start-line="192" selection-start-column="30" selection-end-line="192" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="392">
+          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
+        </state>
+      </provider>
+      <provider editor-type-id="android-manifest" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="201">
@@ -952,36 +980,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="294" column="26" selection-start-line="294" selection-start-column="26" selection-end-line="294" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="411" column="1" lean-forward="true" selection-start-line="411" selection-start-column="1" selection-end-line="411" selection-end-column="1" />
-          <folding>
-            <element signature="e#9079#9080#0" expanded="true" />
-            <element signature="e#9136#9137#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
-      <provider editor-type-id="android-manifest" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="83" column="25" lean-forward="true" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="37" column="3" lean-forward="true" selection-start-line="37" selection-start-column="3" selection-end-line="37" selection-end-column="3" />
+        <state relative-caret-position="260">
+          <caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
         </state>
       </provider>
     </entry>
diff --git a/src/app/app.iml b/src/app/app.iml
index 91082de..06277d8 100644
--- a/src/app/app.iml
+++ b/src/app/app.iml
@@ -87,8 +87,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-28" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/src/app/build.gradle b/src/app/build.gradle
index 8569daa..aee5e89 100644
--- a/src/app/build.gradle
+++ b/src/app/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 21
     buildToolsVersion "29.0.2"
-    useLibrary 'org.apache.http.legacy'
+    //useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "net.micode.notes"
diff --git a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
index 97501ac..f237bf5 100644
--- a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
+++ b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
@@ -36,7 +36,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
index 70d91ed..dcb13a2 100644
Binary files a/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and b/src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex differ
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 f2b8694..7b9181a 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,4 +1,4 @@
-#Thu Sep 19 17:35:10 CST 2019
+#Fri Sep 20 21:07:44 CST 2019
 base.0=C\:\\Project\\minote\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\out\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M=
index 4884df4..707cd6c 100644
Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= differ
diff --git a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
index d4e8cc3..72a45c5 100644
--- a/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
+++ b/src/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -37,7 +37,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
index 4ecc86e..31652f7 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
index ad09824..03e7ff8 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
index d190552..f1092fc 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
index 242d729..176f616 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
index 7ad58e5..6fb17ca 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
index 89fd7ef..8cab7ce 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
index 8558246..632751a 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
index 5341ea9..0448d2e 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ
diff --git a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
index c2b9424..6b5de17 100644
Binary files a/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.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 6295025..ca267d7 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
@@ -58,214 +58,215 @@
 37        android:debuggable="true"
 38        android:icon="@drawable/icon_app"
 38-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42
-39        android:label="@string/app_name" >
+39        android:label="@string/app_name"
 39-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41
-40        <activity
-40-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20
-41            android:name="net.micode.notes.ui.NotesListActivity"
-41-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49
-42            android:configChanges="keyboardHidden|orientation|screenSize"
-42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74
-43            android:label="@string/app_name"
-43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45
-44            android:launchMode="singleTop"
-44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43
-45            android:theme="@style/NoteTheme"
-45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-45
-46            android:uiOptions="splitActionBarWhenNarrow"
-46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57
-47            android:windowSoftInputMode="adjustPan" >
-47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52
-48            <intent-filter>
-48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29
-49                <action android:name="android.intent.action.MAIN" />
-49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69
-49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66
-50
-51                <category android:name="android.intent.category.LAUNCHER" />
-51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77
-51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74
-52            </intent-filter>
-53        </activity>
-54        <activity
-54-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20
-55            android:name="net.micode.notes.ui.NoteEditActivity"
-55-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48
-56            android:configChanges="keyboardHidden|orientation|screenSize"
-56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74
-57            android:launchMode="singleTop"
-57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43
-58            android:theme="@style/NoteTheme" >
-58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45
-59            <intent-filter>
-59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29
-60                <action android:name="android.intent.action.VIEW" />
-60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69
-60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66
-61
-62                <category android:name="android.intent.category.DEFAULT" />
-62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
-62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
-63
-64                <data android:mimeType="vnd.android.cursor.item/text_note" />
-64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
-64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
-65                <data android:mimeType="vnd.android.cursor.item/call_note" />
+40        android:testOnly="true" >
+41        <activity
+41-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20
+42            android:name="net.micode.notes.ui.NotesListActivity"
+42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49
+43            android:configChanges="keyboardHidden|orientation|screenSize"
+43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74
+44            android:label="@string/app_name"
+44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45
+45            android:launchMode="singleTop"
+45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43
+46            android:theme="@style/NoteTheme"
+46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-45
+47            android:uiOptions="splitActionBarWhenNarrow"
+47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57
+48            android:windowSoftInputMode="adjustPan" >
+48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52
+49            <intent-filter>
+49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29
+50                <action android:name="android.intent.action.MAIN" />
+50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69
+50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66
+51
+52                <category android:name="android.intent.category.LAUNCHER" />
+52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77
+52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74
+53            </intent-filter>
+54        </activity>
+55        <activity
+55-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20
+56            android:name="net.micode.notes.ui.NoteEditActivity"
+56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48
+57            android:configChanges="keyboardHidden|orientation|screenSize"
+57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74
+58            android:launchMode="singleTop"
+58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43
+59            android:theme="@style/NoteTheme" >
+59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45
+60            <intent-filter>
+60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29
+61                <action android:name="android.intent.action.VIEW" />
+61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69
+61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66
+62
+63                <category android:name="android.intent.category.DEFAULT" />
+63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
+63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
+64
+65                <data android:mimeType="vnd.android.cursor.item/text_note" />
 65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
 65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
-66            </intent-filter>
-67            <intent-filter>
-67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29
-68                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79
-68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76
-69
-70                <category android:name="android.intent.category.DEFAULT" />
-70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
-70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
-71
-72                <data android:mimeType="vnd.android.cursor.item/text_note" />
-72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
-72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
-73                <data android:mimeType="vnd.android.cursor.item/call_note" />
+66                <data android:mimeType="vnd.android.cursor.item/call_note" />
+66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
+66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
+67            </intent-filter>
+68            <intent-filter>
+68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29
+69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79
+69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76
+70
+71                <category android:name="android.intent.category.DEFAULT" />
+71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
+71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
+72
+73                <data android:mimeType="vnd.android.cursor.item/text_note" />
 73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
 73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
-74            </intent-filter>
-75            <intent-filter>
-75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29
-76                <action android:name="android.intent.action.SEARCH" />
-76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71
-76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68
-77
-78                <category android:name="android.intent.category.DEFAULT" />
-78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
-78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
-79            </intent-filter>
-80
-81            <meta-data
-81-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54
-82                android:name="android.app.searchable"
-82-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54
-83                android:resource="@xml/searchable" />
-83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51
-84        </activity>
-85
-86        <provider
-86-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43
-87            android:name="net.micode.notes.data.NotesProvider"
-87-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63
-88            android:authorities="micode_notes"
-88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47
-89            android:multiprocess="true" />
-89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40
-90
-91        <receiver
-91-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20
-92            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-92-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57
-93            android:label="@string/app_widget2x2" >
-93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50
-94            <intent-filter>
-94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29
-95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84
-95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81
-96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85
-96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82
-97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85
-97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82
-98            </intent-filter>
-99
-100            <meta-data
-100-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58
-101                android:name="android.appwidget.provider"
-101-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58
-102                android:resource="@xml/widget_2x_info" />
-102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55
-103        </receiver>
-104        <receiver
-104-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20
-105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-105-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57
-106            android:label="@string/app_widget4x4" >
-106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50
-107            <intent-filter>
-107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29
-108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84
-108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81
-109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85
-109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82
-110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85
-110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82
-111            </intent-filter>
-112
-113            <meta-data
-113-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58
-114                android:name="android.appwidget.provider"
-114-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58
-115                android:resource="@xml/widget_4x_info" />
-115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55
-116        </receiver>
-117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20
-117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55
-118            <intent-filter>
-118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29
-119                <action android:name="android.intent.action.BOOT_COMPLETED" />
-119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79
-119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76
-120            </intent-filter>
-121        </receiver>
-122        <receiver
-122-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20
-123            android:name="net.micode.notes.ui.AlarmReceiver"
-123-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61
-124            android:process=":remote" >
-124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38
-125        </receiver>
-126
-127        <activity
-127-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20
-128            android:name="net.micode.notes.ui.AlarmAlertActivity"
-128-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50
-129            android:label="@string/app_name"
-129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45
-130            android:launchMode="singleInstance"
-130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48
-131            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75
-132        </activity>
-133        <activity
-133-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20
-134            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-134-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71
-135            android:label="@string/preferences_title"
-135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54
-136            android:launchMode="singleTop"
-136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43
-137            android:theme="@android:style/Theme.Holo.Light" >
-137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60
-138        </activity>
-139
-140        <service
-140-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19
-141            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-141-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74
-142            android:exported="false" >
-142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37
-143        </service>
-144
-145        <meta-data
-145-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52
-146            android:name="android.app.default_searchable"
-146-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58
-147            android:value=".ui.NoteEditActivity" />
-147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49
-148    </application>
-149
-150</manifest>
+74                <data android:mimeType="vnd.android.cursor.item/call_note" />
+74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78
+74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75
+75            </intent-filter>
+76            <intent-filter>
+76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29
+77                <action android:name="android.intent.action.SEARCH" />
+77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71
+77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68
+78
+79                <category android:name="android.intent.category.DEFAULT" />
+79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76
+79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73
+80            </intent-filter>
+81
+82            <meta-data
+82-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54
+83                android:name="android.app.searchable"
+83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54
+84                android:resource="@xml/searchable" />
+84-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51
+85        </activity>
+86
+87        <provider
+87-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43
+88            android:name="net.micode.notes.data.NotesProvider"
+88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63
+89            android:authorities="micode_notes"
+89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47
+90            android:multiprocess="true" />
+90-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40
+91
+92        <receiver
+92-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20
+93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57
+94            android:label="@string/app_widget2x2" >
+94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50
+95            <intent-filter>
+95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29
+96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84
+96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81
+97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85
+97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82
+98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85
+98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82
+99            </intent-filter>
+100
+101            <meta-data
+101-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58
+102                android:name="android.appwidget.provider"
+102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58
+103                android:resource="@xml/widget_2x_info" />
+103-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55
+104        </receiver>
+105        <receiver
+105-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20
+106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57
+107            android:label="@string/app_widget4x4" >
+107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50
+108            <intent-filter>
+108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29
+109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84
+109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81
+110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85
+110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82
+111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85
+111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82
+112            </intent-filter>
+113
+114            <meta-data
+114-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58
+115                android:name="android.appwidget.provider"
+115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58
+116                android:resource="@xml/widget_4x_info" />
+116-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55
+117        </receiver>
+118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20
+118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55
+119            <intent-filter>
+119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29
+120                <action android:name="android.intent.action.BOOT_COMPLETED" />
+120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79
+120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76
+121            </intent-filter>
+122        </receiver>
+123        <receiver
+123-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20
+124            android:name="net.micode.notes.ui.AlarmReceiver"
+124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61
+125            android:process=":remote" >
+125-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38
+126        </receiver>
+127
+128        <activity
+128-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20
+129            android:name="net.micode.notes.ui.AlarmAlertActivity"
+129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50
+130            android:label="@string/app_name"
+130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45
+131            android:launchMode="singleInstance"
+131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48
+132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+132-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75
+133        </activity>
+134        <activity
+134-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20
+135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71
+136            android:label="@string/preferences_title"
+136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54
+137            android:launchMode="singleTop"
+137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43
+138            android:theme="@android:style/Theme.Holo.Light" >
+138-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60
+139        </activity>
+140
+141        <service
+141-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19
+142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74
+143            android:exported="false" >
+143-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37
+144        </service>
+145
+146        <meta-data
+146-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52
+147            android:name="android.app.default_searchable"
+147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58
+148            android:value=".ui.NoteEditActivity" />
+148-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49
+149    </application>
+150
+151</manifest>
diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 97501ac..f237bf5 100644
--- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -36,7 +36,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_
index 77e954a..bf79472 100644
Binary files a/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex
index fb2b2d5..58172bf 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex
index 5baa5b6..170a777 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex
index 861bce2..e718373 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$DataConstants.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex
index 928205b..a4d121f 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex
index f5e797d..2dd0be0 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Notes.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex
index cdd16e2..7708f89 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex
index 201fb60..5af93e6 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex
index 712cdfd..dc4548b 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex
index f8de177..9c83648 100644
Binary files a/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex and b/src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex differ
diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk
index 6446373..76e709b 100644
Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java
index e7336ae..f98db79 100644
--- a/src/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -35,7 +35,7 @@ import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 
 /**
- *a
+ *
  */
 public class NotesProvider extends ContentProvider {
     private static final UriMatcher mMatcher;
@@ -53,7 +53,9 @@ public class NotesProvider extends ContentProvider {
     private static final int URI_SEARCH_SUGGEST  = 6;
 
     static {
+        //初始化UriMatcher对象，初始不匹配任何东西
         mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        //注册uri，# - 通配符
         mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
         mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM);
         mMatcher.addURI(Notes.AUTHORITY, "data", URI_DATA);
@@ -87,12 +89,17 @@ public class NotesProvider extends ContentProvider {
         return true;
     }
 
+    /**
+     * 该方法重写了query方法，用于在数据库中查找notes或者data
+     */
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
             String sortOrder) {
         Cursor c = null;
+        //创建可读数据库
         SQLiteDatabase db = mHelper.getReadableDatabase();
         String id = null;
+        //根据uri匹配的返回码，查找不同的数据表
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
                 c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null,
@@ -137,10 +144,12 @@ public class NotesProvider extends ContentProvider {
                     c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
                             new String[] { searchString });
                 } catch (IllegalStateException ex) {
+                    //将错误信息写入日志
                     Log.e(TAG, "got exception: " + ex.toString());
                 }
                 break;
             default:
+                //抛出异常，uri未知
                 throw new IllegalArgumentException("Unknown URI " + uri);
         }
         if (c != null) {
@@ -149,18 +158,25 @@ public class NotesProvider extends ContentProvider {
         return c;
     }
 
+    /**
+     * 该方法重写了insert方法，用于在数据表中插入notes或者data
+     */
     @Override
     public Uri insert(Uri uri, ContentValues values) {
+        //创建可读写数据库
         SQLiteDatabase db = mHelper.getWritableDatabase();
         long dataId = 0, noteId = 0, insertedId = 0;
+        //根据uri匹配的返回码，将数据插入不同的数据表
         switch (mMatcher.match(uri)) {
             case URI_NOTE:
+                //@ values 待插入的元素
                 insertedId = noteId = db.insert(TABLE.NOTE, null, values);
                 break;
             case URI_DATA:
                 if (values.containsKey(DataColumns.NOTE_ID)) {
                     noteId = values.getAsLong(DataColumns.NOTE_ID);
                 } else {
+                    //将调试信息写入日志，没有id的错误数据格式
                     Log.d(TAG, "Wrong data format without note id:" + values.toString());
                 }
                 insertedId = dataId = db.insert(TABLE.DATA, null, values);