diff --git a/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock
index c090fb4..92ceae8 100644
Binary files a/.gradle/8.0/checksums/checksums.lock and b/.gradle/8.0/checksums/checksums.lock differ
diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin
index 6baaa6f..01a874e 100644
Binary files a/.gradle/8.0/checksums/md5-checksums.bin and b/.gradle/8.0/checksums/md5-checksums.bin differ
diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin
index 48b8171..2a873fe 100644
Binary files a/.gradle/8.0/checksums/sha1-checksums.bin and b/.gradle/8.0/checksums/sha1-checksums.bin differ
diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
index 007624e..3329914 100644
Binary files a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock and b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock differ
diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin
index 8c4d133..ed82722 100644
Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and b/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock
index 300ca84..b5c7cc5 100644
Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and b/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin
index c6b88e7..e36d948 100644
Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock
index 33bc1b6..e52df20 100644
Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin
index 1fb69a2..88c1d36 100644
Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9d9067a..e51a21e 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
index 2e9473b..edcfe79 100644
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Mon Nov 06 16:29:40 CST 2023
+#Tue Nov 07 10:47:33 CST 2023
 gradle.version=8.0
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 8c47272..0ecaff8 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 296b110..0f5ae69 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 22fd288..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,8 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk
index ee1dc09..723548f 100644
Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index cc5830a..4cde184 100644
Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
index afb2a23..18c1bde 100644
Binary files a/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_0/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_0/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_1/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_1/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_2/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_2/graph.bin differ
diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_3/graph.bin
new file mode 100644
index 0000000..601f245
Binary files /dev/null and b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_3/graph.bin differ
diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index 2c18cac..72cedca 100644
Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 9c8e9e0..04be84d 100644
Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
index 5c6bbf9..f2bcdef 100644
Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 683c26a..1700c74 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,9 +1,16 @@
-#Wed Jan 03 15:30:47 CST 2024
+#Thu Jan 04 11:04:30 CST 2024
 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
 net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention0.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention0.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention1.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention1.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention2.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention2.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention3.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention3.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention4.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention4.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/attention5.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention5.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/cancel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_cancel.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
@@ -47,6 +54,7 @@ net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\
 net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/lock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
@@ -69,17 +77,31 @@ net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Note
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
 net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/drawable/selector_grid.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_selector_grid.xml.flat
+net.micode.notes.app-main-6\:/drawable/selector_key_del.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_selector_key_del.xml.flat
 net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
 net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-6\:/layout/current_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_current_password_head.xml.flat
 net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
 net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
 net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/homepage.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_homepage.xml.flat
+net.micode.notes.app-main-6\:/layout/item_grid.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_item_grid.xml.flat
+net.micode.notes.app-main-6\:/layout/layout.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_layout.xml.flat
+net.micode.notes.app-main-6\:/layout/layout2.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_layout2.xml.flat
+net.micode.notes.app-main-6\:/layout/new_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_new_password_head.xml.flat
+net.micode.notes.app-main-6\:/layout/note_decryption.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_decryption.xml.flat
 net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
 net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_encryption.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption.xml.flat
+net.micode.notes.app-main-6\:/layout/note_encryption_repeat.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption_repeat.xml.flat
+net.micode.notes.app-main-6\:/layout/note_importance.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_importance.xml.flat
 net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
 net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
 net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
 net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-6\:/layout/password_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_password_item.xml.flat
+net.micode.notes.app-main-6\:/layout/repeat_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_repeat_password_head.xml.flat
 net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
 net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
 net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
index d65e0cc..62b59b7 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -7,10 +7,17 @@
     <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>
+    <string name="alert_message_decrypt">密码输入正确，即将进入便签</string>
+    <string name="alert_message_decrypt_error">密码输入错误，请重新输入</string>
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string>
+    <string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string>
+    <string name="alert_message_remove_encrypt">解除便签访问密码成功</string>
     <string name="alert_title_delete">删除</string>
+    <string name="alert_title_encrypt">密码提示</string>
+    <string name="alert_title_importance">设置重要性</string>
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
@@ -39,6 +46,7 @@
     <string name="menu_create_folder">新建文件夹</string>
     <string name="menu_delete">删除</string>
     <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_encrypt">设置密码</string>
     <string name="menu_export_text">导出文本</string>
     <string name="menu_folder_change_name">修改文件夹名称</string>
     <string name="menu_folder_delete">刪除文件夹</string>
@@ -52,12 +60,14 @@
     <string name="menu_move">移动到文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_encrypt">解除密码</string>
     <string name="menu_remove_remind">删除提醒</string>
     <string name="menu_search">搜索</string>
     <string name="menu_select_all">全选</string>
     <string name="menu_select_none">没有选中项，操作无效</string>
     <string name="menu_select_title">选中了 %d 项</string>
     <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_set_importance">设置便签重要性</string>
     <string name="menu_setting">设置</string>
     <string name="menu_share">分享</string>
     <string name="menu_sync">同步</string>
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index 8229fb7..d34d55e 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -21,10 +21,17 @@
         
         <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>
+    <string name="alert_message_decrypt">Decrypt note successfully</string>
+    <string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string>
     <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_encrypt">Encrypt note successfully, password is %s</string>
+    <string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string>
+    <string name="alert_message_remove_encrypt">Remove encryption successfully</string>
     <string name="alert_title_delete">Delete selected notes</string>
+    <string name="alert_title_encrypt">Encryption</string>
+    <string name="alert_title_importance">Set Importance</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -56,6 +63,7 @@
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_encrypt">Encrypt note</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_folder_change_name">Change folder name</string>
     <string name="menu_folder_delete">Delete folder</string>
@@ -70,12 +78,14 @@
     <string name="menu_move">Move to folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_encrypt">Delete encryption</string>
     <string name="menu_remove_remind">Delete reminder</string>
     <string name="menu_search">Search</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_select_none">Nothing selected, the operation is invalid</string>
     <string name="menu_select_title">%d selected</string>
     <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_set_importance">Set importance</string>
     <string name="menu_setting">Settings</string>
     <string name="menu_share">Share</string>
     <string name="menu_sync">Sync</string>
@@ -134,7 +144,7 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        
+     
         <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index bb7fdfc..a69eeea 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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:\GITwork\Notes-master\app\src\main\res"/></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:\GITwork\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\GITwork\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="grassland" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\grassland.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="water" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\water.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\GITwork\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\GITwork\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\GITwork\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\app\src\main\res"/></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:\GITwork\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\GITwork\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="selector_grid" path="D:\GITwork\Notes-master\app\src\main\res\drawable\selector_grid.xml" qualifiers="" type="drawable"/><file name="selector_key_del" path="D:\GITwork\Notes-master\app\src\main\res\drawable\selector_key_del.xml" qualifiers="" type="drawable"/><file name="attention0" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention0.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention1" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention1.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention2" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention2.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention3" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention3.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention4" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention4.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention5" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention5.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_btn_set_color" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="cancel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\cancel.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="grassland" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\grassland.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="lock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\lock.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="water" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\water.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\GITwork\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="current_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\current_password_head.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\GITwork\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="homepage" path="D:\GITwork\Notes-master\app\src\main\res\layout\homepage.xml" qualifiers="" type="layout"/><file name="item_grid" path="D:\GITwork\Notes-master\app\src\main\res\layout\item_grid.xml" qualifiers="" type="layout"/><file name="layout" path="D:\GITwork\Notes-master\app\src\main\res\layout\layout.xml" qualifiers="" type="layout"/><file name="layout2" path="D:\GITwork\Notes-master\app\src\main\res\layout\layout2.xml" qualifiers="" type="layout"/><file name="new_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\new_password_head.xml" qualifiers="" type="layout"/><file name="note_decryption" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_decryption.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_encryption" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_encryption.xml" qualifiers="" type="layout"/><file name="note_encryption_repeat" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_encryption_repeat.xml" qualifiers="" type="layout"/><file name="note_importance" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_importance.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="password_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\password_item.xml" qualifiers="" type="layout"/><file name="repeat_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\repeat_password_head.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\GITwork\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\GITwork\Notes-master\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -7,7 +7,7 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
-    </string-array></file><file path="D:\GITwork\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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="menu_water">Background:water</string><string name="menu_grassland">Background:grassland</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">
+    </string-array></file><file path="D:\GITwork\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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="menu_water">Background:water</string><string name="menu_grassland">Background:grassland</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_encrypt">Encrypt note</string><string name="menu_remove_encrypt">Delete encryption</string><string name="menu_set_importance">Set importance</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="alert_title_encrypt">Encryption</string><string name="alert_message_encrypt">Encrypt note successfully, password is %s</string><string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string><string name="alert_message_decrypt">Decrypt note successfully</string><string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string><string name="alert_message_remove_encrypt">Remove encryption successfully</string><string name="alert_title_importance">Set Importance</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>
@@ -41,12 +41,12 @@
     </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        
+     
         <item name="android:visibility">visible</item>
     </style></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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">
+    </string-array></file><file path="D:\GITwork\Notes-master\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_encrypt">设置密码</string><string name="menu_remove_encrypt">解除密码</string><string name="menu_set_importance">设置便签重要性</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="alert_title_encrypt">密码提示</string><string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string><string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string><string name="alert_message_decrypt">密码输入正确，即将进入便签</string><string name="alert_message_decrypt_error">密码输入错误，请重新输入</string><string name="alert_message_remove_encrypt">解除便签访问密码成功</string><string name="alert_title_importance">设置重要性</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:\GITwork\Notes-master\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index b3f6591..cc50364 100644
--- a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1,9 +1,16 @@
-#Wed Jan 03 15:30:49 CST 2024
+#Thu Jan 04 11:04:33 CST 2024
 net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
 net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/attention0.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention0.png
+net.micode.notes.app-main-5\:/drawable-hdpi/attention1.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention1.png
+net.micode.notes.app-main-5\:/drawable-hdpi/attention2.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention2.png
+net.micode.notes.app-main-5\:/drawable-hdpi/attention3.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention3.png
+net.micode.notes.app-main-5\:/drawable-hdpi/attention4.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention4.png
+net.micode.notes.app-main-5\:/drawable-hdpi/attention5.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention5.png
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
 net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
 net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/cancel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\cancel.png
 net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
 net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
 net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
@@ -47,6 +54,7 @@ net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\
 net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
 net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
 net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/lock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\lock.png
 net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
 net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
 net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
@@ -69,17 +77,31 @@ net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Note
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
 net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
 net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/drawable/selector_grid.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_grid.xml
+net.micode.notes.app-main-5\:/drawable/selector_key_del.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_key_del.xml
 net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
 net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/current_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\current_password_head.xml
 net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
 net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
 net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/homepage.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\homepage.xml
+net.micode.notes.app-main-5\:/layout/item_grid.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\item_grid.xml
+net.micode.notes.app-main-5\:/layout/layout.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\layout.xml
+net.micode.notes.app-main-5\:/layout/layout2.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\layout2.xml
+net.micode.notes.app-main-5\:/layout/new_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\new_password_head.xml
+net.micode.notes.app-main-5\:/layout/note_decryption.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_decryption.xml
 net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
 net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_encryption.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_encryption.xml
+net.micode.notes.app-main-5\:/layout/note_encryption_repeat.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_encryption_repeat.xml
+net.micode.notes.app-main-5\:/layout/note_importance.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_importance.xml
 net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
 net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
 net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
 net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/layout/password_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\password_item.xml
+net.micode.notes.app-main-5\:/layout/repeat_password_head.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\repeat_password_head.xml
 net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
 net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
 net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
index d65e0cc..62b59b7 100644
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -7,10 +7,17 @@
     <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>
+    <string name="alert_message_decrypt">密码输入正确，即将进入便签</string>
+    <string name="alert_message_decrypt_error">密码输入错误，请重新输入</string>
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string>
+    <string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string>
+    <string name="alert_message_remove_encrypt">解除便签访问密码成功</string>
     <string name="alert_title_delete">删除</string>
+    <string name="alert_title_encrypt">密码提示</string>
+    <string name="alert_title_importance">设置重要性</string>
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
@@ -39,6 +46,7 @@
     <string name="menu_create_folder">新建文件夹</string>
     <string name="menu_delete">删除</string>
     <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_encrypt">设置密码</string>
     <string name="menu_export_text">导出文本</string>
     <string name="menu_folder_change_name">修改文件夹名称</string>
     <string name="menu_folder_delete">刪除文件夹</string>
@@ -52,12 +60,14 @@
     <string name="menu_move">移动到文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_encrypt">解除密码</string>
     <string name="menu_remove_remind">删除提醒</string>
     <string name="menu_search">搜索</string>
     <string name="menu_select_all">全选</string>
     <string name="menu_select_none">没有选中项，操作无效</string>
     <string name="menu_select_title">选中了 %d 项</string>
     <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_set_importance">设置便签重要性</string>
     <string name="menu_setting">设置</string>
     <string name="menu_share">分享</string>
     <string name="menu_sync">同步</string>
diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
index 8229fb7..d34d55e 100644
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -21,10 +21,17 @@
         
         <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>
+    <string name="alert_message_decrypt">Decrypt note successfully</string>
+    <string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string>
     <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_encrypt">Encrypt note successfully, password is %s</string>
+    <string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string>
+    <string name="alert_message_remove_encrypt">Remove encryption successfully</string>
     <string name="alert_title_delete">Delete selected notes</string>
+    <string name="alert_title_encrypt">Encryption</string>
+    <string name="alert_title_importance">Set Importance</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -56,6 +63,7 @@
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_encrypt">Encrypt note</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_folder_change_name">Change folder name</string>
     <string name="menu_folder_delete">Delete folder</string>
@@ -70,12 +78,14 @@
     <string name="menu_move">Move to folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_encrypt">Delete encryption</string>
     <string name="menu_remove_remind">Delete reminder</string>
     <string name="menu_search">Search</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_select_none">Nothing selected, the operation is invalid</string>
     <string name="menu_select_title">%d selected</string>
     <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_set_importance">Set importance</string>
     <string name="menu_setting">Settings</string>
     <string name="menu_share">Share</string>
     <string name="menu_sync">Sync</string>
@@ -134,7 +144,7 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        
+     
         <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
index bb7fdfc..a69eeea 100644
--- a/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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:\GITwork\Notes-master\app\src\main\res"/></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:\GITwork\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\GITwork\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="bg_btn_set_color" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="grassland" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\grassland.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="water" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\water.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\GITwork\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\GITwork\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\GITwork\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\app\src\main\res"/></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:\GITwork\Notes-master\app\src\main\res"><file name="primary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\primary_text_dark.xml" qualifiers="" type="color"/><file name="secondary_text_dark" path="D:\GITwork\Notes-master\app\src\main\res\color\secondary_text_dark.xml" qualifiers="" type="color"/><file name="new_note" path="D:\GITwork\Notes-master\app\src\main\res\drawable\new_note.xml" qualifiers="" type="drawable"/><file name="selector_grid" path="D:\GITwork\Notes-master\app\src\main\res\drawable\selector_grid.xml" qualifiers="" type="drawable"/><file name="selector_key_del" path="D:\GITwork\Notes-master\app\src\main\res\drawable\selector_key_del.xml" qualifiers="" type="drawable"/><file name="attention0" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention0.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention1" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention1.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention2" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention2.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention3" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention3.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention4" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention4.png" qualifiers="hdpi-v4" type="drawable"/><file name="attention5" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\attention5.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_btn_set_color" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_btn_set_color.png" qualifiers="hdpi-v4" type="drawable"/><file name="bg_color_btn_mask" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\bg_color_btn_mask.png" qualifiers="hdpi-v4" type="drawable"/><file name="call_record" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\call_record.png" qualifiers="hdpi-v4" type="drawable"/><file name="cancel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\cancel.png" qualifiers="hdpi-v4" type="drawable"/><file name="clock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\clock.png" qualifiers="hdpi-v4" type="drawable"/><file name="delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="dropdown_icon" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\dropdown_icon.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_blue.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_green.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_red.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_title_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_title_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_white.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="edit_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\edit_yellow.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_large" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_large.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_size_selector_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_small" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_small.png" qualifiers="hdpi-v4" type="drawable"/><file name="font_super" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\font_super.png" qualifiers="hdpi-v4" type="drawable"/><file name="grassland" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\grassland.png" qualifiers="hdpi-v4" type="drawable"/><file name="icon_app" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\icon_app.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_background" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_background.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_blue_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_blue_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_folder" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_folder.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_footer_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_footer_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_green_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_green_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_red_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_red_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_white_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_white_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_down" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_down.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_middle" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_middle.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_single" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_single.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="list_yellow_up" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\list_yellow_up.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="lock" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\lock.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_delete" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_delete.png" qualifiers="hdpi-v4" type="drawable"/><file name="menu_move" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\menu_move.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_normal" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_normal.png" qualifiers="hdpi-v4" type="drawable"/><file name="new_note_pressed" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\new_note_pressed.png" qualifiers="hdpi-v4" type="drawable"/><file name="note_edit_color_selector_panel" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png" qualifiers="hdpi-v4" type="drawable"/><file name="notification" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\notification.png" qualifiers="hdpi-v4" type="drawable"/><file name="search_result" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\search_result.png" qualifiers="hdpi-v4" type="drawable"/><file name="selected" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\selected.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_alert" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_alert.png" qualifiers="hdpi-v4" type="drawable"/><file name="title_bar_bg" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\title_bar_bg.9.png" qualifiers="hdpi-v4" type="drawable"/><file name="water" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\water.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_2x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_2x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_blue" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_blue.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_green" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_green.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_red" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_red.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_white" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_white.png" qualifiers="hdpi-v4" type="drawable"/><file name="widget_4x_yellow" path="D:\GITwork\Notes-master\app\src\main\res\drawable-hdpi\widget_4x_yellow.png" qualifiers="hdpi-v4" type="drawable"/><file name="account_dialog_title" path="D:\GITwork\Notes-master\app\src\main\res\layout\account_dialog_title.xml" qualifiers="" type="layout"/><file name="add_account_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\add_account_text.xml" qualifiers="" type="layout"/><file name="current_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\current_password_head.xml" qualifiers="" type="layout"/><file name="datetime_picker" path="D:\GITwork\Notes-master\app\src\main\res\layout\datetime_picker.xml" qualifiers="" type="layout"/><file name="dialog_edit_text" path="D:\GITwork\Notes-master\app\src\main\res\layout\dialog_edit_text.xml" qualifiers="" type="layout"/><file name="folder_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\folder_list_item.xml" qualifiers="" type="layout"/><file name="homepage" path="D:\GITwork\Notes-master\app\src\main\res\layout\homepage.xml" qualifiers="" type="layout"/><file name="item_grid" path="D:\GITwork\Notes-master\app\src\main\res\layout\item_grid.xml" qualifiers="" type="layout"/><file name="layout" path="D:\GITwork\Notes-master\app\src\main\res\layout\layout.xml" qualifiers="" type="layout"/><file name="layout2" path="D:\GITwork\Notes-master\app\src\main\res\layout\layout2.xml" qualifiers="" type="layout"/><file name="new_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\new_password_head.xml" qualifiers="" type="layout"/><file name="note_decryption" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_decryption.xml" qualifiers="" type="layout"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit.xml" qualifiers="" type="layout"/><file name="note_edit_list_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_edit_list_item.xml" qualifiers="" type="layout"/><file name="note_encryption" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_encryption.xml" qualifiers="" type="layout"/><file name="note_encryption_repeat" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_encryption_repeat.xml" qualifiers="" type="layout"/><file name="note_importance" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_importance.xml" qualifiers="" type="layout"/><file name="note_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_item.xml" qualifiers="" type="layout"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list.xml" qualifiers="" type="layout"/><file name="note_list_dropdown_menu" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_dropdown_menu.xml" qualifiers="" type="layout"/><file name="note_list_footer" path="D:\GITwork\Notes-master\app\src\main\res\layout\note_list_footer.xml" qualifiers="" type="layout"/><file name="password_item" path="D:\GITwork\Notes-master\app\src\main\res\layout\password_item.xml" qualifiers="" type="layout"/><file name="repeat_password_head" path="D:\GITwork\Notes-master\app\src\main\res\layout\repeat_password_head.xml" qualifiers="" type="layout"/><file name="settings_header" path="D:\GITwork\Notes-master\app\src\main\res\layout\settings_header.xml" qualifiers="" type="layout"/><file name="widget_2x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_2x.xml" qualifiers="" type="layout"/><file name="widget_4x" path="D:\GITwork\Notes-master\app\src\main\res\layout\widget_4x.xml" qualifiers="" type="layout"/><file name="call_note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_note_edit.xml" qualifiers="" type="menu"/><file name="call_record_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\call_record_folder.xml" qualifiers="" type="menu"/><file name="note_edit" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_edit.xml" qualifiers="" type="menu"/><file name="note_list" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list.xml" qualifiers="" type="menu"/><file name="note_list_dropdown" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_dropdown.xml" qualifiers="" type="menu"/><file name="note_list_options" path="D:\GITwork\Notes-master\app\src\main\res\menu\note_list_options.xml" qualifiers="" type="menu"/><file name="sub_folder" path="D:\GITwork\Notes-master\app\src\main\res\menu\sub_folder.xml" qualifiers="" type="menu"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw\introduction" qualifiers="" type="raw"/><file name="introduction" path="D:\GITwork\Notes-master\app\src\main\res\raw-zh-rCN\introduction" qualifiers="zh-rCN" type="raw"/><file path="D:\GITwork\Notes-master\app\src\main\res\values\arrays.xml" qualifiers=""><string-array name="format_for_exported_note">
         <item>-%s</item>      
         <item>--%s</item>     
         <item>--%s</item>     
@@ -7,7 +7,7 @@
     </string-array><string-array name="menu_share_ways">
         <item>Messaging</item>
         <item>Email</item>
-    </string-array></file><file path="D:\GITwork\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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="menu_water">Background:water</string><string name="menu_grassland">Background:grassland</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">
+    </string-array></file><file path="D:\GITwork\Notes-master\app\src\main\res\values\colors.xml" qualifiers=""><color name="user_query_highlight">#335b5b5b</color></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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="menu_water">Background:water</string><string name="menu_grassland">Background:grassland</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_encrypt">Encrypt note</string><string name="menu_remove_encrypt">Delete encryption</string><string name="menu_set_importance">Set importance</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="alert_title_encrypt">Encryption</string><string name="alert_message_encrypt">Encrypt note successfully, password is %s</string><string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string><string name="alert_message_decrypt">Decrypt note successfully</string><string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string><string name="alert_message_remove_encrypt">Remove encryption successfully</string><string name="alert_title_importance">Set Importance</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>
@@ -41,12 +41,12 @@
     </style><style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
     </style><style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        
+     
         <item name="android:visibility">visible</item>
     </style></file><file path="D:\GITwork\Notes-master\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:\GITwork\Notes-master\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">
+    </string-array></file><file path="D:\GITwork\Notes-master\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_encrypt">设置密码</string><string name="menu_remove_encrypt">解除密码</string><string name="menu_set_importance">设置便签重要性</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="alert_title_encrypt">密码提示</string><string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string><string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string><string name="alert_message_decrypt">密码输入正确，即将进入便签</string><string name="alert_message_decrypt_error">密码输入错误，请重新输入</string><string name="alert_message_remove_encrypt">解除便签访问密码成功</string><string name="alert_title_importance">设置重要性</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:\GITwork\Notes-master\app\src\main\res\values-zh-rTW\arrays.xml" qualifiers="zh-rTW"><string-array name="menu_share_ways">
         <item>短信</item>
diff --git a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
index 002557a..819e204 100644
--- a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Jan 02 11:56:24 CST 2024
+#Tue Jan 02 21:32:03 CST 2024
diff --git a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
index ea43532..a21c69c 100644
--- a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -1,2 +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:\GITwork\Notes-master\app\src\androidTest\res"/></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:\GITwork\Notes-master\app\src\androidTest\res"/></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:\GITwork\Notes-master\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:\GITwork\Notes-master\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:!*~"><source path="D:\GITwork\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><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:!*~"><source path="D:\GITwork\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
\ No newline at end of file
+<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:\rjgc\Notes-master\app\src\androidTest\res"/></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:\rjgc\Notes-master\app\src\androidTest\res"/></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:\rjgc\Notes-master\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:\rjgc\Notes-master\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:!*~"><source path="D:\rjgc\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><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:!*~"><source path="D:\rjgc\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
index 390a131..00d059e 100644
--- a/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
index 55a54ed..8380ec0 100644
--- a/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
index 61c3e4a..42bb619 100644
--- a/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\GITwork\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
\ No newline at end of file
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\rjgc\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 47920fd..244a662 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Wed Jan 03 15:44:52 CST 2024
+#Thu Jan 04 11:04:55 CST 2024
 base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 6d9d2fa..28bd9c2 100644
Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index f60d74f..9e631ed 100644
--- a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Tue Jan 02 11:56:35 CST 2024
-base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
-path.0=classes.dex
+#Tue Jan 02 21:37:45 CST 2024
+base.0=D\:\\rjgc\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
 renamed.0=classes.dex
+path.0=classes.dex
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
index 42394b7..c7c17ff 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class
index 36c8d49..52eca88 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
index 42461a2..c895fb0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
index 0b075b4..509ee79 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class
index c40e945..f208d3a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class
index d2041cc..e77f07b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index df71afc..5450f74 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 415e755..76632e0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 71e5215..4e9abab 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index ddd74fd..7c91e67 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 54e7df6..edac9e7 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index fad3442..ee7a9f8 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 023f716..a99161c 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 5416cd3..e20c1c6 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class
new file mode 100644
index 0000000..a520d70
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class
new file mode 100644
index 0000000..14d27bf
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class
new file mode 100644
index 0000000..099b2d4
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class
new file mode 100644
index 0000000..81b638d
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index bb9f786..6ccff1b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 961f2f4..5d2dbe0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
new file mode 100644
index 0000000..59e00d0
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
new file mode 100644
index 0000000..75848fd
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class
new file mode 100644
index 0000000..0037576
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class
new file mode 100644
index 0000000..9ed965c
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class
new file mode 100644
index 0000000..8dcf8a4
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class
new file mode 100644
index 0000000..2100294
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class
new file mode 100644
index 0000000..cef01b8
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 8e1f0bf..8a196c3 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class
new file mode 100644
index 0000000..47ba944
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class
new file mode 100644
index 0000000..30a9e9f
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 7d0a456..73db7a9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index 2040186..fbeff49 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 3a19d3b..e0eea60 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index 771aa91..30945a9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 14805a4..7e8ab9f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index f452595..555e10f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index ac00dce..fa03692 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 49a0a54..6ec9127 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index c192db7..11f13f8 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index e4866ff..bc414a3 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 13d127c..8473298 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index bc20ccf..e090061 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 47dabba..8f35f1e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 2b3227b..aa43949 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 6e4ee29..6b4f61a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 4596834..91b527f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class
new file mode 100644
index 0000000..006dde2
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class
new file mode 100644
index 0000000..22a362d
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class
new file mode 100644
index 0000000..0f2145c
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class
new file mode 100644
index 0000000..c1fa846
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class
new file mode 100644
index 0000000..c830df2
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class
new file mode 100644
index 0000000..9c020b4
Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class differ
diff --git a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
index b9cb18c..1eea1a3 100644
--- a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
+++ b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -10,9 +10,16 @@ dimen text_font_size_medium
 dimen text_font_size_normal
 dimen text_font_size_small
 dimen text_font_size_super
+drawable attention0
+drawable attention1
+drawable attention2
+drawable attention3
+drawable attention4
+drawable attention5
 drawable bg_btn_set_color
 drawable bg_color_btn_mask
 drawable call_record
+drawable cancel
 drawable clock
 drawable delete
 drawable dropdown_icon
@@ -56,6 +63,7 @@ drawable list_yellow_down
 drawable list_yellow_middle
 drawable list_yellow_single
 drawable list_yellow_up
+drawable lock
 drawable menu_delete
 drawable menu_move
 drawable new_note
@@ -65,6 +73,8 @@ drawable note_edit_color_selector_panel
 drawable notification
 drawable search_result
 drawable selected
+drawable selector_grid
+drawable selector_key_del
 drawable title_alert
 drawable title_bar_bg
 drawable water
@@ -78,10 +88,24 @@ drawable widget_4x_green
 drawable widget_4x_red
 drawable widget_4x_white
 drawable widget_4x_yellow
+id Blue
+id Button01
+id Button02
+id Button03
+id Button04
+id Button06
+id Button07
+id Button08
+id ButtonR
+id Green
+id Red
+id TableLayout01
+id TableLayout02
 id account_dialog_subtitle
 id account_dialog_title
 id action_select_all
 id amPm
+id btn_keys
 id btn_new_note
 id btn_set_bg_color
 id cb_edit_item
@@ -90,7 +114,9 @@ id delete
 id et_edit_text
 id et_foler_name
 id font_size_selector
+id gv_keyboard
 id hour
+id img_cancel
 id iv_alert_icon
 id iv_bg_blue
 id iv_bg_blue_select
@@ -102,25 +128,31 @@ id iv_bg_white
 id iv_bg_white_select
 id iv_bg_yellow
 id iv_bg_yellow_select
+id iv_importance
 id iv_large_select
+id iv_lock_icon
 id iv_medium_select
 id iv_small_select
 id iv_super_select
+id linear_pass
 id ll_font_large
 id ll_font_normal
 id ll_font_small
 id ll_font_super
 id menu_alert
 id menu_delete
+id menu_delete_encrypt
 id menu_delete_remind
+id menu_encrypt
 id menu_export_text
 id menu_font_size
-id menu_grass
+id menu_grassland
 id menu_list_mode
 id menu_new_folder
 id menu_new_note
 id menu_search
 id menu_send_to_desktop
+id menu_set_importance
 id menu_setting
 id menu_share
 id menu_sync
@@ -129,6 +161,7 @@ id minute
 id move
 id navigation_bar
 id note_bg_color_selector
+id note_decryption
 id note_edit_list
 id note_edit_view
 id note_item
@@ -136,12 +169,18 @@ id note_title
 id notes_list
 id prefenerece_sync_status_textview
 id preference_sync_button
+id ratingBar
 id selection_menu
 id sv_note_edit
+id textCount
 id tv_alert_date
 id tv_folder_name
 id tv_modified_date
 id tv_name
+id tv_pass1
+id tv_pass2
+id tv_pass3
+id tv_pass4
 id tv_time
 id tv_title
 id tv_title_bar
@@ -149,15 +188,27 @@ id widget_bg_image
 id widget_text
 layout account_dialog_title
 layout add_account_text
+layout current_password_head
 layout datetime_picker
 layout dialog_edit_text
 layout folder_list_item
+layout homepage
+layout item_grid
+layout layout
+layout layout2
+layout new_password_head
+layout note_decryption
 layout note_edit
 layout note_edit_list_item
+layout note_encryption
+layout note_encryption_repeat
+layout note_importance
 layout note_item
 layout note_list
 layout note_list_dropdown_menu
 layout note_list_footer
+layout password_item
+layout repeat_password_head
 layout settings_header
 layout widget_2x
 layout widget_4x
@@ -170,10 +221,17 @@ menu note_list_options
 menu sub_folder
 plurals search_results_title
 raw introduction
+string alert_message_decrypt
+string alert_message_decrypt_error
 string alert_message_delete_folder
 string alert_message_delete_note
 string alert_message_delete_notes
+string alert_message_encrypt
+string alert_message_encrypt_error
+string alert_message_remove_encrypt
 string alert_title_delete
+string alert_title_encrypt
+string alert_title_importance
 string app_name
 string app_widget2x2
 string app_widget4x4
@@ -205,6 +263,7 @@ string menu_alert
 string menu_create_folder
 string menu_delete
 string menu_deselect_all
+string menu_encrypt
 string menu_export_text
 string menu_folder_change_name
 string menu_folder_delete
@@ -219,12 +278,14 @@ string menu_list_mode
 string menu_move
 string menu_move_parent_folder
 string menu_normal_mode
+string menu_remove_encrypt
 string menu_remove_remind
 string menu_search
 string menu_select_all
 string menu_select_none
 string menu_select_title
 string menu_send_to_desktop
+string menu_set_importance
 string menu_setting
 string menu_share
 string menu_sync
diff --git a/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index 033a64c..cccaa42 100644
--- a/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,32 +3,32 @@
 3    package="net.micode.notes.test" >
 4
 5    <uses-sdk
-5-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:5:5-74
+5-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:5-74
 6        android:minSdkVersion="14"
-6-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:5:15-41
+6-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:15-41
 7        android:targetSdkVersion="14" />
-7-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:5:42-71
+7-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:11:5-15:66
+9-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:11:5-15:66
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:11:22-75
+10-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:14:22-52
+11-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:13:22-53
+12-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:13:22-53
 13        android:label="Tests for net.micode.notes"
-13-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:15:22-64
+13-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:15:22-64
 14        android:targetPackage="net.micode.notes" />
-14-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:12:22-62
+14-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:12:22-62
 15
 16    <application
-16-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:7:5-9:19
+16-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:7:5-9:19
 17        android:debuggable="true"
 18        android:extractNativeLibs="true" >
 19        <uses-library android:name="android.test.runner" />
-19-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:8:9-60
-19-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest11240119434451274919.xml:8:23-57
+19-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:8:9-60
+19-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:8:23-57
 20    </application>
 21
 22</manifest>
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat
new file mode 100644
index 0000000..fea5e17
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat
new file mode 100644
index 0000000..f3a4b9a
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat
new file mode 100644
index 0000000..c938ef2
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat
new file mode 100644
index 0000000..b044ed9
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat
new file mode 100644
index 0000000..dbce709
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat
new file mode 100644
index 0000000..f5dfbbf
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat
new file mode 100644
index 0000000..0575146
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat
new file mode 100644
index 0000000..3c23d85
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat b/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat
new file mode 100644
index 0000000..eb5b9b5
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat b/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat
new file mode 100644
index 0000000..d9fb1d5
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
index 1bbe3ab..8524c9a 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat
new file mode 100644
index 0000000..4fa0b00
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat b/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat
new file mode 100644
index 0000000..6d0ce29
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat b/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat
new file mode 100644
index 0000000..768661c
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_layout.xml.flat b/app/build/intermediates/merged_res/debug/layout_layout.xml.flat
new file mode 100644
index 0000000..be91098
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_layout.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat b/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat
new file mode 100644
index 0000000..e30271e
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat
new file mode 100644
index 0000000..a7ded6e
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat
new file mode 100644
index 0000000..b038695
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 6c97e3d..a1c9d31 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat
new file mode 100644
index 0000000..1c265bf
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat
new file mode 100644
index 0000000..cf0f91d
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat
new file mode 100644
index 0000000..4761e49
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
index 1c3342f..3e715de 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index 0dd3545..4f0f76d 100644
Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat
new file mode 100644
index 0000000..ed11ce6
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat
new file mode 100644
index 0000000..d9c5bf0
Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index c025a60..ab91948 100644
Binary files a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index be64492..f976c04 100644
Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index 68b46ae..00291c5 100644
Binary files a/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index 4e7bd33..3042a03 100644
Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index c3a2160..fd29e9b 100644
Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index dc10246..dd83a9c 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -25,20 +25,20 @@
                 {
                     "source": "D:\\GITwork\\Notes-master\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "startLines": "136,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "7681,4303,4368,3926,3859,3785,4155,4225,4438,3734,4101,4509,846,887,936,7223,7269,7626,7575,1225,4966,5035,4906,4840,4776,5710,5649,5585,5169,2937,1398,1452,5224,4668,7327,3674,3097,1836,2123,2374,3295,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3614,2717,3342,3141,2079,2326,2269,2213,3041,3396,2034,2998,1941,1983,3554,1346,1657,1755,1609,1707,1561,1515,1173,1119,6092,6032,6235,7148,6551,6481,6616,6695,6880,6806,6168,6425,6293,6359,5982,6985,7069,7536,7427,7378,7473,1288,5113,5525,5825,5766,5893,5476,5430,5381,5329,985,1052",
+                        "endLines": "138,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23",
+                        "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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": "7855,4362,4432,3994,3920,3853,4219,4297,4501,3779,4149,4561,881,930,979,7263,7321,7675,7620,1282,5029,5107,4960,4900,4834,5760,5704,5643,5218,2992,1446,1509,5304,4744,7372,3728,3135,1884,2161,2420,3336,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3668,2764,3390,3188,2117,2368,2320,2263,3091,3447,2073,3035,1977,2028,3608,1392,1701,1799,1651,1749,1603,1555,1219,1167,6162,6086,6287,7217,6610,6545,6689,6800,6979,6874,6229,6475,6353,6419,6026,7063,7142,7569,7467,7421,7530,1340,5163,5579,5887,5819,5950,5519,5470,5424,5375,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"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,448,517,590,656,729,798,875,943,993,1046,1103,1143,1191,1239,1284,1341,1395,1445,1507,1575,1652,1711,1776,1839,1894,1954,2017,2071,2131,2184,2246,2331,2412,2462,2521,2564,2617,2660,2711,2757,2807,2867,2920,2971,3017,3065,3113,3159,3206,3256,3301,3360,3412,3465,3517,3560,3607,3663,3718,3773,3829,3873,3915,3956,4006,4065,4116,4165,4214,4261,4308,4355,4400,4451,4504,4579,4638,4695,4769,4833,4902,4980,5090,5194,5267,5333,5388,5453,5518,5567,5650,5728,5766,5811,5859,5921,5978,6033,6092,6159,6217,6279,6327,6372,6420,6471,6537",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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,443,512,585,651,724,793,870,938,988,1041,1098,1138,1186,1234,1279,1336,1390,1440,1502,1570,1647,1706,1771,1834,1889,1949,2012,2066,2126,2179,2241,2326,2407,2457,2516,2559,2612,2655,2706,2752,2802,2862,2915,2966,3012,3060,3108,3154,3201,3251,3296,3355,3407,3460,3512,3555,3602,3658,3713,3768,3824,3868,3910,3951,4001,4060,4111,4160,4209,4256,4303,4350,4395,4446,4499,4574,4633,4690,4764,4828,4897,4975,5085,5189,5262,5328,5383,5448,5513,5562,5645,5723,5761,5806,5854,5916,5973,6028,6087,6154,6212,6274,6322,6367,6415,6466,6532,6598"
                     }
                 }
             ]
@@ -51,18 +51,18 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2861,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "137,141,145,149,152,156,160,164,168,172,176",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8244,8448,8659,8832,8992,9175,9360,9545,9748,9954,10137",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "9023,9227,9438,9608,9768,9951,10136,10321,10524,10730,10913",
+                        "endLines": "140,144,148,151,155,159,163,167,171,175,179",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8443,8654,8827,8987,9170,9355,9540,9743,9949,10132,10333"
+                        "endOffsets": "9222,9433,9603,9763,9946,10131,10316,10519,10725,10908,11109"
                     }
                 },
                 {
@@ -70,9 +70,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",
@@ -87,10 +87,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -104,20 +104,20 @@
                 {
                     "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8155,4045,4306,4210,4141,827,870,922,7653,7702,8097,8046,1282,4760,4854,4689,4605,4522,5721,5638,5536,5030,2004,1953,3544,1486,1539,5091,2244,4389,7765,3974,3729,2303,2618,2919,2361,3473,3412,3355,3133,3081,2978,3031,3183,2146,3233,2665,3908,3293,3778,2571,2864,2776,2718,3667,2521,3622,2418,2461,3841,2090,1431,1750,1858,1703,1805,1647,1599,1227,1174,6177,6110,6418,7556,6782,6701,6856,6945,7187,7108,6261,6336,6642,6482,6562,6055,7331,7453,8005,7878,7821,7931,1366,4962,5450,5856,5787,5936,5391,5336,5274,5214,974,1084",
-                        "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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": "8559,4136,4384,4301,4205,865,917,969,7697,7760,8150,8092,1361,4849,4957,4755,4684,4600,5782,5716,5633,5086,2061,1999,3617,1534,1594,5191,2298,4486,7815,4040,3773,2356,2660,2973,2413,3539,3468,3407,3178,3128,3026,3076,3228,2205,3288,2713,3969,3350,3836,2613,2914,2859,2771,3724,2566,3662,2456,2516,3903,2141,1481,1800,1906,1745,1853,1698,1642,1277,1222,6256,6172,6477,7647,6851,6777,6940,7103,7326,7182,6331,6413,6696,6557,6637,6105,7448,7551,8041,7926,7873,8000,1426,5025,5531,5931,5851,6025,5445,5386,5331,5269,1079,1169"
+                        "startLines": "151,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "9502,5244,5321,4529,4793,4696,5038,5131,5425,4626,4978,5516,846,890,943,8990,9040,9443,9391,1308,6060,6155,5988,5903,5819,7034,6950,6847,6333,2043,1991,3630,1515,1569,6395,2307,5684,9104,4457,3818,2367,2688,2994,4033,2426,3558,3496,3438,3212,3159,3054,3108,3263,2206,3314,2736,4390,3375,4088,3868,2640,2938,2849,2790,3755,4157,2589,3709,2484,2528,4322,2149,1459,1784,1894,1736,1840,1679,1630,1252,1198,7497,7429,7741,8891,8110,8028,8185,8275,8519,8439,7582,7658,7968,7806,7887,7373,8664,8787,9349,9220,9162,9274,1393,6264,6760,7171,7101,7252,6700,6644,6581,6520,996,1107",
+                        "endLines": "155,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23",
+                        "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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": "9910,5315,5419,4620,4871,4787,5125,5238,5508,4690,5032,5577,884,937,990,9034,9098,9496,9437,1387,6149,6258,6054,5982,5897,7095,7028,6944,6389,2100,2037,3703,1563,1624,6495,2361,5781,9154,4523,3862,2420,2730,3048,4082,2478,3624,3552,3490,3257,3206,3102,3153,3308,2265,3369,2784,4451,3432,4149,3926,2682,2988,2932,2843,3812,4215,2634,3749,2522,2583,4384,2200,1509,1834,1942,1778,1888,1730,1673,1302,1246,7576,7491,7800,8982,8179,8104,8269,8433,8658,8513,7652,7735,8022,7881,7962,7423,8781,8885,9385,9268,9214,9343,1453,6327,6841,7246,7165,7341,6754,6694,6638,6575,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,125,126",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4114,4174,4227,4293,4355,4418,4465,4520,4608,4666,4728,4778,4823,4866,4926,4993,5049,5104,5159,5212,5259,5312,5368,5416,5471,5524,5608,5675,5739,5835,5909,5990,6079,6242,6386,6465,6540,6622,6681,6761,6841,6896,7018,7121,7162,7215,7272,7346,7411,7479,7565,7645,7714,7808,7867,7922,7984,8044,8154",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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,4109,4169,4222,4288,4350,4413,4460,4515,4603,4661,4723,4773,4818,4861,4921,4988,5044,5099,5154,5207,5254,5307,5363,5411,5466,5519,5603,5670,5734,5830,5904,5985,6074,6237,6381,6460,6535,6617,6676,6756,6836,6891,7013,7116,7157,7210,7267,7341,7406,7474,7560,7640,7709,7803,7862,7917,7979,8039,8149,8239"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1168,1271,1367,1450,1546,1638,1750,1838,1907,1966,2032,2075,2127,2179,2228,2291,2349,2400,2484,2578,2686,2757,2841,2924,2990,3073,3175,3236,3298,3349,3427,3480,3540,3645,3704,3806,3861,3932,3981,4039,4086,4145,4199,4256,4327,4388,4445,4495,4547,4600,4650,4700,4764,4824,4877,4943,5005,5071,5134,5181,5236,5324,5382,5444,5507,5557,5602,5645,5705,5772,5828,5883,5938,5991,6038,6091,6147,6195,6250,6303,6387,6454,6518,6614,6688,6769,6858,7021,7165,7244,7319,7401,7460,7540,7620,7675,7797,7900,7941,7994,8051,8125,8190,8258,8344,8424,8493,8587,8646,8701,8763,8823,8933",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+                        "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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,1163,1266,1362,1445,1541,1633,1745,1833,1902,1961,2027,2070,2122,2174,2223,2286,2344,2395,2479,2573,2681,2752,2836,2919,2985,3068,3170,3231,3293,3344,3422,3475,3535,3640,3699,3801,3856,3927,3976,4034,4081,4140,4194,4251,4322,4383,4440,4490,4542,4595,4645,4695,4759,4819,4872,4938,5000,5066,5129,5176,5231,5319,5377,5439,5502,5552,5597,5640,5700,5767,5823,5878,5933,5986,6033,6086,6142,6190,6245,6298,6382,6449,6513,6609,6683,6764,6853,7016,7160,7239,7314,7396,7455,7535,7615,7670,7792,7895,7936,7989,8046,8120,8185,8253,8339,8419,8488,8582,8641,8696,8758,8818,8928,9018"
                     }
                 },
                 {
@@ -125,9 +125,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
@@ -147,10 +147,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "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",
@@ -166,10 +166,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index aa64649..7b5723a 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
@@ -25,20 +25,20 @@
                 {
                     "source": "D:\\GITwork\\Notes-master\\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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
+                        "startLines": "136,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "7681,4303,4368,3926,3859,3785,4155,4225,4438,3734,4101,4509,846,887,936,7223,7269,7626,7575,1225,4966,5035,4906,4840,4776,5710,5649,5585,5169,2937,1398,1452,5224,4668,7327,3674,3097,1836,2123,2374,3295,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3614,2717,3342,3141,2079,2326,2269,2213,3041,3396,2034,2998,1941,1983,3554,1346,1657,1755,1609,1707,1561,1515,1173,1119,6092,6032,6235,7148,6551,6481,6616,6695,6880,6806,6168,6425,6293,6359,5982,6985,7069,7536,7427,7378,7473,1288,5113,5525,5825,5766,5893,5476,5430,5381,5329,985,1052",
+                        "endLines": "138,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23",
+                        "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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": "7855,4362,4432,3994,3920,3853,4219,4297,4501,3779,4149,4561,881,930,979,7263,7321,7675,7620,1282,5029,5107,4960,4900,4834,5760,5704,5643,5218,2992,1446,1509,5304,4744,7372,3728,3135,1884,2161,2420,3336,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3668,2764,3390,3188,2117,2368,2320,2263,3091,3447,2073,3035,1977,2028,3608,1392,1701,1799,1651,1749,1603,1555,1219,1167,6162,6086,6287,7217,6610,6545,6689,6800,6979,6874,6229,6475,6353,6419,6026,7063,7142,7569,7467,7421,7530,1340,5163,5579,5887,5819,5950,5519,5470,5424,5375,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"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,448,517,590,656,729,798,875,943,993,1046,1103,1143,1191,1239,1284,1341,1395,1445,1507,1575,1652,1711,1776,1839,1894,1954,2017,2071,2131,2184,2246,2331,2412,2462,2521,2564,2617,2660,2711,2757,2807,2867,2920,2971,3017,3065,3113,3159,3206,3256,3301,3360,3412,3465,3517,3560,3607,3663,3718,3773,3829,3873,3915,3956,4006,4065,4116,4165,4214,4261,4308,4355,4400,4451,4504,4579,4638,4695,4769,4833,4902,4980,5090,5194,5267,5333,5388,5453,5518,5567,5650,5728,5766,5811,5859,5921,5978,6033,6092,6159,6217,6279,6327,6372,6420,6471,6537",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116",
+                        "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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,443,512,585,651,724,793,870,938,988,1041,1098,1138,1186,1234,1279,1336,1390,1440,1502,1570,1647,1706,1771,1834,1889,1949,2012,2066,2126,2179,2241,2326,2407,2457,2516,2559,2612,2655,2706,2752,2802,2862,2915,2966,3012,3060,3108,3154,3201,3251,3296,3355,3407,3460,3512,3555,3602,3658,3713,3768,3824,3868,3910,3951,4001,4060,4111,4160,4209,4256,4303,4350,4395,4446,4499,4574,4633,4690,4764,4828,4897,4975,5085,5189,5262,5328,5383,5448,5513,5562,5645,5723,5761,5806,5854,5916,5973,6028,6087,6154,6212,6274,6322,6367,6415,6466,6532,6598"
                     }
                 }
             ]
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 7247bfb..3151c97 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -8,10 +8,10 @@
                     "from": {
                         "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "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",
@@ -27,10 +27,10 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endLines": "21",
                         "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                     },
                     "to": {
                         "startLines": "2",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index 4b7e147..2fb6e4f 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -8,18 +8,18 @@
                     "from": {
                         "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                         "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2861,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104"
                     },
                     "to": {
-                        "startLines": "127,131,135,139,142,146,150,154,158,162,166",
+                        "startLines": "137,141,145,149,152,156,160,164,168,172,176",
                         "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8244,8448,8659,8832,8992,9175,9360,9545,9748,9954,10137",
-                        "endLines": "130,134,138,141,145,149,153,157,161,165,169",
+                        "startOffsets": "9023,9227,9438,9608,9768,9951,10136,10321,10524,10730,10913",
+                        "endLines": "140,144,148,151,155,159,163,167,171,175,179",
                         "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8443,8654,8827,8987,9170,9355,9540,9743,9949,10132,10333"
+                        "endOffsets": "9222,9433,9603,9763,9946,10131,10316,10519,10725,10908,11109"
                     }
                 },
                 {
@@ -27,9 +27,9 @@
                     "from": {
                         "startLines": "18",
                         "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                         "endColumns": "56",
-                        "endOffsets": "764"
+                        "endOffsets": "782"
                     },
                     "to": {
                         "startLines": "12",
@@ -44,10 +44,10 @@
                     "from": {
                         "startLines": "19,26",
                         "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                         "endLines": "24,29",
                         "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                     },
                     "to": {
                         "startLines": "2,8",
@@ -61,20 +61,20 @@
                 {
                     "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                     "from": {
-                        "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8155,4045,4306,4210,4141,827,870,922,7653,7702,8097,8046,1282,4760,4854,4689,4605,4522,5721,5638,5536,5030,2004,1953,3544,1486,1539,5091,2244,4389,7765,3974,3729,2303,2618,2919,2361,3473,3412,3355,3133,3081,2978,3031,3183,2146,3233,2665,3908,3293,3778,2571,2864,2776,2718,3667,2521,3622,2418,2461,3841,2090,1431,1750,1858,1703,1805,1647,1599,1227,1174,6177,6110,6418,7556,6782,6701,6856,6945,7187,7108,6261,6336,6642,6482,6562,6055,7331,7453,8005,7878,7821,7931,1366,4962,5450,5856,5787,5936,5391,5336,5274,5214,974,1084",
-                        "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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": "8559,4136,4384,4301,4205,865,917,969,7697,7760,8150,8092,1361,4849,4957,4755,4684,4600,5782,5716,5633,5086,2061,1999,3617,1534,1594,5191,2298,4486,7815,4040,3773,2356,2660,2973,2413,3539,3468,3407,3178,3128,3026,3076,3228,2205,3288,2713,3969,3350,3836,2613,2914,2859,2771,3724,2566,3662,2456,2516,3903,2141,1481,1800,1906,1745,1853,1698,1642,1277,1222,6256,6172,6477,7647,6851,6777,6940,7103,7326,7182,6331,6413,6696,6557,6637,6105,7448,7551,8041,7926,7873,8000,1426,5025,5531,5931,5851,6025,5445,5386,5331,5269,1079,1169"
+                        "startLines": "151,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "9502,5244,5321,4529,4793,4696,5038,5131,5425,4626,4978,5516,846,890,943,8990,9040,9443,9391,1308,6060,6155,5988,5903,5819,7034,6950,6847,6333,2043,1991,3630,1515,1569,6395,2307,5684,9104,4457,3818,2367,2688,2994,4033,2426,3558,3496,3438,3212,3159,3054,3108,3263,2206,3314,2736,4390,3375,4088,3868,2640,2938,2849,2790,3755,4157,2589,3709,2484,2528,4322,2149,1459,1784,1894,1736,1840,1679,1630,1252,1198,7497,7429,7741,8891,8110,8028,8185,8275,8519,8439,7582,7658,7968,7806,7887,7373,8664,8787,9349,9220,9162,9274,1393,6264,6760,7171,7101,7252,6700,6644,6581,6520,996,1107",
+                        "endLines": "155,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23",
+                        "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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": "9910,5315,5419,4620,4871,4787,5125,5238,5508,4690,5032,5577,884,937,990,9034,9098,9496,9437,1387,6149,6258,6054,5982,5897,7095,7028,6944,6389,2100,2037,3703,1563,1624,6495,2361,5781,9154,4523,3862,2420,2730,3048,4082,2478,3624,3552,3490,3257,3206,3102,3153,3308,2265,3369,2784,4451,3432,4149,3926,2682,2988,2932,2843,3812,4215,2634,3749,2522,2583,4384,2200,1509,1834,1942,1778,1888,1730,1673,1302,1246,7576,7491,7800,8982,8179,8104,8269,8433,8658,8513,7652,7735,8022,7881,7962,7423,8781,8885,9385,9268,9214,9343,1453,6327,6841,7246,7165,7341,6754,6694,6638,6575,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,125,126",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4114,4174,4227,4293,4355,4418,4465,4520,4608,4666,4728,4778,4823,4866,4926,4993,5049,5104,5159,5212,5259,5312,5368,5416,5471,5524,5608,5675,5739,5835,5909,5990,6079,6242,6386,6465,6540,6622,6681,6761,6841,6896,7018,7121,7162,7215,7272,7346,7411,7479,7565,7645,7714,7808,7867,7922,7984,8044,8154",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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,4109,4169,4222,4288,4350,4413,4460,4515,4603,4661,4723,4773,4818,4861,4921,4988,5044,5099,5154,5207,5254,5307,5363,5411,5466,5519,5603,5670,5734,5830,5904,5985,6074,6237,6381,6460,6535,6617,6676,6756,6836,6891,7013,7116,7157,7210,7267,7341,7406,7474,7560,7640,7709,7803,7862,7917,7979,8039,8149,8239"
+                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "739,1092,1168,1271,1367,1450,1546,1638,1750,1838,1907,1966,2032,2075,2127,2179,2228,2291,2349,2400,2484,2578,2686,2757,2841,2924,2990,3073,3175,3236,3298,3349,3427,3480,3540,3645,3704,3806,3861,3932,3981,4039,4086,4145,4199,4256,4327,4388,4445,4495,4547,4600,4650,4700,4764,4824,4877,4943,5005,5071,5134,5181,5236,5324,5382,5444,5507,5557,5602,5645,5705,5772,5828,5883,5938,5991,6038,6091,6147,6195,6250,6303,6387,6454,6518,6614,6688,6769,6858,7021,7165,7244,7319,7401,7460,7540,7620,7675,7797,7900,7941,7994,8051,8125,8190,8258,8344,8424,8493,8587,8646,8701,8763,8823,8933",
+                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136",
+                        "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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,1163,1266,1362,1445,1541,1633,1745,1833,1902,1961,2027,2070,2122,2174,2223,2286,2344,2395,2479,2573,2681,2752,2836,2919,2985,3068,3170,3231,3293,3344,3422,3475,3535,3640,3699,3801,3856,3927,3976,4034,4081,4140,4194,4251,4322,4383,4440,4490,4542,4595,4645,4695,4759,4819,4872,4938,5000,5066,5129,5176,5231,5319,5377,5439,5502,5552,5597,5640,5700,5767,5823,5878,5933,5986,6033,6086,6142,6190,6245,6298,6382,6449,6513,6609,6683,6764,6853,7016,7160,7239,7314,7396,7455,7535,7615,7670,7792,7895,7936,7989,8046,8120,8185,8253,8339,8419,8488,8582,8641,8696,8758,8818,8928,9018"
                     }
                 },
                 {
@@ -82,9 +82,9 @@
                     "from": {
                         "startLines": "19,20,21,22,18",
                         "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
+                        "startOffsets": "783,836,890,944,730",
                         "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
+                        "endOffsets": "830,884,938,991,777"
                     },
                     "to": {
                         "startLines": "13,14,15,16,17",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index e5e8e10..f0999fb 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -11,6 +11,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention4.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention4.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png"
@@ -71,6 +75,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_new_password_head.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/new_password_head.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png"
@@ -87,6 +95,26 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_homepage.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/homepage.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention3.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention3.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_cancel.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/cancel.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_lock.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/lock.png"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_repeat_password_head.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/repeat_password_head.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat",
         "source": "net.micode.notes.app-main-6:/layout/note_list.xml"
@@ -99,6 +127,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_layout.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/layout.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png"
@@ -127,10 +159,18 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention2.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention2.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat",
         "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable_selector_key_del.xml.flat",
+        "source": "net.micode.notes.app-main-6:/drawable/selector_key_del.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png"
@@ -159,6 +199,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat",
         "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention5.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention5.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png"
@@ -183,6 +227,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat",
         "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_current_password_head.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/current_password_head.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat",
         "source": "net.micode.notes.app-main-6:/drawable/new_note.xml"
@@ -231,6 +279,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention0.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention0.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png"
@@ -263,10 +315,26 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable_selector_grid.xml.flat",
+        "source": "net.micode.notes.app-main-6:/drawable/selector_grid.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_item_grid.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/item_grid.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_password_item.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/password_item.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_encryption.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_encryption.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png"
@@ -327,6 +395,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_layout2.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/layout2.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png"
@@ -359,10 +431,22 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_encryption_repeat.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_encryption_repeat.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat",
         "source": "net.micode.notes.app-main-6:/xml/preferences.xml"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_decryption.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_decryption.xml"
+    },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/layout_note_importance.xml.flat",
+        "source": "net.micode.notes.app-main-6:/layout/note_importance.xml"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png"
@@ -379,6 +463,10 @@
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png"
     },
+    {
+        "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention1.png.flat",
+        "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention1.png"
+    },
     {
         "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat",
         "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png"
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png
new file mode 100644
index 0000000..0772486
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png
new file mode 100644
index 0000000..42aa899
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png
new file mode 100644
index 0000000..5edf7f8
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png
new file mode 100644
index 0000000..21eef66
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png
new file mode 100644
index 0000000..9c61ae9
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png
new file mode 100644
index 0000000..e438546
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png
new file mode 100644
index 0000000..96463e5
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png
new file mode 100644
index 0000000..d19b9ac
Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png differ
diff --git a/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml b/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml
new file mode 100644
index 0000000..e2d3f48
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="false">
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="true">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml b/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml
new file mode 100644
index 0000000..91e8c4d
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="true">
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml b/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
index 7717112..0b72974 100644
--- a/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
+++ b/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml
@@ -15,29 +15,27 @@
      limitations under the License.
 -->
 
-<LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
     <TextView
         android:id="@+id/account_dialog_title"
         style="?android:attr/textAppearanceMedium"
-        android:singleLine="true"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-2.7dip"
+        android:layout_marginTop="-2.7dip"
         android:ellipsize="end"
         android:gravity="center"
-        android:layout_marginTop="-2.7dip"
-        android:layout_marginBottom="-2.7dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:singleLine="true" />
 
     <TextView
         android:id="@+id/account_dialog_subtitle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
         android:layout_marginBottom="1dip"
-        android:gravity="center"/>
+        android:layout_marginTop="5dip"
+        android:gravity="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml b/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml
new file mode 100644
index 0000000..6979527
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="输入密码以访问便签"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
+
+
diff --git a/app/build/intermediates/packaged_res/debug/layout/homepage.xml b/app/build/intermediates/packaged_res/debug/layout/homepage.xml
new file mode 100644
index 0000000..0159f78
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/homepage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/Red"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="100pt"
+        android:height="100pt"
+        android:background="#f00" />
+
+    <TextView
+        android:id="@+id/Green"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="80pt"
+        android:height="80pt"
+        android:background="#0f0" />
+
+    <TextView
+        android:id="@+id/Blue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="60pt"
+        android:height="60pt"
+        android:background="#00f" />
+</FrameLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/item_grid.xml b/app/build/intermediates/packaged_res/debug/layout/item_grid.xml
new file mode 100644
index 0000000..6e4189d
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/item_grid.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- 模拟键盘按钮，当然你可以用Button，但要注意Button和GridView的点击响应问题 -->
+    <TextView
+        android:id="@+id/btn_keys"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        android:gravity="center"
+        android:textSize="25sp"
+        android:background="@drawable/selector_grid"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/layout.xml b/app/build/intermediates/packaged_res/debug/layout/layout.xml
new file mode 100644
index 0000000..ebe748a
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/layout.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#3354fc" />
+
+        <TableLayout android:id="@+id/TableLayout01"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:shrinkColumns="1"
+            android:stretchColumns="2">
+
+            <Button
+                android:id="@+id/Button01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Button01" />
+
+            <TableRow>
+                <Button
+                    android:id="@+id/Button02"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Btn02" />
+
+                <Button
+                    android:id="@+id/Button03"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button03" />
+
+                <Button
+                    android:id="@+id/Button04"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button04" />
+            </TableRow>
+
+            <TableRow>
+                <Button
+                    android:id="@+id/ButtonR"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_column="2"
+                    android:text="RIGHT" />
+
+            </TableRow>
+        </TableLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#3354fc"/>
+
+        <TableLayout android:id="@+id/TableLayout02"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:collapseColumns="1">
+
+            <TableRow>
+
+                <Button
+                    android:id="@+id/Button06"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button06" />
+
+                <Button
+                    android:id="@+id/Button07"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button07" />
+
+                <Button
+                    android:id="@+id/Button08"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button08" />
+            </TableRow>
+        </TableLayout>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#3354fc"/>
+    </LinearLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/layout2.xml b/app/build/intermediates/packaged_res/debug/layout/layout2.xml
new file mode 100644
index 0000000..f7e04b4
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/layout2.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <!-- 定义一个文本框，使用绝对定位 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="20dp"
+        android:layout_y="20dp"
+        android:text=" User：" />
+
+    <!-- 定义一个文本编辑框，使用绝对定位 -->
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="105dp"
+        android:layout_y="15dp"
+        android:width="250dp" />
+    <!-- 定义一个文本框，使用绝对定位 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="20dp"
+        android:layout_y="80dp"
+        android:text=" Password：" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="105dp"
+        android:layout_y="75dp"
+        android:width="250dp"
+        android:password="true" />
+    <!-- 定义一个按钮，使用绝对定位 -->
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="130dp"
+        android:layout_y="135dp"
+        android:text=" Login " />
+</AbsoluteLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/new_password_head.xml b/app/build/intermediates/packaged_res/debug/layout/new_password_head.xml
new file mode 100644
index 0000000..1f5803e
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/new_password_head.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="设置便签访问密码"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_decryption.xml b/app/build/intermediates/packaged_res/debug/layout/note_decryption.xml
new file mode 100644
index 0000000..4261b4a
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/note_decryption.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/current_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
index 10b2aa7..ff388d7 100644
--- a/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
+++ b/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
@@ -113,6 +113,12 @@
                 android:layout_width="fill_parent"
                 android:layout_height="7dip"
                 android:background="@drawable/bg_color_btn_mask" />
+
+            <TextView
+                android:id="@+id/textCount"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="字数统计" />
         </LinearLayout>
     </LinearLayout>
 
@@ -127,10 +133,10 @@
         android:id="@+id/note_bg_color_selector"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
-        android:layout_marginTop="30dip"
-        android:layout_marginRight="8dip"
         android:layout_gravity="top|right"
+        android:layout_marginRight="8dip"
+        android:layout_marginTop="30dip"
+        android:background="@drawable/note_edit_color_selector_panel"
         android:visibility="gone">
 
         <FrameLayout
@@ -150,8 +156,8 @@
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="5dip"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -169,10 +175,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
                 android:layout_marginRight="3dip"
-                android:src="@drawable/selected" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -190,10 +196,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
                 android:layout_marginRight="2dip"
-                android:src="@drawable/selected" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -212,8 +218,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -232,8 +238,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
     </LinearLayout>
 
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_encryption.xml b/app/build/intermediates/packaged_res/debug/layout/note_encryption.xml
new file mode 100644
index 0000000..aa79770
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/note_encryption.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/new_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_encryption_repeat.xml b/app/build/intermediates/packaged_res/debug/layout/note_encryption_repeat.xml
new file mode 100644
index 0000000..6786dea
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/note_encryption_repeat.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/repeat_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_importance.xml b/app/build/intermediates/packaged_res/debug/layout/note_importance.xml
new file mode 100644
index 0000000..7d23f56
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/note_importance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RatingBar
+        android:id="@+id/ratingBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:numStars="5"
+        android:visibility="visible" />
+</LinearLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_item.xml b/app/build/intermediates/packaged_res/debug/layout/note_item.xml
index d541f6a..df394b5 100644
--- a/app/build/intermediates/packaged_res/debug/layout/note_item.xml
+++ b/app/build/intermediates/packaged_res/debug/layout/note_item.xml
@@ -17,6 +17,7 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/note_item"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
@@ -65,8 +66,8 @@
             android:id="@android:id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:focusable="false"
             android:clickable="false"
+            android:focusable="false"
             android:visibility="gone" />
     </LinearLayout>
 
@@ -75,4 +76,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
+
+    <ImageView
+        android:id="@+id/iv_lock_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|left"/>
+
+    <ImageView
+        android:id="@+id/iv_importance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
 </FrameLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/note_list.xml b/app/build/intermediates/packaged_res/debug/layout/note_list.xml
index 0809313..c6abba2 100644
--- a/app/build/intermediates/packaged_res/debug/layout/note_list.xml
+++ b/app/build/intermediates/packaged_res/debug/layout/note_list.xml
@@ -17,9 +17,10 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <!--android:background="@drawable/list_background" -->
+    <!--android:background="@drawable/list_background"> -->
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -55,4 +56,6 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
+
+
 </FrameLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/password_item.xml b/app/build/intermediates/packaged_res/debug/layout/password_item.xml
new file mode 100644
index 0000000..b298079
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/password_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="40dp"
+    android:layout_marginRight="40dp"
+    android:layout_marginTop="80dp"
+    android:orientation="horizontal">
+
+    <!-- inputType设置隐藏密码明文
+          textSize设置大一点，否则“点”太小了，不美观 -->
+    <TextView
+        android:id="@+id/tv_pass1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+</LinearLayout>
diff --git a/app/build/intermediates/packaged_res/debug/layout/repeat_password_head.xml b/app/build/intermediates/packaged_res/debug/layout/repeat_password_head.xml
new file mode 100644
index 0000000..0f751be
--- /dev/null
+++ b/app/build/intermediates/packaged_res/debug/layout/repeat_password_head.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="确认便签访问密码"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/menu/note_edit.xml b/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
index 35cacd1..fe068b3 100644
--- a/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
+++ b/app/build/intermediates/packaged_res/debug/menu/note_edit.xml
@@ -49,4 +49,17 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_encrypt"
+        android:title="@string/menu_encrypt" />
+
+    <item
+        android:id="@+id/menu_delete_encrypt"
+        android:title="@string/menu_remove_encrypt" />
+
+    <item
+        android:id="@+id/menu_set_importance"
+        android:title="@string/menu_set_importance"/>
+
 </menu>
\ No newline at end of file
diff --git a/app/build/intermediates/packaged_res/debug/menu/note_list.xml b/app/build/intermediates/packaged_res/debug/menu/note_list.xml
index f341bca..b6af36c 100644
--- a/app/build/intermediates/packaged_res/debug/menu/note_list.xml
+++ b/app/build/intermediates/packaged_res/debug/menu/note_list.xml
@@ -40,6 +40,6 @@
         android:id="@+id/menu_water"
         android:title="Background:water"/>
     <item
-        android:id="@+id/menu_grass"
+        android:id="@+id/menu_grassland"
         android:title="Background:grassland"/>
 </menu>
diff --git a/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
index d65e0cc..62b59b7 100644
--- a/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
+++ b/app/build/intermediates/packaged_res/debug/values-zh-rCN/values-zh-rCN.xml
@@ -7,10 +7,17 @@
     <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>
+    <string name="alert_message_decrypt">密码输入正确，即将进入便签</string>
+    <string name="alert_message_decrypt_error">密码输入错误，请重新输入</string>
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string>
+    <string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string>
+    <string name="alert_message_remove_encrypt">解除便签访问密码成功</string>
     <string name="alert_title_delete">删除</string>
+    <string name="alert_title_encrypt">密码提示</string>
+    <string name="alert_title_importance">设置重要性</string>
     <string name="app_name">便签</string>
     <string name="app_widget2x2">便签2x2</string>
     <string name="app_widget4x4">便签4x4</string>
@@ -39,6 +46,7 @@
     <string name="menu_create_folder">新建文件夹</string>
     <string name="menu_delete">删除</string>
     <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_encrypt">设置密码</string>
     <string name="menu_export_text">导出文本</string>
     <string name="menu_folder_change_name">修改文件夹名称</string>
     <string name="menu_folder_delete">刪除文件夹</string>
@@ -52,12 +60,14 @@
     <string name="menu_move">移动到文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_encrypt">解除密码</string>
     <string name="menu_remove_remind">删除提醒</string>
     <string name="menu_search">搜索</string>
     <string name="menu_select_all">全选</string>
     <string name="menu_select_none">没有选中项，操作无效</string>
     <string name="menu_select_title">选中了 %d 项</string>
     <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_set_importance">设置便签重要性</string>
     <string name="menu_setting">设置</string>
     <string name="menu_share">分享</string>
     <string name="menu_sync">同步</string>
diff --git a/app/build/intermediates/packaged_res/debug/values/values.xml b/app/build/intermediates/packaged_res/debug/values/values.xml
index 8229fb7..d34d55e 100644
--- a/app/build/intermediates/packaged_res/debug/values/values.xml
+++ b/app/build/intermediates/packaged_res/debug/values/values.xml
@@ -21,10 +21,17 @@
         
         <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>
+    <string name="alert_message_decrypt">Decrypt note successfully</string>
+    <string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string>
     <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
     <string name="alert_message_delete_note">Confirm to delete this note?</string>
     <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_message_encrypt">Encrypt note successfully, password is %s</string>
+    <string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string>
+    <string name="alert_message_remove_encrypt">Remove encryption successfully</string>
     <string name="alert_title_delete">Delete selected notes</string>
+    <string name="alert_title_encrypt">Encryption</string>
+    <string name="alert_title_importance">Set Importance</string>
     <string name="app_name">Notes</string>
     <string name="app_widget2x2">Notes 2x2</string>
     <string name="app_widget4x4">Notes 4x4</string>
@@ -56,6 +63,7 @@
     <string name="menu_create_folder">New Folder</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_encrypt">Encrypt note</string>
     <string name="menu_export_text">Export text</string>
     <string name="menu_folder_change_name">Change folder name</string>
     <string name="menu_folder_delete">Delete folder</string>
@@ -70,12 +78,14 @@
     <string name="menu_move">Move to folder</string>
     <string name="menu_move_parent_folder">Parent folder</string>
     <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_remove_encrypt">Delete encryption</string>
     <string name="menu_remove_remind">Delete reminder</string>
     <string name="menu_search">Search</string>
     <string name="menu_select_all">Select all</string>
     <string name="menu_select_none">Nothing selected, the operation is invalid</string>
     <string name="menu_select_title">%d selected</string>
     <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_set_importance">Set importance</string>
     <string name="menu_setting">Settings</string>
     <string name="menu_share">Share</string>
     <string name="menu_sync">Sync</string>
@@ -134,7 +144,7 @@
         <item name="android:textColor">@color/secondary_text_dark</item>
     </style>
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        
+     
         <item name="android:visibility">visible</item>
     </style>
     <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 910d997..2a09381 100644
Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/db841d1f4706b805d29af7192e34affe8d4148305e7d3b02596d51090d4e36f6_1.jar b/app/build/intermediates/project_dex_archive/debug/out/db841d1f4706b805d29af7192e34affe8d4148305e7d3b02596d51090d4e36f6_1.jar
deleted file mode 100644
index 13ed53c..0000000
Binary files a/app/build/intermediates/project_dex_archive/debug/out/db841d1f4706b805d29af7192e34affe8d4148305e7d3b02596d51090d4e36f6_1.jar and /dev/null differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/db8439d0f1a600f776528ed36d91d40fb01651e754d637877115b1e3ad2cf231_1.jar b/app/build/intermediates/project_dex_archive/debug/out/db8439d0f1a600f776528ed36d91d40fb01651e754d637877115b1e3ad2cf231_1.jar
new file mode 100644
index 0000000..cf0957f
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/db8439d0f1a600f776528ed36d91d40fb01651e754d637877115b1e3ad2cf231_1.jar differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index a961bc4..98a180e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index 3e6ef4e..17b5085 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index 37e4878..7205bbf 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
index d9a2ab4..e01d30a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
index bff9419..bd98954 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex
index 00800a0..8dfa872 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index 158951c..7150c2d 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index 2c10036..dca543a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 5bba515..457d0a2 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 49a8b16..2669fcd 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 92250f2..4834774 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index 1f9408f..d552926 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index cce08c4..11cf7e1 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 1edfd0a..c5ed5c7 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex
new file mode 100644
index 0000000..df23e25
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$10.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex
new file mode 100644
index 0000000..6b31202
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$11.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex
new file mode 100644
index 0000000..422158d
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$12.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2$1.dex
new file mode 100644
index 0000000..c4e262a
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index bc46bd9..60699ac 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 6e54685..96c4e73 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
new file mode 100644
index 0000000..ae5584b
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex
new file mode 100644
index 0000000..da6194b
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex
new file mode 100644
index 0000000..589edb0
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex
new file mode 100644
index 0000000..bb6547b
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8$1.dex
new file mode 100644
index 0000000..e4a275d
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex
new file mode 100644
index 0000000..72b95a9
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex
new file mode 100644
index 0000000..af819ff
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$9.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index 3a9b0bf..fe29315 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.dex
new file mode 100644
index 0000000..013d237
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.dex
new file mode 100644
index 0000000..0217fe3
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index adcc2c3..842362f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 5915330..103bf55 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 70d2682..29c2d22 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index bc0b0bf..9023f6e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 74620dc..fd3e2e5 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 9a825da..9d8fd42 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 7ca1bdf..36f723c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 6ca0786..26e0c44 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 29ccf2c..bd62692 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index 9f53428..a666f53 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 8b601f9..de213b1 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 49f2456..8c027ce 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 365b8bf..8e6bcc7 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index c4edd96..e73108b 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index d0d398b..819511e 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index 46c593d..ca0a324 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/OnPasswordInputFinish.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/OnPasswordInputFinish.dex
new file mode 100644
index 0000000..f8712b2
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/OnPasswordInputFinish.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$1.dex
new file mode 100644
index 0000000..5365b75
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$2.dex
new file mode 100644
index 0000000..32694ad
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$3.dex
new file mode 100644
index 0000000..e69f900
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$ViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$ViewHolder.dex
new file mode 100644
index 0000000..c36048f
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView$ViewHolder.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView.dex
new file mode 100644
index 0000000..fa4a718
Binary files /dev/null and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/PasswordView.dex differ
diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 23135da..250bdb3 100644
--- a/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -8,157 +8,208 @@ int dimen text_font_size_medium 0x7f030001
 int dimen text_font_size_normal 0x7f030002
 int dimen text_font_size_small 0x7f030003
 int dimen text_font_size_super 0x7f030004
-int drawable bg_btn_set_color 0x7f040000
-int drawable bg_color_btn_mask 0x7f040001
-int drawable call_record 0x7f040002
-int drawable clock 0x7f040003
-int drawable delete 0x7f040004
-int drawable dropdown_icon 0x7f040005
-int drawable edit_blue 0x7f040006
-int drawable edit_green 0x7f040007
-int drawable edit_red 0x7f040008
-int drawable edit_title_blue 0x7f040009
-int drawable edit_title_green 0x7f04000a
-int drawable edit_title_red 0x7f04000b
-int drawable edit_title_white 0x7f04000c
-int drawable edit_title_yellow 0x7f04000d
-int drawable edit_white 0x7f04000e
-int drawable edit_yellow 0x7f04000f
-int drawable font_large 0x7f040010
-int drawable font_normal 0x7f040011
-int drawable font_size_selector_bg 0x7f040012
-int drawable font_small 0x7f040013
-int drawable font_super 0x7f040014
-int drawable grassland 0x7f040015
-int drawable icon_app 0x7f040016
-int drawable list_background 0x7f040017
-int drawable list_blue_down 0x7f040018
-int drawable list_blue_middle 0x7f040019
-int drawable list_blue_single 0x7f04001a
-int drawable list_blue_up 0x7f04001b
-int drawable list_folder 0x7f04001c
-int drawable list_footer_bg 0x7f04001d
-int drawable list_green_down 0x7f04001e
-int drawable list_green_middle 0x7f04001f
-int drawable list_green_single 0x7f040020
-int drawable list_green_up 0x7f040021
-int drawable list_red_down 0x7f040022
-int drawable list_red_middle 0x7f040023
-int drawable list_red_single 0x7f040024
-int drawable list_red_up 0x7f040025
-int drawable list_white_down 0x7f040026
-int drawable list_white_middle 0x7f040027
-int drawable list_white_single 0x7f040028
-int drawable list_white_up 0x7f040029
-int drawable list_yellow_down 0x7f04002a
-int drawable list_yellow_middle 0x7f04002b
-int drawable list_yellow_single 0x7f04002c
-int drawable list_yellow_up 0x7f04002d
-int drawable menu_delete 0x7f04002e
-int drawable menu_move 0x7f04002f
-int drawable new_note 0x7f040030
-int drawable new_note_normal 0x7f040031
-int drawable new_note_pressed 0x7f040032
-int drawable note_edit_color_selector_panel 0x7f040033
-int drawable notification 0x7f040034
-int drawable search_result 0x7f040035
-int drawable selected 0x7f040036
-int drawable title_alert 0x7f040037
-int drawable title_bar_bg 0x7f040038
-int drawable water 0x7f040039
-int drawable widget_2x_blue 0x7f04003a
-int drawable widget_2x_green 0x7f04003b
-int drawable widget_2x_red 0x7f04003c
-int drawable widget_2x_white 0x7f04003d
-int drawable widget_2x_yellow 0x7f04003e
-int drawable widget_4x_blue 0x7f04003f
-int drawable widget_4x_green 0x7f040040
-int drawable widget_4x_red 0x7f040041
-int drawable widget_4x_white 0x7f040042
-int drawable widget_4x_yellow 0x7f040043
-int id account_dialog_subtitle 0x7f050000
-int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_grass 0x7f050025
-int id menu_list_mode 0x7f050026
-int id menu_new_folder 0x7f050027
-int id menu_new_note 0x7f050028
-int id menu_search 0x7f050029
-int id menu_send_to_desktop 0x7f05002a
-int id menu_setting 0x7f05002b
-int id menu_share 0x7f05002c
-int id menu_sync 0x7f05002d
-int id menu_water 0x7f05002e
-int id minute 0x7f05002f
-int id move 0x7f050030
-int id navigation_bar 0x7f050031
-int id note_bg_color_selector 0x7f050032
-int id note_edit_list 0x7f050033
-int id note_edit_view 0x7f050034
-int id note_item 0x7f050035
-int id note_title 0x7f050036
-int id notes_list 0x7f050037
-int id prefenerece_sync_status_textview 0x7f050038
-int id preference_sync_button 0x7f050039
-int id selection_menu 0x7f05003a
-int id sv_note_edit 0x7f05003b
-int id tv_alert_date 0x7f05003c
-int id tv_folder_name 0x7f05003d
-int id tv_modified_date 0x7f05003e
-int id tv_name 0x7f05003f
-int id tv_time 0x7f050040
-int id tv_title 0x7f050041
-int id tv_title_bar 0x7f050042
-int id widget_bg_image 0x7f050043
-int id widget_text 0x7f050044
+int drawable attention0 0x7f040000
+int drawable attention1 0x7f040001
+int drawable attention2 0x7f040002
+int drawable attention3 0x7f040003
+int drawable attention4 0x7f040004
+int drawable attention5 0x7f040005
+int drawable bg_btn_set_color 0x7f040006
+int drawable bg_color_btn_mask 0x7f040007
+int drawable call_record 0x7f040008
+int drawable cancel 0x7f040009
+int drawable clock 0x7f04000a
+int drawable delete 0x7f04000b
+int drawable dropdown_icon 0x7f04000c
+int drawable edit_blue 0x7f04000d
+int drawable edit_green 0x7f04000e
+int drawable edit_red 0x7f04000f
+int drawable edit_title_blue 0x7f040010
+int drawable edit_title_green 0x7f040011
+int drawable edit_title_red 0x7f040012
+int drawable edit_title_white 0x7f040013
+int drawable edit_title_yellow 0x7f040014
+int drawable edit_white 0x7f040015
+int drawable edit_yellow 0x7f040016
+int drawable font_large 0x7f040017
+int drawable font_normal 0x7f040018
+int drawable font_size_selector_bg 0x7f040019
+int drawable font_small 0x7f04001a
+int drawable font_super 0x7f04001b
+int drawable grassland 0x7f04001c
+int drawable icon_app 0x7f04001d
+int drawable list_background 0x7f04001e
+int drawable list_blue_down 0x7f04001f
+int drawable list_blue_middle 0x7f040020
+int drawable list_blue_single 0x7f040021
+int drawable list_blue_up 0x7f040022
+int drawable list_folder 0x7f040023
+int drawable list_footer_bg 0x7f040024
+int drawable list_green_down 0x7f040025
+int drawable list_green_middle 0x7f040026
+int drawable list_green_single 0x7f040027
+int drawable list_green_up 0x7f040028
+int drawable list_red_down 0x7f040029
+int drawable list_red_middle 0x7f04002a
+int drawable list_red_single 0x7f04002b
+int drawable list_red_up 0x7f04002c
+int drawable list_white_down 0x7f04002d
+int drawable list_white_middle 0x7f04002e
+int drawable list_white_single 0x7f04002f
+int drawable list_white_up 0x7f040030
+int drawable list_yellow_down 0x7f040031
+int drawable list_yellow_middle 0x7f040032
+int drawable list_yellow_single 0x7f040033
+int drawable list_yellow_up 0x7f040034
+int drawable lock 0x7f040035
+int drawable menu_delete 0x7f040036
+int drawable menu_move 0x7f040037
+int drawable new_note 0x7f040038
+int drawable new_note_normal 0x7f040039
+int drawable new_note_pressed 0x7f04003a
+int drawable note_edit_color_selector_panel 0x7f04003b
+int drawable notification 0x7f04003c
+int drawable search_result 0x7f04003d
+int drawable selected 0x7f04003e
+int drawable selector_grid 0x7f04003f
+int drawable selector_key_del 0x7f040040
+int drawable title_alert 0x7f040041
+int drawable title_bar_bg 0x7f040042
+int drawable water 0x7f040043
+int drawable widget_2x_blue 0x7f040044
+int drawable widget_2x_green 0x7f040045
+int drawable widget_2x_red 0x7f040046
+int drawable widget_2x_white 0x7f040047
+int drawable widget_2x_yellow 0x7f040048
+int drawable widget_4x_blue 0x7f040049
+int drawable widget_4x_green 0x7f04004a
+int drawable widget_4x_red 0x7f04004b
+int drawable widget_4x_white 0x7f04004c
+int drawable widget_4x_yellow 0x7f04004d
+int id Blue 0x7f050000
+int id Button01 0x7f050001
+int id Button02 0x7f050002
+int id Button03 0x7f050003
+int id Button04 0x7f050004
+int id Button06 0x7f050005
+int id Button07 0x7f050006
+int id Button08 0x7f050007
+int id ButtonR 0x7f050008
+int id Green 0x7f050009
+int id Red 0x7f05000a
+int id TableLayout01 0x7f05000b
+int id TableLayout02 0x7f05000c
+int id account_dialog_subtitle 0x7f05000d
+int id account_dialog_title 0x7f05000e
+int id action_select_all 0x7f05000f
+int id amPm 0x7f050010
+int id btn_keys 0x7f050011
+int id btn_new_note 0x7f050012
+int id btn_set_bg_color 0x7f050013
+int id cb_edit_item 0x7f050014
+int id date 0x7f050015
+int id delete 0x7f050016
+int id et_edit_text 0x7f050017
+int id et_foler_name 0x7f050018
+int id font_size_selector 0x7f050019
+int id gv_keyboard 0x7f05001a
+int id hour 0x7f05001b
+int id img_cancel 0x7f05001c
+int id iv_alert_icon 0x7f05001d
+int id iv_bg_blue 0x7f05001e
+int id iv_bg_blue_select 0x7f05001f
+int id iv_bg_green 0x7f050020
+int id iv_bg_green_select 0x7f050021
+int id iv_bg_red 0x7f050022
+int id iv_bg_red_select 0x7f050023
+int id iv_bg_white 0x7f050024
+int id iv_bg_white_select 0x7f050025
+int id iv_bg_yellow 0x7f050026
+int id iv_bg_yellow_select 0x7f050027
+int id iv_importance 0x7f050028
+int id iv_large_select 0x7f050029
+int id iv_lock_icon 0x7f05002a
+int id iv_medium_select 0x7f05002b
+int id iv_small_select 0x7f05002c
+int id iv_super_select 0x7f05002d
+int id linear_pass 0x7f05002e
+int id ll_font_large 0x7f05002f
+int id ll_font_normal 0x7f050030
+int id ll_font_small 0x7f050031
+int id ll_font_super 0x7f050032
+int id menu_alert 0x7f050033
+int id menu_delete 0x7f050034
+int id menu_delete_encrypt 0x7f050035
+int id menu_delete_remind 0x7f050036
+int id menu_encrypt 0x7f050037
+int id menu_export_text 0x7f050038
+int id menu_font_size 0x7f050039
+int id menu_grassland 0x7f05003a
+int id menu_list_mode 0x7f05003b
+int id menu_new_folder 0x7f05003c
+int id menu_new_note 0x7f05003d
+int id menu_search 0x7f05003e
+int id menu_send_to_desktop 0x7f05003f
+int id menu_set_importance 0x7f050040
+int id menu_setting 0x7f050041
+int id menu_share 0x7f050042
+int id menu_sync 0x7f050043
+int id menu_water 0x7f050044
+int id minute 0x7f050045
+int id move 0x7f050046
+int id navigation_bar 0x7f050047
+int id note_bg_color_selector 0x7f050048
+int id note_decryption 0x7f050049
+int id note_edit_list 0x7f05004a
+int id note_edit_view 0x7f05004b
+int id note_item 0x7f05004c
+int id note_title 0x7f05004d
+int id notes_list 0x7f05004e
+int id prefenerece_sync_status_textview 0x7f05004f
+int id preference_sync_button 0x7f050050
+int id ratingBar 0x7f050051
+int id selection_menu 0x7f050052
+int id sv_note_edit 0x7f050053
+int id textCount 0x7f050054
+int id tv_alert_date 0x7f050055
+int id tv_folder_name 0x7f050056
+int id tv_modified_date 0x7f050057
+int id tv_name 0x7f050058
+int id tv_pass1 0x7f050059
+int id tv_pass2 0x7f05005a
+int id tv_pass3 0x7f05005b
+int id tv_pass4 0x7f05005c
+int id tv_time 0x7f05005d
+int id tv_title 0x7f05005e
+int id tv_title_bar 0x7f05005f
+int id widget_bg_image 0x7f050060
+int id widget_text 0x7f050061
 int layout account_dialog_title 0x7f060000
 int layout add_account_text 0x7f060001
-int layout datetime_picker 0x7f060002
-int layout dialog_edit_text 0x7f060003
-int layout folder_list_item 0x7f060004
-int layout note_edit 0x7f060005
-int layout note_edit_list_item 0x7f060006
-int layout note_item 0x7f060007
-int layout note_list 0x7f060008
-int layout note_list_dropdown_menu 0x7f060009
-int layout note_list_footer 0x7f06000a
-int layout settings_header 0x7f06000b
-int layout widget_2x 0x7f06000c
-int layout widget_4x 0x7f06000d
+int layout current_password_head 0x7f060002
+int layout datetime_picker 0x7f060003
+int layout dialog_edit_text 0x7f060004
+int layout folder_list_item 0x7f060005
+int layout homepage 0x7f060006
+int layout item_grid 0x7f060007
+int layout layout 0x7f060008
+int layout layout2 0x7f060009
+int layout new_password_head 0x7f06000a
+int layout note_decryption 0x7f06000b
+int layout note_edit 0x7f06000c
+int layout note_edit_list_item 0x7f06000d
+int layout note_encryption 0x7f06000e
+int layout note_encryption_repeat 0x7f06000f
+int layout note_importance 0x7f060010
+int layout note_item 0x7f060011
+int layout note_list 0x7f060012
+int layout note_list_dropdown_menu 0x7f060013
+int layout note_list_footer 0x7f060014
+int layout password_item 0x7f060015
+int layout repeat_password_head 0x7f060016
+int layout settings_header 0x7f060017
+int layout widget_2x 0x7f060018
+int layout widget_4x 0x7f060019
 int menu call_note_edit 0x7f070000
 int menu call_record_folder 0x7f070001
 int menu note_edit 0x7f070002
@@ -168,110 +219,120 @@ int menu note_list_options 0x7f070005
 int menu sub_folder 0x7f070006
 int plurals search_results_title 0x7f080000
 int raw introduction 0x7f090000
-int string alert_message_delete_folder 0x7f0a0000
-int string alert_message_delete_note 0x7f0a0001
-int string alert_message_delete_notes 0x7f0a0002
-int string alert_title_delete 0x7f0a0003
-int string app_name 0x7f0a0004
-int string app_widget2x2 0x7f0a0005
-int string app_widget4x4 0x7f0a0006
-int string button_delete 0x7f0a0007
-int string call_record_folder_name 0x7f0a0008
-int string datetime_dialog_cancel 0x7f0a0009
-int string datetime_dialog_ok 0x7f0a000a
-int string delete_remind_time_message 0x7f0a000b
-int string error_note_empty_for_clock 0x7f0a000c
-int string error_note_empty_for_send_to_desktop 0x7f0a000d
-int string error_note_not_exist 0x7f0a000e
-int string error_sdcard_export 0x7f0a000f
-int string error_sdcard_unmounted 0x7f0a0010
-int string error_sync_cancelled 0x7f0a0011
-int string error_sync_internal 0x7f0a0012
-int string error_sync_network 0x7f0a0013
-int string failed_sdcard_export 0x7f0a0014
-int string file_name_txt_format 0x7f0a0015
-int string file_path 0x7f0a0016
-int string folder_exist 0x7f0a0017
-int string format_date_ymd 0x7f0a0018
-int string format_datetime_mdhm 0x7f0a0019
-int string format_exported_file_location 0x7f0a001a
-int string format_folder_files_count 0x7f0a001b
-int string format_move_notes_to_folder 0x7f0a001c
-int string hint_foler_name 0x7f0a001d
-int string info_note_enter_desktop 0x7f0a001e
-int string menu_alert 0x7f0a001f
-int string menu_create_folder 0x7f0a0020
-int string menu_delete 0x7f0a0021
-int string menu_deselect_all 0x7f0a0022
-int string menu_export_text 0x7f0a0023
-int string menu_folder_change_name 0x7f0a0024
-int string menu_folder_delete 0x7f0a0025
-int string menu_folder_view 0x7f0a0026
-int string menu_font_large 0x7f0a0027
-int string menu_font_normal 0x7f0a0028
-int string menu_font_size 0x7f0a0029
-int string menu_font_small 0x7f0a002a
-int string menu_font_super 0x7f0a002b
-int string menu_grassland 0x7f0a002c
-int string menu_list_mode 0x7f0a002d
-int string menu_move 0x7f0a002e
-int string menu_move_parent_folder 0x7f0a002f
-int string menu_normal_mode 0x7f0a0030
-int string menu_remove_remind 0x7f0a0031
-int string menu_search 0x7f0a0032
-int string menu_select_all 0x7f0a0033
-int string menu_select_none 0x7f0a0034
-int string menu_select_title 0x7f0a0035
-int string menu_send_to_desktop 0x7f0a0036
-int string menu_setting 0x7f0a0037
-int string menu_share 0x7f0a0038
-int string menu_sync 0x7f0a0039
-int string menu_sync_cancel 0x7f0a003a
-int string menu_title_select_folder 0x7f0a003b
-int string menu_water 0x7f0a003c
-int string note_alert_expired 0x7f0a003d
-int string note_link_email 0x7f0a003e
-int string note_link_other 0x7f0a003f
-int string note_link_tel 0x7f0a0040
-int string note_link_web 0x7f0a0041
-int string notealert_enter 0x7f0a0042
-int string notealert_ok 0x7f0a0043
-int string notelist_menu_new 0x7f0a0044
-int string notelist_string_info 0x7f0a0045
-int string preferences_account_summary 0x7f0a0046
-int string preferences_account_title 0x7f0a0047
-int string preferences_add_account 0x7f0a0048
-int string preferences_bg_random_appear_title 0x7f0a0049
-int string preferences_button_sync_cancel 0x7f0a004a
-int string preferences_button_sync_immediately 0x7f0a004b
-int string preferences_dialog_change_account_title 0x7f0a004c
-int string preferences_dialog_change_account_warn_msg 0x7f0a004d
-int string preferences_dialog_select_account_tips 0x7f0a004e
-int string preferences_dialog_select_account_title 0x7f0a004f
-int string preferences_last_sync_time 0x7f0a0050
-int string preferences_last_sync_time_format 0x7f0a0051
-int string preferences_menu_cancel 0x7f0a0052
-int string preferences_menu_change_account 0x7f0a0053
-int string preferences_menu_remove_account 0x7f0a0054
-int string preferences_title 0x7f0a0055
-int string preferences_toast_cannot_change_account 0x7f0a0056
-int string preferences_toast_success_set_accout 0x7f0a0057
-int string search 0x7f0a0058
-int string search_hint 0x7f0a0059
-int string search_label 0x7f0a005a
-int string search_setting_description 0x7f0a005b
-int string set_remind_time_message 0x7f0a005c
-int string success_sdcard_export 0x7f0a005d
-int string success_sync_account 0x7f0a005e
-int string sync_progress_init_list 0x7f0a005f
-int string sync_progress_login 0x7f0a0060
-int string sync_progress_syncing 0x7f0a0061
-int string ticker_cancel 0x7f0a0062
-int string ticker_fail 0x7f0a0063
-int string ticker_success 0x7f0a0064
-int string ticker_syncing 0x7f0a0065
-int string widget_havenot_content 0x7f0a0066
-int string widget_under_visit_mode 0x7f0a0067
+int string alert_message_decrypt 0x7f0a0000
+int string alert_message_decrypt_error 0x7f0a0001
+int string alert_message_delete_folder 0x7f0a0002
+int string alert_message_delete_note 0x7f0a0003
+int string alert_message_delete_notes 0x7f0a0004
+int string alert_message_encrypt 0x7f0a0005
+int string alert_message_encrypt_error 0x7f0a0006
+int string alert_message_remove_encrypt 0x7f0a0007
+int string alert_title_delete 0x7f0a0008
+int string alert_title_encrypt 0x7f0a0009
+int string alert_title_importance 0x7f0a000a
+int string app_name 0x7f0a000b
+int string app_widget2x2 0x7f0a000c
+int string app_widget4x4 0x7f0a000d
+int string button_delete 0x7f0a000e
+int string call_record_folder_name 0x7f0a000f
+int string datetime_dialog_cancel 0x7f0a0010
+int string datetime_dialog_ok 0x7f0a0011
+int string delete_remind_time_message 0x7f0a0012
+int string error_note_empty_for_clock 0x7f0a0013
+int string error_note_empty_for_send_to_desktop 0x7f0a0014
+int string error_note_not_exist 0x7f0a0015
+int string error_sdcard_export 0x7f0a0016
+int string error_sdcard_unmounted 0x7f0a0017
+int string error_sync_cancelled 0x7f0a0018
+int string error_sync_internal 0x7f0a0019
+int string error_sync_network 0x7f0a001a
+int string failed_sdcard_export 0x7f0a001b
+int string file_name_txt_format 0x7f0a001c
+int string file_path 0x7f0a001d
+int string folder_exist 0x7f0a001e
+int string format_date_ymd 0x7f0a001f
+int string format_datetime_mdhm 0x7f0a0020
+int string format_exported_file_location 0x7f0a0021
+int string format_folder_files_count 0x7f0a0022
+int string format_move_notes_to_folder 0x7f0a0023
+int string hint_foler_name 0x7f0a0024
+int string info_note_enter_desktop 0x7f0a0025
+int string menu_alert 0x7f0a0026
+int string menu_create_folder 0x7f0a0027
+int string menu_delete 0x7f0a0028
+int string menu_deselect_all 0x7f0a0029
+int string menu_encrypt 0x7f0a002a
+int string menu_export_text 0x7f0a002b
+int string menu_folder_change_name 0x7f0a002c
+int string menu_folder_delete 0x7f0a002d
+int string menu_folder_view 0x7f0a002e
+int string menu_font_large 0x7f0a002f
+int string menu_font_normal 0x7f0a0030
+int string menu_font_size 0x7f0a0031
+int string menu_font_small 0x7f0a0032
+int string menu_font_super 0x7f0a0033
+int string menu_grassland 0x7f0a0034
+int string menu_list_mode 0x7f0a0035
+int string menu_move 0x7f0a0036
+int string menu_move_parent_folder 0x7f0a0037
+int string menu_normal_mode 0x7f0a0038
+int string menu_remove_encrypt 0x7f0a0039
+int string menu_remove_remind 0x7f0a003a
+int string menu_search 0x7f0a003b
+int string menu_select_all 0x7f0a003c
+int string menu_select_none 0x7f0a003d
+int string menu_select_title 0x7f0a003e
+int string menu_send_to_desktop 0x7f0a003f
+int string menu_set_importance 0x7f0a0040
+int string menu_setting 0x7f0a0041
+int string menu_share 0x7f0a0042
+int string menu_sync 0x7f0a0043
+int string menu_sync_cancel 0x7f0a0044
+int string menu_title_select_folder 0x7f0a0045
+int string menu_water 0x7f0a0046
+int string note_alert_expired 0x7f0a0047
+int string note_link_email 0x7f0a0048
+int string note_link_other 0x7f0a0049
+int string note_link_tel 0x7f0a004a
+int string note_link_web 0x7f0a004b
+int string notealert_enter 0x7f0a004c
+int string notealert_ok 0x7f0a004d
+int string notelist_menu_new 0x7f0a004e
+int string notelist_string_info 0x7f0a004f
+int string preferences_account_summary 0x7f0a0050
+int string preferences_account_title 0x7f0a0051
+int string preferences_add_account 0x7f0a0052
+int string preferences_bg_random_appear_title 0x7f0a0053
+int string preferences_button_sync_cancel 0x7f0a0054
+int string preferences_button_sync_immediately 0x7f0a0055
+int string preferences_dialog_change_account_title 0x7f0a0056
+int string preferences_dialog_change_account_warn_msg 0x7f0a0057
+int string preferences_dialog_select_account_tips 0x7f0a0058
+int string preferences_dialog_select_account_title 0x7f0a0059
+int string preferences_last_sync_time 0x7f0a005a
+int string preferences_last_sync_time_format 0x7f0a005b
+int string preferences_menu_cancel 0x7f0a005c
+int string preferences_menu_change_account 0x7f0a005d
+int string preferences_menu_remove_account 0x7f0a005e
+int string preferences_title 0x7f0a005f
+int string preferences_toast_cannot_change_account 0x7f0a0060
+int string preferences_toast_success_set_accout 0x7f0a0061
+int string search 0x7f0a0062
+int string search_hint 0x7f0a0063
+int string search_label 0x7f0a0064
+int string search_setting_description 0x7f0a0065
+int string set_remind_time_message 0x7f0a0066
+int string success_sdcard_export 0x7f0a0067
+int string success_sync_account 0x7f0a0068
+int string sync_progress_init_list 0x7f0a0069
+int string sync_progress_login 0x7f0a006a
+int string sync_progress_syncing 0x7f0a006b
+int string ticker_cancel 0x7f0a006c
+int string ticker_fail 0x7f0a006d
+int string ticker_success 0x7f0a006e
+int string ticker_syncing 0x7f0a006f
+int string widget_havenot_content 0x7f0a0070
+int string widget_under_visit_mode 0x7f0a0071
 int style HighlightTextAppearancePrimary 0x7f0b0000
 int style HighlightTextAppearanceSecondary 0x7f0b0001
 int style NoteActionBarStyle 0x7f0b0002
diff --git a/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
index 96fa326..86c857f 100644
--- a/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
+++ b/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@@ -1,4 +1,4 @@
-net.micode.notes.test.app-androidTest-0 D:\GITwork\Notes-master\app\build\generated\res\resValues\androidTest\debug
-net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\GITwork\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
-net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\GITwork\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
-net.micode.notes.test.app-merged_res-3 D:\GITwork\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
+net.micode.notes.test.app-androidTest-0 D:\rjgc\Notes-master\app\build\generated\res\resValues\androidTest\debug
+net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\rjgc\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
+net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\rjgc\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
+net.micode.notes.test.app-merged_res-3 D:\rjgc\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index fe8d69d..8e21e1f 100644
--- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -5,285 +5,346 @@ net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
 net.micode.notes:xml/widget_2x_info = 0x7f0c0002
 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0067
-net.micode.notes:string/sync_progress_login = 0x7f0a0060
-net.micode.notes:string/success_sync_account = 0x7f0a005e
-net.micode.notes:string/search_setting_description = 0x7f0a005b
-net.micode.notes:string/search_hint = 0x7f0a0059
-net.micode.notes:string/search = 0x7f0a0058
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0057
-net.micode.notes:string/preferences_title = 0x7f0a0055
-net.micode.notes:string/preferences_menu_change_account = 0x7f0a0053
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a0050
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004c
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0049
-net.micode.notes:string/preferences_add_account = 0x7f0a0048
-net.micode.notes:string/preferences_account_title = 0x7f0a0047
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0071
+net.micode.notes:string/sync_progress_login = 0x7f0a006a
+net.micode.notes:string/success_sync_account = 0x7f0a0068
+net.micode.notes:string/search_setting_description = 0x7f0a0065
+net.micode.notes:string/search_hint = 0x7f0a0063
+net.micode.notes:string/search = 0x7f0a0062
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0061
+net.micode.notes:string/preferences_title = 0x7f0a005f
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a005d
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a005a
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a0056
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0053
+net.micode.notes:string/preferences_account_title = 0x7f0a0051
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/set_remind_time_message = 0x7f0a005c
-net.micode.notes:string/notealert_enter = 0x7f0a0042
-net.micode.notes:string/note_link_web = 0x7f0a0041
-net.micode.notes:string/note_link_tel = 0x7f0a0040
-net.micode.notes:string/note_link_other = 0x7f0a003f
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004d
-net.micode.notes:string/note_link_email = 0x7f0a003e
-net.micode.notes:string/note_alert_expired = 0x7f0a003d
-net.micode.notes:string/menu_sync_cancel = 0x7f0a003a
-net.micode.notes:string/menu_sync = 0x7f0a0039
-net.micode.notes:string/menu_share = 0x7f0a0038
-net.micode.notes:string/menu_setting = 0x7f0a0037
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0036
-net.micode.notes:string/menu_select_title = 0x7f0a0035
+net.micode.notes:string/set_remind_time_message = 0x7f0a0066
+net.micode.notes:string/notealert_enter = 0x7f0a004c
+net.micode.notes:string/note_link_web = 0x7f0a004b
+net.micode.notes:string/note_link_tel = 0x7f0a004a
+net.micode.notes:string/note_link_other = 0x7f0a0049
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a0057
+net.micode.notes:string/note_link_email = 0x7f0a0048
+net.micode.notes:string/note_alert_expired = 0x7f0a0047
+net.micode.notes:string/menu_sync = 0x7f0a0043
+net.micode.notes:string/menu_share = 0x7f0a0042
+net.micode.notes:string/menu_setting = 0x7f0a0041
+net.micode.notes:string/menu_set_importance = 0x7f0a0040
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a003f
+net.micode.notes:string/menu_select_title = 0x7f0a003e
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
-net.micode.notes:string/menu_select_all = 0x7f0a0033
-net.micode.notes:string/menu_search = 0x7f0a0032
-net.micode.notes:string/menu_normal_mode = 0x7f0a0030
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/menu_remove_remind = 0x7f0a0031
-net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_export_text = 0x7f0a0023
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:string/success_sdcard_export = 0x7f0a005d
-net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:string/format_folder_files_count = 0x7f0a001b
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
-net.micode.notes:id/note_edit_list = 0x7f050033
-net.micode.notes:drawable/new_note = 0x7f040030
-net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:string/menu_select_none = 0x7f0a0034
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:string/ticker_cancel = 0x7f0a0062
-net.micode.notes:drawable/list_red_single = 0x7f040024
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
-net.micode.notes:drawable/widget_4x_green = 0x7f040040
-net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/notealert_ok = 0x7f0a0043
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002f
-net.micode.notes:id/tv_title = 0x7f050041
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
-net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0054
-net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/ticker_fail = 0x7f0a0063
-net.micode.notes:string/search_label = 0x7f0a005a
-net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004e
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:string/widget_havenot_content = 0x7f0a0066
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
-net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:drawable/grassland = 0x7f040015
-net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:string/ticker_syncing = 0x7f0a0065
-net.micode.notes:drawable/menu_move = 0x7f04002f
-net.micode.notes:id/menu_search = 0x7f050029
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:string/menu_select_all = 0x7f0a003c
+net.micode.notes:string/menu_search = 0x7f0a003b
+net.micode.notes:string/menu_normal_mode = 0x7f0a0038
+net.micode.notes:string/menu_font_size = 0x7f0a0031
+net.micode.notes:string/menu_font_small = 0x7f0a0032
+net.micode.notes:string/menu_font_normal = 0x7f0a0030
+net.micode.notes:string/menu_remove_remind = 0x7f0a003a
+net.micode.notes:string/menu_font_large = 0x7f0a002f
+net.micode.notes:string/menu_folder_change_name = 0x7f0a002c
+net.micode.notes:string/menu_export_text = 0x7f0a002b
+net.micode.notes:string/menu_deselect_all = 0x7f0a0029
+net.micode.notes:string/menu_create_folder = 0x7f0a0027
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a0025
+net.micode.notes:string/success_sdcard_export = 0x7f0a0067
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a0023
+net.micode.notes:string/format_folder_files_count = 0x7f0a0022
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a0020
+net.micode.notes:string/preferences_account_summary = 0x7f0a0050
+net.micode.notes:string/format_date_ymd = 0x7f0a001f
+net.micode.notes:string/file_name_txt_format = 0x7f0a001c
+net.micode.notes:string/menu_select_none = 0x7f0a003d
+net.micode.notes:string/failed_sdcard_export = 0x7f0a001b
+net.micode.notes:string/error_sync_network = 0x7f0a001a
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0017
+net.micode.notes:string/error_note_not_exist = 0x7f0a0015
+net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0014
+net.micode.notes:string/delete_remind_time_message = 0x7f0a0012
+net.micode.notes:string/ticker_fail = 0x7f0a006d
+net.micode.notes:string/search_label = 0x7f0a0064
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0058
+net.micode.notes:string/app_widget2x2 = 0x7f0a000c
+net.micode.notes:string/app_name = 0x7f0a000b
+net.micode.notes:string/widget_havenot_content = 0x7f0a0070
+net.micode.notes:string/alert_title_delete = 0x7f0a0008
+net.micode.notes:string/alert_message_remove_encrypt = 0x7f0a0007
+net.micode.notes:string/alert_message_encrypt_error = 0x7f0a0006
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0003
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0002
+net.micode.notes:string/alert_message_decrypt_error = 0x7f0a0001
 net.micode.notes:raw/introduction = 0x7f090000
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0051
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a005b
 net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:drawable/list_red_middle = 0x7f040023
-net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:drawable/icon_app = 0x7f040016
-net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:drawable/list_background = 0x7f040017
-net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
-net.micode.notes:drawable/widget_2x_blue = 0x7f04003a
-net.micode.notes:layout/folder_list_item = 0x7f060004
-net.micode.notes:string/sync_progress_init_list = 0x7f0a005f
-net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:layout/widget_4x = 0x7f060019
+net.micode.notes:layout/settings_header = 0x7f060017
+net.micode.notes:string/format_exported_file_location = 0x7f0a0021
+net.micode.notes:layout/repeat_password_head = 0x7f060016
+net.micode.notes:layout/password_item = 0x7f060015
+net.micode.notes:layout/note_list_footer = 0x7f060014
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0010
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:layout/note_item = 0x7f060011
+net.micode.notes:layout/note_encryption = 0x7f06000e
+net.micode.notes:string/call_record_folder_name = 0x7f0a000f
+net.micode.notes:layout/note_edit_list_item = 0x7f06000d
+net.micode.notes:layout/note_edit = 0x7f06000c
+net.micode.notes:layout/new_password_head = 0x7f06000a
+net.micode.notes:layout/item_grid = 0x7f060007
+net.micode.notes:layout/homepage = 0x7f060006
+net.micode.notes:id/move = 0x7f050046
+net.micode.notes:layout/layout2 = 0x7f060009
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0069
+net.micode.notes:id/btn_new_note = 0x7f050012
 net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/widget_text = 0x7f050044
-net.micode.notes:id/widget_bg_image = 0x7f050043
-net.micode.notes:string/menu_folder_delete = 0x7f0a0025
-net.micode.notes:id/tv_name = 0x7f05003f
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:id/tv_folder_name = 0x7f05003d
-net.micode.notes:id/tv_alert_date = 0x7f05003c
+net.micode.notes:id/widget_text = 0x7f050061
+net.micode.notes:id/widget_bg_image = 0x7f050060
+net.micode.notes:string/app_widget4x4 = 0x7f0a000d
+net.micode.notes:id/tv_pass2 = 0x7f05005a
+net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
+net.micode.notes:string/preferences_menu_remove_account = 0x7f0a005e
+net.micode.notes:string/button_delete = 0x7f0a000e
+net.micode.notes:id/tv_pass1 = 0x7f050059
+net.micode.notes:string/notealert_ok = 0x7f0a004d
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0037
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a0013
+net.micode.notes:id/menu_delete_encrypt = 0x7f050035
+net.micode.notes:id/tv_title = 0x7f05005e
+net.micode.notes:string/menu_folder_delete = 0x7f0a002d
+net.micode.notes:id/tv_name = 0x7f050058
+net.micode.notes:id/account_dialog_title = 0x7f05000e
+net.micode.notes:id/tv_folder_name = 0x7f050056
+net.micode.notes:id/tv_alert_date = 0x7f050055
 net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:id/tv_time = 0x7f050040
-net.micode.notes:id/selection_menu = 0x7f05003a
-net.micode.notes:id/preference_sync_button = 0x7f050039
-net.micode.notes:id/note_title = 0x7f050036
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
-net.micode.notes:id/note_bg_color_selector = 0x7f050032
-net.micode.notes:id/navigation_bar = 0x7f050031
-net.micode.notes:id/move = 0x7f050030
-net.micode.notes:id/menu_sync = 0x7f05002d
-net.micode.notes:id/menu_share = 0x7f05002c
-net.micode.notes:string/menu_move = 0x7f0a002e
-net.micode.notes:id/date = 0x7f050007
-net.micode.notes:id/note_item = 0x7f050035
-net.micode.notes:id/menu_setting = 0x7f05002b
-net.micode.notes:id/menu_send_to_desktop = 0x7f05002a
+net.micode.notes:id/tv_time = 0x7f05005d
+net.micode.notes:id/selection_menu = 0x7f050052
+net.micode.notes:id/ratingBar = 0x7f050051
+net.micode.notes:id/preference_sync_button = 0x7f050050
+net.micode.notes:id/note_title = 0x7f05004d
+net.micode.notes:id/note_decryption = 0x7f050049
+net.micode.notes:id/note_bg_color_selector = 0x7f050048
+net.micode.notes:id/menu_set_importance = 0x7f050040
+net.micode.notes:id/navigation_bar = 0x7f050047
+net.micode.notes:id/menu_delete_remind = 0x7f050036
+net.micode.notes:layout/current_password_head = 0x7f060002
+net.micode.notes:id/menu_sync = 0x7f050043
+net.micode.notes:id/menu_share = 0x7f050042
+net.micode.notes:string/menu_move = 0x7f0a0036
+net.micode.notes:id/date = 0x7f050015
+net.micode.notes:id/note_item = 0x7f05004c
+net.micode.notes:id/menu_setting = 0x7f050041
+net.micode.notes:id/menu_send_to_desktop = 0x7f05003f
+net.micode.notes:string/ticker_syncing = 0x7f0a006f
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a0011
+net.micode.notes:drawable/menu_move = 0x7f040037
+net.micode.notes:id/menu_search = 0x7f05003e
 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
-net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:id/note_edit_view = 0x7f050034
-net.micode.notes:id/menu_list_mode = 0x7f050026
-net.micode.notes:string/preferences_account_summary = 0x7f0a0046
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:id/menu_grass = 0x7f050025
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004f
-net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004a
-net.micode.notes:id/menu_alert = 0x7f050020
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040019
+net.micode.notes:id/note_edit_view = 0x7f05004b
+net.micode.notes:id/menu_list_mode = 0x7f05003b
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0059
+net.micode.notes:id/menu_font_size = 0x7f050039
+net.micode.notes:layout/note_decryption = 0x7f06000b
+net.micode.notes:id/menu_grassland = 0x7f05003a
+net.micode.notes:id/menu_encrypt = 0x7f050037
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0054
+net.micode.notes:id/menu_alert = 0x7f050033
 net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
-net.micode.notes:id/minute = 0x7f05002f
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004b
-net.micode.notes:id/iv_super_select = 0x7f05001b
-net.micode.notes:string/ticker_success = 0x7f0a0064
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:id/menu_water = 0x7f05002e
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
+net.micode.notes:id/ll_font_super = 0x7f050032
+net.micode.notes:id/ll_font_small = 0x7f050031
+net.micode.notes:id/minute = 0x7f050045
+net.micode.notes:id/ll_font_normal = 0x7f050030
+net.micode.notes:id/ll_font_large = 0x7f05002f
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0055
+net.micode.notes:id/iv_super_select = 0x7f05002d
+net.micode.notes:id/gv_keyboard = 0x7f05001a
+net.micode.notes:id/iv_large_select = 0x7f050029
+net.micode.notes:id/iv_importance = 0x7f050028
+net.micode.notes:id/menu_water = 0x7f050044
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050027
 net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:string/notelist_menu_new = 0x7f0a0044
-net.micode.notes:string/menu_grassland = 0x7f0a002c
-net.micode.notes:drawable/menu_delete = 0x7f04002e
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
-net.micode.notes:menu/note_edit = 0x7f070002
-net.micode.notes:drawable/list_white_down = 0x7f040026
-net.micode.notes:drawable/list_white_up = 0x7f040029
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:drawable/delete = 0x7f040004
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
-net.micode.notes:drawable/list_green_single = 0x7f040020
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
-net.micode.notes:drawable/list_yellow_single = 0x7f04002c
-net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:color/user_query_highlight = 0x7f020002
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0056
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003e
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:id/menu_new_note = 0x7f050028
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:drawable/widget_2x_red = 0x7f04003c
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040043
-net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
-net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:style/NoteTheme = 0x7f0b0003
-net.micode.notes:drawable/notification = 0x7f040034
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:string/menu_title_select_folder = 0x7f0a003b
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:drawable/list_red_down = 0x7f040022
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:drawable/widget_4x_blue = 0x7f04003f
-net.micode.notes:drawable/edit_title_white = 0x7f04000c
-net.micode.notes:string/menu_delete = 0x7f0a0021
-net.micode.notes:drawable/list_footer_bg = 0x7f04001d
-net.micode.notes:drawable/edit_red = 0x7f040008
-net.micode.notes:string/preferences_menu_cancel = 0x7f0a0052
-net.micode.notes:drawable/widget_2x_white = 0x7f04003d
-net.micode.notes:drawable/font_large = 0x7f040010
-net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/menu_alert = 0x7f0a001f
-net.micode.notes:drawable/title_alert = 0x7f040037
-net.micode.notes:drawable/list_green_down = 0x7f04001e
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:drawable/search_result = 0x7f040035
-net.micode.notes:string/app_widget4x4 = 0x7f0a0006
-net.micode.notes:drawable/title_bar_bg = 0x7f040038
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050037
+net.micode.notes:string/notelist_menu_new = 0x7f0a004e
+net.micode.notes:string/menu_grassland = 0x7f0a0034
+net.micode.notes:drawable/menu_delete = 0x7f040036
+net.micode.notes:id/iv_bg_red_select = 0x7f050023
+net.micode.notes:id/iv_bg_red = 0x7f050022
+net.micode.notes:id/menu_new_note = 0x7f05003d
+net.micode.notes:id/iv_bg_green_select = 0x7f050021
+net.micode.notes:id/img_cancel = 0x7f05001c
+net.micode.notes:id/hour = 0x7f05001b
+net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0060
+net.micode.notes:id/et_edit_text = 0x7f050017
+net.micode.notes:drawable/list_white_single = 0x7f04002f
+net.micode.notes:id/btn_keys = 0x7f050011
+net.micode.notes:id/action_select_all = 0x7f05000f
+net.micode.notes:drawable/delete = 0x7f04000b
+net.micode.notes:id/iv_bg_blue = 0x7f05001e
+net.micode.notes:id/TableLayout01 = 0x7f05000b
+net.micode.notes:drawable/widget_2x_yellow = 0x7f040048
+net.micode.notes:id/Red = 0x7f05000a
+net.micode.notes:id/Green = 0x7f050009
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:drawable/attention4 = 0x7f040004
+net.micode.notes:id/Button04 = 0x7f050004
+net.micode.notes:drawable/list_white_middle = 0x7f04002e
+net.micode.notes:id/Button08 = 0x7f050007
+net.micode.notes:id/Button06 = 0x7f050005
+net.micode.notes:id/Button02 = 0x7f050002
+net.micode.notes:id/delete = 0x7f050016
+net.micode.notes:id/Button01 = 0x7f050001
+net.micode.notes:menu/note_list = 0x7f070003
+net.micode.notes:drawable/grassland = 0x7f04001c
+net.micode.notes:drawable/widget_2x_red = 0x7f040046
+net.micode.notes:drawable/widget_4x_yellow = 0x7f04004d
+net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
+net.micode.notes:string/error_sdcard_export = 0x7f0a0016
+net.micode.notes:drawable/widget_4x_green = 0x7f04004a
+net.micode.notes:id/textCount = 0x7f050054
+net.micode.notes:string/menu_title_select_folder = 0x7f0a0045
+net.micode.notes:string/hint_foler_name = 0x7f0a0024
+net.micode.notes:drawable/list_red_down = 0x7f040029
+net.micode.notes:id/menu_delete = 0x7f050034
+net.micode.notes:drawable/widget_4x_blue = 0x7f040049
+net.micode.notes:id/amPm = 0x7f050010
+net.micode.notes:string/menu_delete = 0x7f0a0028
+net.micode.notes:drawable/list_footer_bg = 0x7f040024
+net.micode.notes:drawable/edit_red = 0x7f04000f
+net.micode.notes:drawable/edit_title_white = 0x7f040013
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a005c
+net.micode.notes:drawable/widget_2x_white = 0x7f040047
+net.micode.notes:drawable/search_result = 0x7f04003d
+net.micode.notes:layout/folder_list_item = 0x7f060005
+net.micode.notes:drawable/widget_2x_blue = 0x7f040044
+net.micode.notes:id/notes_list = 0x7f05004e
+net.micode.notes:drawable/selector_key_del = 0x7f040040
 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/menu_water = 0x7f0a003c
-net.micode.notes:drawable/water = 0x7f040039
-net.micode.notes:drawable/selected = 0x7f040036
+net.micode.notes:string/menu_water = 0x7f0a0046
+net.micode.notes:drawable/water = 0x7f040043
+net.micode.notes:drawable/selected = 0x7f04003e
 net.micode.notes:plurals/search_results_title = 0x7f080000
-net.micode.notes:drawable/edit_title_green = 0x7f04000a
-net.micode.notes:drawable/new_note_normal = 0x7f040031
-net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:drawable/widget_2x_green = 0x7f04003b
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002d
-net.micode.notes:id/iv_bg_red = 0x7f050012
-net.micode.notes:drawable/list_white_single = 0x7f040028
+net.micode.notes:drawable/edit_title_green = 0x7f040011
+net.micode.notes:style/NoteTheme = 0x7f0b0003
+net.micode.notes:id/iv_bg_blue_select = 0x7f05001f
+net.micode.notes:drawable/notification = 0x7f04003c
+net.micode.notes:drawable/new_note_normal = 0x7f040039
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:drawable/lock = 0x7f040035
+net.micode.notes:drawable/edit_white = 0x7f040015
+net.micode.notes:drawable/widget_2x_green = 0x7f040045
+net.micode.notes:id/iv_bg_white = 0x7f050024
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040007
+net.micode.notes:drawable/list_yellow_up = 0x7f040034
+net.micode.notes:id/account_dialog_subtitle = 0x7f05000d
 net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:drawable/edit_title_red = 0x7f04000b
-net.micode.notes:id/tv_title_bar = 0x7f050042
-net.micode.notes:drawable/list_red_up = 0x7f040025
-net.micode.notes:id/delete = 0x7f050008
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
-net.micode.notes:string/call_record_folder_name = 0x7f0a0008
-net.micode.notes:drawable/list_green_up = 0x7f040021
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038
-net.micode.notes:id/et_foler_name = 0x7f05000a
-net.micode.notes:id/menu_delete_remind = 0x7f050022
-net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:string/menu_folder_view = 0x7f0a0026
-net.micode.notes:drawable/dropdown_icon = 0x7f040005
-net.micode.notes:string/notelist_string_info = 0x7f0a0045
-net.micode.notes:drawable/list_blue_single = 0x7f04001a
-net.micode.notes:drawable/list_white_middle = 0x7f040027
-net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
+net.micode.notes:id/Button03 = 0x7f050003
+net.micode.notes:id/iv_bg_green = 0x7f050020
+net.micode.notes:drawable/list_white_down = 0x7f04002d
+net.micode.notes:drawable/list_white_up = 0x7f040030
+net.micode.notes:id/iv_lock_icon = 0x7f05002a
+net.micode.notes:string/menu_encrypt = 0x7f0a002a
+net.micode.notes:layout/note_importance = 0x7f060010
+net.micode.notes:drawable/edit_title_red = 0x7f040012
+net.micode.notes:id/tv_title_bar = 0x7f05005f
+net.micode.notes:drawable/list_red_up = 0x7f04002c
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0044
+net.micode.notes:id/tv_pass4 = 0x7f05005c
+net.micode.notes:drawable/cancel = 0x7f040009
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f04003b
+net.micode.notes:id/menu_export_text = 0x7f050038
+net.micode.notes:layout/widget_2x = 0x7f060018
+net.micode.notes:drawable/list_red_middle = 0x7f04002a
+net.micode.notes:string/alert_title_encrypt = 0x7f0a0009
+net.micode.notes:drawable/widget_4x_white = 0x7f04004c
+net.micode.notes:drawable/font_small = 0x7f04001a
+net.micode.notes:array/menu_share_ways = 0x7f010001
+net.micode.notes:id/btn_set_bg_color = 0x7f050013
+net.micode.notes:drawable/list_green_up = 0x7f040028
+net.micode.notes:id/iv_alert_icon = 0x7f05001d
+net.micode.notes:drawable/list_green_single = 0x7f040027
+net.micode.notes:drawable/list_green_middle = 0x7f040026
 net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:drawable/list_folder = 0x7f04001c
-net.micode.notes:drawable/list_green_middle = 0x7f04001f
-net.micode.notes:string/sync_progress_syncing = 0x7f0a0061
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:drawable/list_blue_up = 0x7f04001b
-net.micode.notes:id/iv_small_select = 0x7f05001a
-net.micode.notes:drawable/list_blue_down = 0x7f040018
+net.micode.notes:drawable/list_folder = 0x7f040023
+net.micode.notes:string/folder_exist = 0x7f0a001e
+net.micode.notes:string/alert_message_decrypt = 0x7f0a0000
+net.micode.notes:drawable/new_note = 0x7f040038
+net.micode.notes:id/note_edit_list = 0x7f05004a
+net.micode.notes:string/sync_progress_syncing = 0x7f0a006b
+net.micode.notes:drawable/font_normal = 0x7f040018
+net.micode.notes:drawable/list_blue_up = 0x7f040022
+net.micode.notes:string/menu_folder_view = 0x7f0a002e
+net.micode.notes:drawable/dropdown_icon = 0x7f04000c
+net.micode.notes:string/notelist_string_info = 0x7f0a004f
+net.micode.notes:drawable/list_blue_single = 0x7f040021
+net.micode.notes:string/preferences_add_account = 0x7f0a0052
+net.micode.notes:id/linear_pass = 0x7f05002e
 net.micode.notes:dimen/text_font_size_super = 0x7f030004
-net.micode.notes:drawable/edit_yellow = 0x7f04000f
-net.micode.notes:drawable/list_yellow_down = 0x7f04002a
-net.micode.notes:drawable/edit_blue = 0x7f040006
-net.micode.notes:array/format_for_exported_note = 0x7f010000
-net.micode.notes:string/menu_list_mode = 0x7f0a002d
-net.micode.notes:drawable/list_yellow_middle = 0x7f04002b
-net.micode.notes:drawable/list_blue_middle = 0x7f040019
-net.micode.notes:dimen/text_font_size_medium = 0x7f030001
-net.micode.notes:drawable/new_note_pressed = 0x7f040032
-net.micode.notes:id/menu_new_folder = 0x7f050027
-net.micode.notes:id/sv_note_edit = 0x7f05003b
-net.micode.notes:drawable/call_record = 0x7f040002
-net.micode.notes:drawable/edit_green = 0x7f040007
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:id/tv_modified_date = 0x7f05003e
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
-net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:string/menu_font_super = 0x7f0a002b
-net.micode.notes:drawable/widget_4x_red = 0x7f040041
-net.micode.notes:layout/settings_header = 0x7f06000b
+net.micode.notes:string/menu_font_super = 0x7f0a0033
+net.micode.notes:drawable/widget_4x_red = 0x7f04004b
+net.micode.notes:id/tv_pass3 = 0x7f05005b
+net.micode.notes:drawable/clock = 0x7f04000a
+net.micode.notes:string/alert_message_encrypt = 0x7f0a0005
+net.micode.notes:id/Button07 = 0x7f050006
+net.micode.notes:string/file_path = 0x7f0a001d
+net.micode.notes:drawable/font_large = 0x7f040017
+net.micode.notes:layout/note_encryption_repeat = 0x7f06000f
+net.micode.notes:drawable/edit_yellow = 0x7f040016
+net.micode.notes:drawable/list_yellow_down = 0x7f040031
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:layout/dialog_edit_text = 0x7f060004
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0004
+net.micode.notes:drawable/list_background = 0x7f04001e
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:id/font_size_selector = 0x7f050019
+net.micode.notes:drawable/list_yellow_single = 0x7f040033
+net.micode.notes:id/cb_edit_item = 0x7f050014
+net.micode.notes:drawable/font_super = 0x7f04001b
+net.micode.notes:drawable/edit_title_blue = 0x7f040010
+net.micode.notes:drawable/bg_btn_set_color = 0x7f040006
+net.micode.notes:id/iv_bg_yellow = 0x7f050026
+net.micode.notes:drawable/selector_grid = 0x7f04003f
+net.micode.notes:drawable/edit_green = 0x7f04000e
+net.micode.notes:string/menu_list_mode = 0x7f0a0035
+net.micode.notes:drawable/list_yellow_middle = 0x7f040032
+net.micode.notes:drawable/list_blue_middle = 0x7f040020
+net.micode.notes:drawable/new_note_pressed = 0x7f04003a
+net.micode.notes:id/menu_new_folder = 0x7f05003c
+net.micode.notes:string/menu_alert = 0x7f0a0026
+net.micode.notes:string/error_sync_internal = 0x7f0a0019
+net.micode.notes:drawable/title_alert = 0x7f040041
+net.micode.notes:drawable/list_green_down = 0x7f040025
+net.micode.notes:layout/note_list = 0x7f060012
+net.micode.notes:drawable/icon_app = 0x7f04001d
+net.micode.notes:id/iv_small_select = 0x7f05002c
+net.micode.notes:drawable/attention3 = 0x7f040003
+net.micode.notes:drawable/list_blue_down = 0x7f04001f
+net.micode.notes:string/menu_remove_encrypt = 0x7f0a0039
+net.micode.notes:string/alert_title_importance = 0x7f0a000a
+net.micode.notes:drawable/title_bar_bg = 0x7f040042
+net.micode.notes:layout/layout = 0x7f060008
+net.micode.notes:id/Blue = 0x7f050000
+net.micode.notes:id/sv_note_edit = 0x7f050053
+net.micode.notes:drawable/call_record = 0x7f040008
+net.micode.notes:drawable/edit_blue = 0x7f04000d
+net.micode.notes:drawable/attention2 = 0x7f040002
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05004f
+net.micode.notes:id/et_foler_name = 0x7f050018
+net.micode.notes:id/tv_modified_date = 0x7f050057
+net.micode.notes:id/iv_bg_white_select = 0x7f050025
+net.micode.notes:drawable/edit_title_yellow = 0x7f040014
 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
 net.micode.notes:dimen/text_font_size_small = 0x7f030003
-net.micode.notes:layout/datetime_picker = 0x7f060002
-net.micode.notes:menu/note_list_options = 0x7f070005
-net.micode.notes:drawable/widget_4x_white = 0x7f040042
+net.micode.notes:drawable/attention0 = 0x7f040000
+net.micode.notes:string/ticker_success = 0x7f0a006e
+net.micode.notes:id/iv_medium_select = 0x7f05002b
+net.micode.notes:id/ButtonR = 0x7f050008
+net.micode.notes:layout/datetime_picker = 0x7f060003
+net.micode.notes:string/ticker_cancel = 0x7f0a006c
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0018
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060013
+net.micode.notes:drawable/list_red_single = 0x7f04002b
+net.micode.notes:drawable/attention1 = 0x7f040001
+net.micode.notes:id/TableLayout02 = 0x7f05000c
+net.micode.notes:drawable/attention5 = 0x7f040005
diff --git a/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
index 5a9e472..e7fc81e 100644
Binary files a/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ
diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk
index abe4028..3fc12db 100644
Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/app/build/outputs/code_coverage/debugAndroidTest/connected/coverage.ec b/app/build/outputs/code_coverage/debugAndroidTest/connected/coverage.ec
new file mode 100644
index 0000000..e69de29
diff --git a/app/build/reports/androidTests/connected/debug/css/base-style.css b/app/build/reports/androidTests/connected/debug/css/base-style.css
new file mode 100644
index 0000000..e09a387
--- /dev/null
+++ b/app/build/reports/androidTests/connected/debug/css/base-style.css
@@ -0,0 +1,162 @@
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: sans-serif;
+    font-size: 12pt;
+}
+
+body, a, a:visited {
+    color: #303030;
+}
+
+#content {
+    padding-left: 50px;
+    padding-right: 50px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+#content h1 {
+    font-size: 160%;
+    margin-bottom: 10px;
+}
+
+#footer {
+    margin-top: 100px;
+    font-size: 80%;
+    white-space: nowrap;
+}
+
+#footer, #footer a {
+    color: #a0a0a0;
+}
+
+ul {
+    margin-left: 0;
+}
+
+h1, h2, h3 {
+    white-space: nowrap;
+}
+
+h2 {
+    font-size: 120%;
+}
+
+ul.tabLinks {
+    padding-left: 0;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    overflow: auto;
+    min-width: 800px;
+    width: auto !important;
+    width: 800px;
+}
+
+ul.tabLinks li {
+    float: left;
+    height: 100%;
+    list-style: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-bottom: 0;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+    margin-right: 25px;
+    border: solid 1px #d4d4d4;
+    background-color: #f0f0f0;
+    behavior: url(css3-pie-1.0beta3.htc);
+}
+
+ul.tabLinks li:hover {
+    background-color: #fafafa;
+}
+
+ul.tabLinks li.selected {
+    background-color: #c5f0f5;
+    border-color: #c5f0f5;
+}
+
+ul.tabLinks a {
+    font-size: 120%;
+    display: block;
+    outline: none;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+}
+
+ul.tabLinks li h2 {
+    margin: 0;
+    padding: 0;
+}
+
+div.tab {
+}
+
+div.selected {
+    display: block;
+}
+
+div.deselected {
+    display: none;
+}
+
+div.tab table {
+    min-width: 350px;
+    width: auto !important;
+    width: 350px;
+    border-collapse: collapse;
+}
+
+div.tab th, div.tab table {
+    border-bottom: solid #d0d0d0 1px;
+}
+
+div.tab th {
+    text-align: left;
+    white-space: nowrap;
+    padding-left: 6em;
+}
+
+div.tab th:first-child {
+    padding-left: 0;
+}
+
+div.tab td {
+    white-space: nowrap;
+    padding-left: 6em;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+div.tab td:first-child {
+    padding-left: 0;
+}
+
+div.tab td.numeric, div.tab th.numeric {
+    text-align: right;
+}
+
+span.code {
+    display: inline-block;
+    margin-top: 0em;
+    margin-bottom: 1em;
+}
+
+span.code pre {
+    font-size: 11pt;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0;
+    background-color: #f7f7f7;
+    border: solid 1px #d0d0d0;
+    min-width: 700px;
+    width: auto !important;
+    width: 700px;
+}
diff --git a/app/build/reports/androidTests/connected/debug/css/style.css b/app/build/reports/androidTests/connected/debug/css/style.css
new file mode 100644
index 0000000..2440a1f
--- /dev/null
+++ b/app/build/reports/androidTests/connected/debug/css/style.css
@@ -0,0 +1,81 @@
+
+#summary {
+    margin-top: 30px;
+    margin-bottom: 40px;
+}
+
+#summary table {
+    border-collapse: collapse;
+}
+
+#summary td {
+    vertical-align: top;
+}
+
+.breadcrumbs, .breadcrumbs a {
+    color: #606060;
+}
+
+.infoBox {
+    width: 110px;
+    padding-top: 15px;
+    padding-bottom: 15px;
+    text-align: center;
+}
+
+.infoBox p {
+    margin: 0;
+}
+
+.counter, .percent {
+    font-size: 120%;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+#duration {
+    width: 125px;
+}
+
+#successRate, .summaryGroup {
+    border: solid 2px #d0d0d0;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    behavior: url(css3-pie-1.0beta3.htc);
+}
+
+#successRate {
+    width: 140px;
+    margin-left: 35px;
+}
+
+#successRate .percent {
+    font-size: 180%;
+}
+
+.success, .success a {
+    color: #008000;
+}
+
+div.success, #successRate.success {
+    background-color: #bbd9bb;
+    border-color: #008000;
+}
+
+.failures, .failures a {
+    color: #b60808;
+}
+
+div.failures, #successRate.failures {
+    background-color: #ecdada;
+    border-color: #b60808;
+}
+
+ul.linkList {
+    padding-left: 0;
+}
+
+ul.linkList li {
+    list-style: none;
+    margin-bottom: 5px;
+}
diff --git a/app/build/reports/androidTests/connected/debug/index.html b/app/build/reports/androidTests/connected/debug/index.html
new file mode 100644
index 0000000..23ead53
--- /dev/null
+++ b/app/build/reports/androidTests/connected/debug/index.html
@@ -0,0 +1,85 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>Test results - Test Summary</title>
+<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="css/style.css" rel="stylesheet" type="text/css"/>
+<script src="js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Test Summary</h1>
+<div id="summary">
+<table>
+<tr>
+<td>
+<div class="summaryGroup">
+<table>
+<tr>
+<td>
+<div class="infoBox" id="tests">
+<div class="counter">0</div>
+<p>tests</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="failures">
+<div class="counter">0</div>
+<p>failures</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="skipped">
+<div class="counter">0</div>
+<p>skipped</p>
+</div>
+</td>
+<td>
+<div class="infoBox" id="duration">
+<div class="counter">-</div>
+<p>duration</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+</td>
+<td>
+<div class="infoBox success" id="successRate">
+<div class="percent">-</div>
+<p>N/A</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Classes</a>
+</li>
+</ul>
+<div id="tab0" class="tab">
+<h2>Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Class</th>
+<th>Tests</th>
+<th>Failures</th>
+<th>Skipped</th>
+<th>Duration</th>
+<th>Success rate</th>
+</tr>
+</thead>
+<tbody/>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>Generated by 
+<a href="http://www.gradle.org">Gradle 8.0</a> at 2023年11月19日 下午5:54:22</p>
+</div>
+</div>
+</body>
\ No newline at end of file
diff --git a/app/build/reports/androidTests/connected/debug/js/report.js b/app/build/reports/androidTests/connected/debug/js/report.js
new file mode 100644
index 0000000..a4455e4
--- /dev/null
+++ b/app/build/reports/androidTests/connected/debug/js/report.js
@@ -0,0 +1,101 @@
+var tabs = new Object();
+
+function initTabs() {
+    var container = document.getElementById('tabs');
+    tabs.tabs = findTabs(container);
+    tabs.titles = findTitles(tabs.tabs);
+    tabs.headers = findHeaders(container);
+    tabs.select = select;
+    tabs.deselectAll = deselectAll;
+    tabs.select(0);
+    return true;
+}
+
+window.onload = initTabs;
+
+function switchTab() {
+    var id = this.id.substr(1);
+    for (var i = 0; i < tabs.tabs.length; i++) {
+        if (tabs.tabs[i].id == id) {
+            tabs.select(i);
+            break;
+        }
+    }
+    return false;
+}
+
+function select(i) {
+    this.deselectAll();
+    changeElementClass(this.tabs[i], 'tab selected');
+    changeElementClass(this.headers[i], 'selected');
+    while (this.headers[i].firstChild) {
+        this.headers[i].removeChild(this.headers[i].firstChild);
+    }
+    var h2 = document.createElement('H2');
+    h2.appendChild(document.createTextNode(this.titles[i]));
+    this.headers[i].appendChild(h2);
+}
+
+function deselectAll() {
+    for (var i = 0; i < this.tabs.length; i++) {
+        changeElementClass(this.tabs[i], 'tab deselected');
+        changeElementClass(this.headers[i], 'deselected');
+        while (this.headers[i].firstChild) {
+            this.headers[i].removeChild(this.headers[i].firstChild);
+        }
+        var a = document.createElement('A');
+        a.setAttribute('id', 'ltab' + i);
+        a.setAttribute('href', '#tab' + i);
+        a.onclick = switchTab;
+        a.appendChild(document.createTextNode(this.titles[i]));
+        this.headers[i].appendChild(a);
+    }
+}
+
+function changeElementClass(element, classValue) {
+    if (element.getAttribute('className')) {
+        /* IE */
+        element.setAttribute('className', classValue)
+    } else {
+        element.setAttribute('class', classValue)
+    }
+}
+
+function findTabs(container) {
+    return findChildElements(container, 'DIV', 'tab');
+}
+
+function findHeaders(container) {
+    var owner = findChildElements(container, 'UL', 'tabLinks');
+    return findChildElements(owner[0], 'LI', null);
+}
+
+function findTitles(tabs) {
+    var titles = new Array();
+    for (var i = 0; i < tabs.length; i++) {
+        var tab = tabs[i];
+        var header = findChildElements(tab, 'H2', null)[0];
+        header.parentNode.removeChild(header);
+        if (header.innerText) {
+            titles.push(header.innerText)
+        } else {
+            titles.push(header.textContent)
+        }
+    }
+    return titles;
+}
+
+function findChildElements(container, name, targetClass) {
+    var elements = new Array();
+    var children = container.childNodes;
+    for (var i = 0; i < children.length; i++) {
+        var child = children.item(i);
+        if (child.nodeType == 1 && child.nodeName == name) {
+            if (targetClass && child.className.indexOf(targetClass) < 0) {
+                continue;
+            }
+            elements.push(child);
+        }
+    }
+    return elements;
+}
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId29 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId29
new file mode 100644
index 0000000..98353eb
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AlarmAlertActivity.class.uniqueId29 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId9 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId9
new file mode 100644
index 0000000..114a402
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId9 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$10.class.uniqueId5 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$10.class.uniqueId5
new file mode 100644
index 0000000..7db1cb9
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$10.class.uniqueId5 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$11.class.uniqueId16 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$11.class.uniqueId16
new file mode 100644
index 0000000..b74ada1
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$11.class.uniqueId16 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$12.class.uniqueId36 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$12.class.uniqueId36
new file mode 100644
index 0000000..d2e1063
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$12.class.uniqueId36 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2$1.class.uniqueId23 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2$1.class.uniqueId23
new file mode 100644
index 0000000..b8abb80
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2$1.class.uniqueId23 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId12 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId12
new file mode 100644
index 0000000..043cd50
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId12 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId35 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId35
new file mode 100644
index 0000000..d27d6f6
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$3.class.uniqueId35 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId22 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId22
new file mode 100644
index 0000000..bbb5146
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$4.class.uniqueId22 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$5.class.uniqueId25 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$5.class.uniqueId25
new file mode 100644
index 0000000..b4476fe
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$5.class.uniqueId25 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$6.class.uniqueId6 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$6.class.uniqueId6
new file mode 100644
index 0000000..a75e559
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$6.class.uniqueId6 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$7.class.uniqueId14 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$7.class.uniqueId14
new file mode 100644
index 0000000..5233447
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$7.class.uniqueId14 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8$1.class.uniqueId34 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8$1.class.uniqueId34
new file mode 100644
index 0000000..87171b5
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8$1.class.uniqueId34 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8.class.uniqueId37 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8.class.uniqueId37
new file mode 100644
index 0000000..c33fe0d
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$8.class.uniqueId37 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$9.class.uniqueId17 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$9.class.uniqueId17
new file mode 100644
index 0000000..56c2d67
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$9.class.uniqueId17 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId13 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId13
new file mode 100644
index 0000000..7285b59
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$HeadViewHolder.class.uniqueId13 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout$1.class.uniqueId3 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout$1.class.uniqueId3
new file mode 100644
index 0000000..d9228bb
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout$1.class.uniqueId3 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout.class.uniqueId21 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout.class.uniqueId21
new file mode 100644
index 0000000..610488a
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$RatingBarLayout.class.uniqueId21 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26
new file mode 100644
index 0000000..00e13fe
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity.class.uniqueId26 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId28 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId28
new file mode 100644
index 0000000..30945a9
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteItemData.class.uniqueId28 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId8 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId8
new file mode 100644
index 0000000..a00281f
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteWidgetProvider.class.uniqueId8 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId15 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId15
new file mode 100644
index 0000000..7e8ab9f
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$1.class.uniqueId15 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30
new file mode 100644
index 0000000..555e10f
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$2.class.uniqueId30 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId1 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId1
new file mode 100644
index 0000000..fa03692
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$3.class.uniqueId1 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId18 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId18
new file mode 100644
index 0000000..6ec9127
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$4.class.uniqueId18 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId32 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId32
new file mode 100644
index 0000000..11f13f8
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$5.class.uniqueId32 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId10 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId10
new file mode 100644
index 0000000..bc414a3
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$6.class.uniqueId10 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId27 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId27
new file mode 100644
index 0000000..8473298
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$7.class.uniqueId27 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId4 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId4
new file mode 100644
index 0000000..e090061
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId4 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId24 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId24
new file mode 100644
index 0000000..8f35f1e
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$9.class.uniqueId24 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId33 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId33
new file mode 100644
index 0000000..d7a4585
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$BackgroundQueryHandler.class.uniqueId33 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId7 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId7
new file mode 100644
index 0000000..3774a29
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ListEditState.class.uniqueId7 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId19 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId19
new file mode 100644
index 0000000..a71429f
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$1.class.uniqueId19 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId0 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId0
new file mode 100644
index 0000000..e122732
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId0 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId2 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId2
new file mode 100644
index 0000000..4e6294f
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback.class.uniqueId2 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11
new file mode 100644
index 0000000..4bc3a45
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$NewNoteOnTouchListener.class.uniqueId11 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId20 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId20
new file mode 100644
index 0000000..aa43949
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$OnListItemClickListener.class.uniqueId20 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId31 b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId31
new file mode 100644
index 0000000..6b4f61a
Binary files /dev/null and b/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity.class.uniqueId31 differ
diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 67459f3..809545b 100644
Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/app/src/main/java/net/micode/notes/data/Notes.java b/app/src/main/java/net/micode/notes/data/Notes.java
index f240604..f727743 100644
--- a/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/app/src/main/java/net/micode/notes/data/Notes.java
@@ -165,8 +165,14 @@ public class Notes {
          * <P> Type : INTEGER (long) </P>
          */
         public static final String VERSION = "version";
-    }
 
+        public static final String PASSWORD = "password";
+
+        public static final String IMPORTANCE = "importance";
+    }
+    /*
+     * 便签数据在数据库中的表头
+     */
     public interface DataColumns {
         /**
          * The unique ID for a row
diff --git a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index ffe5d57..eb0a34b 100644
--- a/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -28,7 +28,7 @@ import net.micode.notes.data.Notes.NoteColumns;
 
 
 public class NotesDatabaseHelper extends SQLiteOpenHelper {
-    private static final String DB_NAME = "note.db";
+    private static final String DB_NAME = "note2.db";
 
     private static final int DB_VERSION = 4;
 
@@ -60,7 +60,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
             NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
             NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
-            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
+            NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0," +
+            NoteColumns.PASSWORD + " TEXT NOT NULL DEFAULT ''," +
+            NoteColumns.IMPORTANCE + " INTEGER NOT NULL DEFAULT 0" +
         ")";
 
     private static final String CREATE_DATA_TABLE_SQL =
@@ -358,5 +360,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private void upgradeToV4(SQLiteDatabase db) {
         db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
                 + " INTEGER NOT NULL DEFAULT 0");
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.PASSWORD
+                + " TEXT NOT NULL DEFAULT ''");
+        db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.IMPORTANCE
+                + " INTEGER NOT NULL DEFAULT 0");
     }
 }
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index 3398c9b..1437291 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -82,14 +82,14 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }
 
-    //@Override
+    @Override
     protected Integer doInBackground(Void... unused) {
         publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity
                 .getSyncAccountName(mContext)));
         return mTaskManager.sync(mContext, this);
     }
 
-    //@Override
+    @Override
     protected void onProgressUpdate(String... progress) {
         showNotification(R.string.ticker_syncing, progress[0]);
         if (mContext instanceof GTaskSyncService) {
@@ -97,7 +97,7 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
         }
     }
 
-    //@Override
+    @Override
     protected void onPostExecute(Integer result) {
         if (result == GTaskManager.STATE_SUCCESS) {
             showNotification(R.string.ticker_success, mContext.getString(
diff --git a/app/src/main/java/net/micode/notes/model/Note.java b/app/src/main/java/net/micode/notes/model/Note.java
index 6706cf6..ee86fdd 100644
--- a/app/src/main/java/net/micode/notes/model/Note.java
+++ b/app/src/main/java/net/micode/notes/model/Note.java
@@ -37,6 +37,11 @@ import java.util.ArrayList;
 public class Note {
     private ContentValues mNoteDiffValues;
     private NoteData mNoteData;
+
+    public static final int FIRST_MODIFIED = 1;
+    public static final int UNASSIGNED_NOTE_ID = 0;
+    public static final int ILLEGAL_NOTE_ID = -1;
+
     private static final String TAG = "Note";
     /**
      * Create a new note id for adding a new note to databases
@@ -48,18 +53,18 @@ public class Note {
         values.put(NoteColumns.CREATED_DATE, createdTime);
         values.put(NoteColumns.MODIFIED_DATE, createdTime);
         values.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
-        values.put(NoteColumns.LOCAL_MODIFIED, 1);
+        values.put(NoteColumns.LOCAL_MODIFIED, FIRST_MODIFIED);
         values.put(NoteColumns.PARENT_ID, folderId);
         Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values);
 
-        long noteId = 0;
+        long noteId = UNASSIGNED_NOTE_ID;
         try {
             noteId = Long.valueOf(uri.getPathSegments().get(1));
         } catch (NumberFormatException e) {
             Log.e(TAG, "Get note id error :" + e.toString());
-            noteId = 0;
+            noteId = UNASSIGNED_NOTE_ID;
         }
-        if (noteId == -1) {
+        if (noteId == ILLEGAL_NOTE_ID) {
             throw new IllegalStateException("Wrong note id:" + noteId);
         }
         return noteId;
diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java
index be081e4..59d39f1 100644
--- a/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -42,6 +42,10 @@ public class WorkingNote {
     // Note mode
     private int mMode;
 
+    private String mPassword;
+
+    private int mImportance;
+
     private long mAlertDate;
 
     private long mModifiedDate;
@@ -78,7 +82,9 @@ public class WorkingNote {
             NoteColumns.BG_COLOR_ID,
             NoteColumns.WIDGET_ID,
             NoteColumns.WIDGET_TYPE,
-            NoteColumns.MODIFIED_DATE
+            NoteColumns.MODIFIED_DATE,
+            NoteColumns.PASSWORD,
+            NoteColumns.IMPORTANCE
     };
 
     private static final int DATA_ID_COLUMN = 0;
@@ -101,6 +107,10 @@ public class WorkingNote {
 
     private static final int NOTE_MODIFIED_DATE_COLUMN = 5;
 
+    private static final int NOTE_PASSWORD = 6;
+
+    private static final int NOTE_IMPORTANCE = 7;
+
     // New note construct
     private WorkingNote(Context context, long folderId) {
         mContext = context;
@@ -112,6 +122,9 @@ public class WorkingNote {
         mIsDeleted = false;
         mMode = 0;
         mWidgetType = Notes.TYPE_WIDGET_INVALIDE;
+
+        mPassword = "";
+        mImportance = 0;
     }
 
     // Existing note construct
@@ -124,6 +137,9 @@ public class WorkingNote {
         loadNote();
     }
 
+    /**
+     * 通过游标cursor从数据库中加载便签及其属性
+     */
     private void loadNote() {
         Cursor cursor = mContext.getContentResolver().query(
                 ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null,
@@ -137,6 +153,8 @@ public class WorkingNote {
                 mWidgetType = cursor.getInt(NOTE_WIDGET_TYPE_COLUMN);
                 mAlertDate = cursor.getLong(NOTE_ALERTED_DATE_COLUMN);
                 mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN);
+                mPassword = cursor.getString(NOTE_PASSWORD);
+                mImportance =cursor.getInt(NOTE_IMPORTANCE);
             }
             cursor.close();
         } else {
@@ -145,7 +163,9 @@ public class WorkingNote {
         }
         loadNoteData();
     }
-
+    /**
+     *通过游标cursor从数据库中加载便签数据
+     */
     private void loadNoteData() {
         Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION,
                 DataColumns.NOTE_ID + "=?", new String[] {
@@ -173,7 +193,9 @@ public class WorkingNote {
             throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId);
         }
     }
-
+    /**
+     * 创建空便签
+     */
     public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId,
             int widgetType, int defaultBgColorId) {
         WorkingNote note = new WorkingNote(context, folderId);
@@ -212,6 +234,8 @@ public class WorkingNote {
         }
     }
 
+
+
     public boolean existInDatabase() {
         return mNoteId > 0;
     }
@@ -229,6 +253,22 @@ public class WorkingNote {
         mNoteSettingStatusListener = l;
     }
 
+    /**
+     * 该方法用于设置当前工作便签的访问密码
+     * @param password 新的访问密码
+     */
+    public void setPassword(String password) {
+        //将该类的mPassword属性设置为新的访问密码
+        mPassword = password;
+        //将修改后的便签密码写入到便签数据库中
+        mNote.setNoteValue(NoteColumns.PASSWORD, mPassword);
+    }
+
+    public void setImportance(int importance) {
+        mImportance = importance;
+        mNote.setNoteValue(NoteColumns.IMPORTANCE, String.valueOf(mImportance));
+    }
+
     public void setAlertDate(long date, boolean set) {
         if (date != mAlertDate) {
             mAlertDate = date;
@@ -294,6 +334,14 @@ public class WorkingNote {
         mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
     }
 
+    public boolean hasPassword() { return !mPassword.equals(""); }
+
+    public String getPassword() { return mPassword; }
+
+    public boolean hasImportance() { return (mImportance > 0); }
+
+    public int getImportance() { return mImportance; }
+
     public boolean hasClockAlert() {
         return (mAlertDate > 0 ? true : false);
     }
diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..a15dcc0 100644
--- a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -29,21 +29,37 @@ 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();
+    //语句：是否为24小时视图
     private boolean mIs24HourView;
+    //语句：定义时间日期变化监听器
     private OnDateTimeSetListener mOnDateTimeSetListener;
+    //语句：定义时间日期选择器
     private DateTimePicker mDateTimePicker;
 
+    /**
+     * 接口：日期时间设置监听器
+     */
     public interface OnDateTimeSetListener {
         void OnDateTimeSet(AlertDialog dialog, long date);
     }
 
+    /**
+     * 方法：构造方法，构建日期时间选择对话框
+     * @param context
+     * @param date
+     */
     public DateTimePickerDialog(Context context, long date) {
         super(context);
         mDateTimePicker = new DateTimePicker(context);
+        //语句：设置视图为日期时间选择器
         setView(mDateTimePicker);
+        //方法：实例化时间日期变化监听器
         mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
             public void onDateTimeChanged(DateTimePicker view, int year, int month,
                     int dayOfMonth, int hourOfDay, int minute) {
@@ -55,32 +71,55 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
                 updateTitle(mDate.getTimeInMillis());
             }
         });
+        //设置日期的毫秒级时间
         mDate.setTimeInMillis(date);
+        //语句：将秒数设置为0
         mDate.set(Calendar.SECOND, 0);
         mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
+        //语句：设置对话框的按钮
         setButton(context.getString(R.string.datetime_dialog_ok), this);
         setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+        //语句：设置为24小时视图
         set24HourView(DateFormat.is24HourFormat(this.getContext()));
+        //语句：更新标题上的时间
         updateTitle(mDate.getTimeInMillis());
     }
 
+    /**
+     * 方法：设置24小时视图
+     * @param is24HourView
+     */
     public void set24HourView(boolean is24HourView) {
         mIs24HourView = is24HourView;
     }
 
+    /**
+     * 方法：设置日期时间监听器
+     * @param callBack
+     */
     public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
         mOnDateTimeSetListener = callBack;
     }
 
+    /**
+     * 方法：更新对话框的标题
+     * @param date
+     */
     private void updateTitle(long date) {
         int flag =
             DateUtils.FORMAT_SHOW_YEAR |
             DateUtils.FORMAT_SHOW_DATE |
             DateUtils.FORMAT_SHOW_TIME;
         flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
+        //设置标题
         setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
     }
 
+    /**
+     * 方法：重载监听点击事件的方法
+     * @param arg0
+     * @param arg1
+     */
     public void onClick(DialogInterface arg0, int arg1) {
         if (mOnDateTimeSetListener != null) {
             mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..45f4beb 100644
--- a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -28,33 +28,47 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 import net.micode.notes.R;
 
 public class DropdownMenu {
+    //语句：定义按钮控件
     private Button mButton;
+    //语句：定义弹出式菜单
     private PopupMenu mPopupMenu;
+    //语句：定义菜单
     private Menu mMenu;
 
+    /**
+     * 方法：下拉菜单的构造方法
+     * @param context
+     * @param button
+     * @param menuId
+     */
     public DropdownMenu(Context context, Button button, int menuId) {
         mButton = button;
+        //语句：设置其背景资源为下拉菜单的图标
         mButton.setBackgroundResource(R.drawable.dropdown_icon);
+        //语句：实例化一个弹出式菜单
         mPopupMenu = new PopupMenu(context, mButton);
+        //语句：获得弹出式菜单的菜单项
         mMenu = mPopupMenu.getMenu();
+        //语句：使用菜单项填充弹出式菜单的视图
         mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
         mButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 mPopupMenu.show();
             }
-        });
+        }); //方法：调用mButton的setonClickListener方法，实例化一个点击事件监听器，如果监听到点击动作则显示菜单
     }
 
+    //方法：设置下拉菜单的点击监听方法
     public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
         if (mPopupMenu != null) {
             mPopupMenu.setOnMenuItemClickListener(listener);
         }
     }
-
+    //方法：查询菜单项
     public MenuItem findItem(int id) {
         return mMenu.findItem(id);
     }
-
+    //方法：设置标题
     public void setTitle(CharSequence title) {
         mButton.setText(title);
     }
diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..c084119 100644
--- a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -28,14 +28,20 @@ import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+/**
+ * 文件夹列表适配器，用于显示文件夹列表的视图
+ * @version v1.0
+ * @author www.micode.net
+ */
 public class FoldersListAdapter extends CursorAdapter {
+    //
     public static final String [] PROJECTION = {
         NoteColumns.ID,
         NoteColumns.SNIPPET
     };
-
+    //语句：定义常量，文件夹ID栏编号
     public static final int ID_COLUMN   = 0;
+    //语句：定义常量，文件夹名称栏编号
     public static final int NAME_COLUMN = 1;
 
     public FoldersListAdapter(Context context, Cursor c) {
@@ -43,6 +49,7 @@ public class FoldersListAdapter extends CursorAdapter {
         // TODO Auto-generated constructor stub
     }
 
+    //方法：建立新视图，返回创建的文件夹列表
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
         return new FolderListItem(context);
@@ -50,28 +57,35 @@ public class FoldersListAdapter extends CursorAdapter {
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
+        //语句块：如果参数视图为文件夹视图的实例，根据当前游标的ID绑定相应文件夹的视图
         if (view instanceof FolderListItem) {
             String folderName = (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
                     .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
+            //语句：绑定文件夹视图
             ((FolderListItem) view).bind(folderName);
         }
     }
 
+    //方法：获取文件夹名称
     public String getFolderName(Context context, int position) {
+        //语句：获取当前游标
         Cursor cursor = (Cursor) getItem(position);
+        //语句：选定当前文件夹
         return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
                 .getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
     }
 
+    //类：文件夹
     private class FolderListItem extends LinearLayout {
         private TextView mName;
 
+        //方法：FolderListItem的构造方法，使用folder_list_item布局填充当前界面
         public FolderListItem(Context context) {
             super(context);
             inflate(context, R.layout.folder_list_item, this);
             mName = (TextView) findViewById(R.id.tv_folder_name);
         }
-
+        //方法：绑定文件夹名称
         public void bind(String name) {
             mName.setText(name);
         }
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 862883b..1686564 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -30,9 +30,11 @@ import android.content.SharedPreferences;
 import android.graphics.Paint;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.style.BackgroundColorSpan;
 import android.util.Log;
@@ -42,6 +44,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -49,6 +52,8 @@ import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RatingBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -62,6 +67,7 @@ import net.micode.notes.tool.ResourceParser;
 import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
 import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
 import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
+import net.micode.notes.ui.PasswordView;
 import net.micode.notes.widget.NoteWidgetProvider_2x;
 import net.micode.notes.widget.NoteWidgetProvider_4x;
 
@@ -71,19 +77,28 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
+/**
+ * 该类实现了对当前便签界面进行编辑功能，继承了父类Activity并实现了接口，封装有方法39个
+ */
 public class NoteEditActivity extends Activity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
+    /**
+     * 该私有类为便签编辑界面的标题栏部分
+     */
     private class HeadViewHolder {
+        //修改时间（文本视图）
         public TextView tvModified;
-
+        //提醒标志（图像视图）
         public ImageView ivAlertIcon;
-
+        //提醒时间（文本视图）
         public TextView tvAlertDate;
-
+        //设置背景颜色（图像视图）
         public ImageView ibSetBgColor;
     }
 
+    /**
+     * 常量，实现选择背景颜色按钮（未选择）和资源解析器中的颜色ID对应
+     */
     private static final Map<Integer, Integer> sBgSelectorBtnsMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -93,6 +108,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
     }
 
+    /**
+     * 常量，实现资源解析器中的颜色ID与背景颜色选择选择按钮（已选择）对应
+     */
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
     static {
         sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
@@ -102,6 +120,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
     }
 
+    /**
+     * 常量，实现字体大小按钮（未选择）和资源解析器中的字号ID对应
+     */
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
     static {
         sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
@@ -110,6 +131,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
     }
 
+    /**
+     * 常量，实现资源解析器中字号ID与字体大小按钮（已选择）对应
+     */
     private static final Map<Integer, Integer> sFontSelectorSelectionMap = new HashMap<Integer, Integer>();
     static {
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
@@ -117,43 +141,64 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
         sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
     }
-
+    //常量标识
     private static final String TAG = "NoteEditActivity";
 
+    //便签编辑标题栏
     private HeadViewHolder mNoteHeaderHolder;
 
+    //便签的顶部视图块
     private View mHeadViewPanel;
 
+    //便签的背景色选择器
     private View mNoteBgColorSelector;
 
+    //便签的字体大小选择器
     private View mFontSizeSelector;
 
+    //便签编辑器
     private EditText mNoteEditor;
 
+    //便签编辑块
     private View mNoteEditorPanel;
 
+    //定义私有变量 活动便签
     private WorkingNote mWorkingNote;
 
+    //定义私有变量 共享设置 用来保存配置参数
     private SharedPreferences mSharedPrefs;
+    //定义私有变量 字体大小Id
     private int mFontSizeId;
 
+    //定义常量 字体大小设置
     private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
 
     private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
 
+    //定义字符串常量 已标记
     public static final String TAG_CHECKED = String.valueOf('\u221A');
+    //定义字符串常量 未标记
     public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
 
+    //线性布局，用于编辑文本
     private LinearLayout mEditTextList;
-
+    //用户请求
     private String mUserQuery;
+    //正则表达式模式
     private Pattern mPattern;
 
+    /**
+     * 重写Activity类的onCreate方法
+     * @param savedInstanceState
+     */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         this.setContentView(R.layout.note_edit);
 
+
+        //如果未保存实例状态且当前Activity未初始化完成，则结束当前Activity
         if (savedInstanceState == null && !initActivityState(getIntent())) {
             finish();
             return;
@@ -164,10 +209,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
     /**
      * Current activity may be killed when the memory is low. Once it is killed, for another time
      * user load this activity, we should restore the former state
+     * 当当前活动界面在释放内存时被关闭，则再次调用该Activity时依据保存的实例恢复到被关闭之前的状态
      */
     @Override
     protected void onRestoreInstanceState(Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
+        /**
+         * 如果保存了关闭前的实例状态且其中包含着便签标识符，则将该标识符添加到初始化Activity的Intent中
+         */
         if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
             Intent intent = new Intent(Intent.ACTION_VIEW);
             intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
@@ -179,43 +228,65 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
     }
 
+    /**
+     * 初始化Activity的状态
+     * @param intent 创建时传递给该Activity的intent参数,用于描述让该Activity完成的动作、附加属性信息
+     * @return boolean 返回是否成功初始化了活动状态
+     */
     private boolean initActivityState(Intent intent) {
         /**
          * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
          * then jump to the NotesListActivity
          */
         mWorkingNote = null;
+        /**
+         * 判断初始化该Activity的Intent所包含的action是ACTION_VIEW还是ACTION_INSERT_OR_EDIT，然后进行不同的操作
+         */
         if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
+            //当前Activity获取intent中的附加信息（字符串）EXTRA_UID标识noteId，默认值为0
             long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
+            //初始化用户请求为空字符串
             mUserQuery = "";
 
             /**
              * Starting from the searched result
              */
             if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
+                //将查找到的便签标识符转化为long类型，保存在变量noteId中
                 noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
+                //将用户请求的字符串保存在变量mUserQuery中
                 mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
             }
-
+            /**
+             * 如果在数据库中没有查找到相应的便签标识符，则切换到文件夹列表界面
+             */
             if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
+                //设置Intent目的组件为NotesListActivity
                 Intent jump = new Intent(this, NotesListActivity.class);
+                //启动目的组件
                 startActivity(jump);
+                //显示消息提示框，消息为便签不存在
                 showToast(R.string.error_note_not_exist);
+                //结束NoteEditActivity的生命周期
                 finish();
                 return false;
             } else {
+                //如果在数据库中查找到相应的便签标识符noteId，则将该便签加载到mWorkingNote变量中
                 mWorkingNote = WorkingNote.load(this, noteId);
+                //如果活动便签为空，显示错误信息
                 if (mWorkingNote == null) {
                     Log.e(TAG, "load note failed with note id" + noteId);
                     finish();
                     return false;
                 }
             }
+            //设置软键盘输入模式
             getWindow().setSoftInputMode(
                     WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
                             | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
             // New note
+            //初始化便签的各属性
             long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
             int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
                     AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -225,13 +296,19 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     ResourceParser.getDefaultBgId(this));
 
             // Parse call-record note
+            //解析通话记录便签
             String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
             long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
+            /**
+             * 如果便签的通话日期和通话号码均存在，则把其当做通话便签进行处理,否则当做普通便签进行初始化
+             */
             if (callDate != 0 && phoneNumber != null) {
+                //如果记录的通话号码为空，则显示警告
                 if (TextUtils.isEmpty(phoneNumber)) {
                     Log.w(TAG, "The call record number is null");
                 }
                 long noteId = 0;
+                //通过通话号码和通话日期在数据库中查找noteId
                 if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
                         phoneNumber, callDate)) > 0) {
                     mWorkingNote = WorkingNote.load(this, noteId);
@@ -241,11 +318,14 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                         return false;
                     }
                 } else {
+                    //没有查找到noteId信息则重新建立空便签，使用之前默认参量对便签进行初始化
                     mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
                             widgetType, bgResId);
+                    //将便签转化为通话记录便签
                     mWorkingNote.convertToCallNote(phoneNumber, callDate);
                 }
             } else {
+                //否则按照普通的创建
                 mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
                         bgResId);
             }
@@ -254,35 +334,55 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
                             | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
         } else {
+            //显示错误信息，Intent没有指定动作，不应支持
             Log.e(TAG, "Intent not specified action, should not support");
             finish();
             return false;
         }
+        //调用mWorkingNote的setOnSettingStatusChangedListener()方法设置状态变化监听器
         mWorkingNote.setOnSettingStatusChangedListener(this);
+
+
+
+        //返回true表示初始化该Activity成功
         return true;
     }
 
+    /**
+     * 重写Activity的onResume方法，将标签编辑界面作为界面的最上层呈现
+     */
     @Override
     protected void onResume() {
         super.onResume();
+        //调用初始化便签界面方法
         initNoteScreen();
     }
 
+    /**
+     * 初始化便签界面的窗口
+     */
     private void initNoteScreen() {
+        //设置便签界面的文字外观
         mNoteEditor.setTextAppearance(this, TextAppearanceResources
                 .getTexAppearanceResource(mFontSizeId));
+        /**
+         * 判断是否为清单列表界面，是则切换到清单列表的处理过程，否则继续执行
+         */
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mWorkingNote.getContent());
         } else {
             mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+            //设置光标在便签文档的末尾
             mNoteEditor.setSelection(mNoteEditor.getText().length());
         }
         for (Integer id : sBgSelectorSelectionMap.keySet()) {
             findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
         }
+        //设置便签头部背景和编辑部分的背景颜色
         mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
         mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
 
+        //设置便签头的修改时间
         mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
                 mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
                         | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
@@ -293,11 +393,100 @@ public class NoteEditActivity extends Activity implements OnClickListener,
          * is not ready
          */
         showAlertHeader();
+
+/*字数统计*/
+
+        final TextView WordNUm = (TextView) findViewById(R.id.textCount);
+        mNoteEditor.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                WordNUm.setText("当前字数为："+(s.length()));           }
+        });
+        if(mWorkingNote.hasPassword()) {
+            final PasswordView pwdView = new PasswordView(this, PasswordView.CUR_PWD_VIEW);
+            RelativeLayout.LayoutParams LP = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,
+                    RelativeLayout.LayoutParams.MATCH_PARENT);
+
+            addContentView(pwdView,LP);
+            /**
+             * 口令输入完毕后执行的操作
+             */
+            pwdView.setOnFinishInput(new OnPasswordInputFinish() {
+                @Override
+                public void inputFinish() {
+                    //在当前界面下实例化一个对话框
+                    final AlertDialog.Builder builder_c0 = new AlertDialog.Builder(NoteEditActivity.this);
+                    //设置对话框标题
+                    builder_c0.setTitle(getString(R.string.alert_title_encrypt));
+                    //设置对话框图标
+                    builder_c0.setIcon(android.R.drawable.ic_dialog_info);
+                    /**
+                     * 如果口令输入正确
+                     */
+                    if (pwdView.getStrPassword().equals(mWorkingNote.getPassword())) {
+                        ViewGroup vg = (ViewGroup) pwdView.getParent();
+                        vg.removeView(pwdView);
+                        /*
+                        //设置对话框消息
+                        builder_c0.setMessage(getString(R.string.alert_message_decrypt));
+                        */
+                        /**
+                         * 设置对话框确认按钮的功能
+
+                        builder_c0.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                //点击时关闭对话框和输入口令界面
+                                AlertDialog alertdialog = builder_c0.show();
+                                alertdialog.dismiss();
+                                ViewGroup vg = (ViewGroup) pwdView.getParent();
+                                vg.removeView(pwdView);
+                            }
+                        });
+                        */
+                    } else {
+                        builder_c0.setMessage(getString(R.string.alert_message_decrypt_error));
+                        builder_c0.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialogInterface, int i) {
+                                finish();
+                            }
+                        });
+                        builder_c0.show();
+                    }
+
+                }
+            });
+            pwdView.getCancelImageView().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(NoteEditActivity.this, "Return", Toast.LENGTH_SHORT).show();
+                    finish();
+                }
+            });
+        }else{
+            //Toast.makeText(NoteEditActivity.this, "XXXX", Toast.LENGTH_SHORT).show();
+        }
     }
 
+    //显示便签提醒的标头
     private void showAlertHeader() {
+
         if (mWorkingNote.hasClockAlert()) {
             long time = System.currentTimeMillis();
+            /**
+             * 如果当前时间已超过活动便签的提醒时间，则置便签标头为过期，否则将显示当前时间到提醒时间的时长
+             */
             if (time > mWorkingNote.getAlertDate()) {
                 mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
             } else {
@@ -309,15 +498,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         } else {
             mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
             mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
-        };
+        }
     }
 
+    /**
+     * 重写onNewIntent方法，监听发送给NoteEditActivity的意图
+     * @param intent
+     */
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         initActivityState(intent);
     }
 
+    /**
+     * 监听保存实例状态方法
+     * @param outState
+     */
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -325,30 +522,45 @@ public class NoteEditActivity extends Activity implements OnClickListener,
          * For new note without note id, we should firstly save it to
          * generate a id. If the editing note is not worth saving, there
          * is no id which is equivalent to create new note
+         * 如果当前工作便签没有分配noteId则先调用saveNote()保存便签
          */
         if (!mWorkingNote.existInDatabase()) {
             saveNote();
         }
+        //将生成的noteId保存到outState中
         outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
         Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
     }
 
+    /**
+     * 分发触摸事件
+     * @param ev 触摸点
+     * @return boolean
+     */
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
+        //由便签背景选择器消耗触摸事件
         if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
                 && !inRangeOfView(mNoteBgColorSelector, ev)) {
             mNoteBgColorSelector.setVisibility(View.GONE);
             return true;
         }
-
+        //由便签字号选择器消耗触摸事件
         if (mFontSizeSelector.getVisibility() == View.VISIBLE
                 && !inRangeOfView(mFontSizeSelector, ev)) {
             mFontSizeSelector.setVisibility(View.GONE);
             return true;
         }
+        //未被消耗时调用父类的方法
         return super.dispatchTouchEvent(ev);
     }
 
+    /**
+     * 判断触摸点是否在视图内部
+     * @param view
+     * @param ev 触摸点
+     * @return boolean
+     */
     private boolean inRangeOfView(View view, MotionEvent ev) {
         int []location = new int[2];
         view.getLocationOnScreen(location);
@@ -360,10 +572,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 || ev.getY() > (y + view.getHeight())) {
                     return false;
                 }
+
         return true;
     }
 
+    /**
+     *
+     */
     private void initResources() {
+        //初始化便签标题栏
         mHeadViewPanel = findViewById(R.id.note_title);
         mNoteHeaderHolder = new HeadViewHolder();
         mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
@@ -371,20 +588,28 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
         mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
         mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
+        //初始化便签编辑部分界面
         mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
         mNoteEditorPanel = findViewById(R.id.sv_note_edit);
+        //初始化便签背景选择界面
         mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
+        /**
+         * 对所有颜色选择按钮设置监听器
+         */
         for (int id : sBgSelectorBtnsMap.keySet()) {
             ImageView iv = (ImageView) findViewById(id);
+            //设置点击事件监听器
             iv.setOnClickListener(this);
         }
-
+        //初始化便签文字字号选择器
         mFontSizeSelector = findViewById(R.id.font_size_selector);
         for (int id : sFontSizeBtnsMap.keySet()) {
             View view = findViewById(id);
             view.setOnClickListener(this);
         };
+        //初始化共享设置
         mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        //将字体大小标识设置为默认大小
         mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
         /**
          * HACKME: Fix bug of store the resource id in shared preference.
@@ -395,19 +620,30 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
         }
         mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
+
+
     }
 
+    /**
+     * 重写onPause方法，将便签编辑界面暂停（部分可见）
+     */
     @Override
     protected void onPause() {
         super.onPause();
+        //保存便签
         if(saveNote()) {
             Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
         }
         clearSettingState();
     }
 
+    /**
+     * 更新桌面挂件
+     */
     private void updateWidget() {
+        //实例化Intent，用于和AppWidgetManager进行消息交换
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        //判断当前工作中的便签的桌面挂件的类型,并根据不同类型的桌面挂件指定Intent不同的目的组件
         if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
             intent.setClass(this, NoteWidgetProvider_2x.class);
         } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
@@ -416,53 +652,85 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             Log.e(TAG, "Unspported widget type");
             return;
         }
-
+        //将桌面挂件的标识作为附加信息添加到Intent中
         intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
             mWorkingNote.getWidgetId()
         });
-
+        //将指定好参数的Intent对象通过广播发送出去以启动相应的Activity
         sendBroadcast(intent);
+        //设置当前Activity结束后将结束信息发送给其父活动
         setResult(RESULT_OK, intent);
     }
 
+    /**
+     * 点击事件
+     * @param v
+     */
     public void onClick(View v) {
+
+        //获取点击目标
         int id = v.getId();
+        //点击设置背景色图标 or 点击颜色图标 or 点击字体图标
         if (id == R.id.btn_set_bg_color) {
+            //将便签背景选择器界面设为可见
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
+            //将备选颜色界面设为可见
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+                    View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
+            //将备选颜色界面设为不可见
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
+            //设置背景色
             mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
+            //将便签背景选择器界面设为不可见
             mNoteBgColorSelector.setVisibility(View.GONE);
         } else if (sFontSizeBtnsMap.containsKey(id)) {
+            //将备选字体界面设为可见
             findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
+            //使用mFontSizeId变量存储选定大小
             mFontSizeId = sFontSizeBtnsMap.get(id);
+            //将共享设置中的字体进行修改
             mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
+
             findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+            //如果便签为清单模式
             if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+                //获取工作文字
                 getWorkingText();
+                //转成列表模式
                 switchToListMode(mWorkingNote.getContent());
             } else {
+                //将字体资源设置为当前大小
                 mNoteEditor.setTextAppearance(this,
                         TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
             }
+            //将字体大小选择器界面设为不可见
             mFontSizeSelector.setVisibility(View.GONE);
         }
+
     }
 
     @Override
     public void onBackPressed() {
+        /**
+         * 如果字体选择器和背景选择器均不可见，即为便签编辑界面，点击返回键退出，保存便签
+         * 如果字体选择器和背景选择器可见，则点击返回键时关闭选择界面
+         */
         if(clearSettingState()) {
             return;
         }
-
+        //保存便签
         saveNote();
         super.onBackPressed();
     }
 
+    /**
+     * 清除设置状态
+     * @return boolean 如果选择器为可见，则返回true，在便签编辑界面返回false
+     */
     private boolean clearSettingState() {
+        //将字体选择器和背景颜色选择器设为不可见
         if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
             mNoteBgColorSelector.setVisibility(View.GONE);
             return true;
@@ -473,10 +741,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return false;
     }
 
+    /**
+     * 监听背景颜色变化
+     */
     public void onBackgroundColorChanged() {
+        //将便签背景色设置为可见，并显示该视图
         findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                 View.VISIBLE);
+        //将文件编辑区域的背景资源设置为便签背景色
         mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+        //将便签头的背景资源设置为标题的背景色
         mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
     }
 
@@ -485,36 +759,64 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (isFinishing()) {
             return true;
         }
+        //清除设置状态
         clearSettingState();
+        //清除菜单项
         menu.clear();
+        /**
+         * 根据文件夹类型，则调用相应的目录填充方法
+         */
         if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
             getMenuInflater().inflate(R.menu.call_note_edit, menu);
         } else {
             getMenuInflater().inflate(R.menu.note_edit, menu);
         }
+        /**
+         * 根据工作便签属性，则调用相应的目录填充方法
+         */
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
         } else {
             menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
         }
+        /**
+         * 将工作便签中的时钟提醒设置为不可见
+         */
         if (mWorkingNote.hasClockAlert()) {
             menu.findItem(R.id.menu_alert).setVisible(false);
         } else {
             menu.findItem(R.id.menu_delete_remind).setVisible(false);
         }
+
+        if (mWorkingNote.hasPassword()) {
+            menu.findItem(R.id.menu_encrypt).setVisible(false);
+        } else {
+            menu.findItem(R.id.menu_delete_encrypt).setVisible(false);
+        }
+
+        //menu.findItem(R.id.menu_set_importance).setVisible(false);
         return true;
     }
 
+    /**
+     * 监听菜单中的项是否被选择
+     * @param item
+     * @return
+     */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        int itemId = item.getItemId();
+        int itemId = item.getItemId();//选择新建便签
         if (itemId == R.id.menu_new_note) {
             createNewNote();
+            //选择删除便签
         } else if (itemId == R.id.menu_delete) {
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
             builder.setTitle(getString(R.string.alert_title_delete));
+            //设置提醒图标
             builder.setIcon(android.R.drawable.ic_dialog_alert);
+            //设置删除提醒消息
             builder.setMessage(getString(R.string.alert_message_delete_note));
+            //设置选择按钮
             builder.setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
@@ -522,34 +824,162 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                             finish();
                         }
                     });
+            //设置取消选择按钮
             builder.setNegativeButton(android.R.string.cancel, null);
             builder.show();
+            //选择设置字号
         } else if (itemId == R.id.menu_font_size) {
             mFontSizeSelector.setVisibility(View.VISIBLE);
             findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+            //选择设置清单模式
         } else if (itemId == R.id.menu_list_mode) {
             mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
                     TextNote.MODE_CHECK_LIST : 0);
+            //选择分享
         } else if (itemId == R.id.menu_share) {
             getWorkingText();
             sendTo(this, mWorkingNote.getContent());
+            //选择分享到桌面
         } else if (itemId == R.id.menu_send_to_desktop) {
             sendToDesktop();
+            //选择提醒
         } else if (itemId == R.id.menu_alert) {
             setReminder();
+            //选择删除提醒
         } else if (itemId == R.id.menu_delete_remind) {
             mWorkingNote.setAlertDate(0, false);
+        } else if (itemId == R.id.menu_encrypt) {
+            setEncryption();
+        } else if (itemId == R.id.menu_delete_encrypt) {
+            deleteEncryption();
+        } else if (itemId == R.id.menu_set_importance) {
+            setImportance();
         }
         return true;
     }
+    private class RatingBarLayout extends LinearLayout{
+        Context context;
+        private RatingBar ratingBar;
+        public RatingBarLayout(Context context) {
+            super(context);
+            this.context = context;
+            View view;
+            view = View.inflate(context, R.layout.note_importance, null);
+            ratingBar = (RatingBar) view.findViewById(R.id.ratingBar);
+            ratingBar.setOnRatingBarChangeListener(new RatingBar.OnRatingBarChangeListener(){
+
+                @Override
+                public void onRatingChanged(RatingBar ratingBar, float r, boolean fromUser) {
+                    ratingBar.setRating(r);
+                }
+            });
+            addView(view);
+        }
+
+        public int getStars(){
+            return (int) ratingBar.getRating();
+        }
+    }
+    private void setImportance(){
+        final RatingBarLayout rbLayout = new RatingBarLayout(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(getString(R.string.alert_title_importance));
+        builder.setIcon(android.R.drawable.ic_dialog_info);
+        builder.setView(rbLayout);
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                Toast.makeText(NoteEditActivity.this, "Rating:"+String.valueOf(rbLayout.getStars()), Toast.LENGTH_SHORT).show();
+                mWorkingNote.setImportance(rbLayout.getStars());
+                finish();
+            }
+        });
+        builder.show();
+    }
+
+    private void setEncryption(){//设置密码功能实现
+        final PasswordView pwdView = new PasswordView(this, PasswordView.NEW_PWD_VIEW);
+        final PasswordView pwdViewRepeat = new PasswordView(this, PasswordView.RPT_PWD_VIEW);
+        setContentView(pwdView);
+        pwdView.setOnFinishInput(new OnPasswordInputFinish() {
+            @Override
+            public void inputFinish() {
+                setContentView(pwdViewRepeat);
+                Toast.makeText(NoteEditActivity.this, pwdView.getStrPassword(), Toast.LENGTH_SHORT).show();
+            }
+        });
+        pwdView.getCancelImageView().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(NoteEditActivity.this, "Return from Step1", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        });
+
+        pwdViewRepeat.setOnFinishInput(new OnPasswordInputFinish() {
+            @Override
+            public void inputFinish() {
+
+                final AlertDialog.Builder builder_c1 = new AlertDialog.Builder(NoteEditActivity.this);
+                builder_c1.setTitle(getString(R.string.alert_title_encrypt));
+                builder_c1.setIcon(android.R.drawable.ic_dialog_info);
+                if( pwdView.getStrPassword().equals(pwdViewRepeat.getStrPassword()) ){
+                    builder_c1.setMessage(getString(R.string.alert_message_encrypt,pwdViewRepeat.getStrPassword()));
+                    mWorkingNote.setPassword(pwdViewRepeat.getStrPassword());
+                }else{
+                    builder_c1.setMessage(getString(R.string.alert_message_encrypt_error));
+                }
 
+                builder_c1.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        finish();
+                    }
+                });
+                builder_c1.show();
+            }
+        });
+
+//        /**
+//         *  可以用自finish();定义控件中暴露出来的cancelImageView方法，重新提供相应
+//         *  如果写了，会覆盖我们在自定义控件中提供的响应
+//         *  可以看到这里toast显示 "Biu Biu Biu"而不是"Cancel"*/
+        pwdViewRepeat.getCancelImageView().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(NoteEditActivity.this, "Return from Step2", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        });
+    }
+
+    private void deleteEncryption(){
+        mWorkingNote.setPassword("");
+        AlertDialog.Builder builder_c2 = new AlertDialog.Builder(this);
+        builder_c2.setTitle(getString(R.string.alert_title_encrypt));
+        builder_c2.setIcon(android.R.drawable.ic_dialog_info);
+        builder_c2.setMessage(getString(R.string.alert_message_remove_encrypt));
+        builder_c2.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                finish();
+            }
+        });
+        builder_c2.show();
+    }
+
+    /**
+     * 设置提醒
+     */
     private void setReminder() {
+        //实例化一个时间日期选择器的对话框，进行提醒日期的设置
         DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
         d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
             public void OnDateTimeSet(AlertDialog dialog, long date) {
                 mWorkingNote.setAlertDate(date	, true);
             }
         });
+        //显示该控件
         d.show();
     }
 
@@ -564,11 +994,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         context.startActivity(intent);
     }
 
+    /**
+     * 创建新便签
+     */
     private void createNewNote() {
         // Firstly, save current editing notes
+        //首先保存当前编辑的便签
         saveNote();
 
         // For safety, start a new NoteEditActivity
+        //结束当前活动周期，重新激活便签编辑Activity
         finish();
         Intent intent = new Intent(this, NoteEditActivity.class);
         intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
@@ -576,15 +1011,25 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         startActivity(intent);
     }
 
+    /**
+     * 删除当前便签
+     */
     private void deleteCurrentNote() {
         if (mWorkingNote.existInDatabase()) {
             HashSet<Long> ids = new HashSet<Long>();
             long id = mWorkingNote.getNoteId();
+            /**
+             * 如果删除的便签Id不是根目录的ID，否则提示错误
+             */
             if (id != Notes.ID_ROOT_FOLDER) {
                 ids.add(id);
             } else {
                 Log.d(TAG, "Wrong note id, should not happen");
             }
+            /**
+             * 如果不是同步模式，删除便签
+             * 否则，将便签移入垃圾箱中
+             */
             if (!isSyncMode()) {
                 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
                     Log.e(TAG, "Delete Note error");
@@ -595,27 +1040,48 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 }
             }
         }
+        //更改工作便签的删除标记
         mWorkingNote.markDeleted(true);
     }
 
+    /**
+     * 判断是否为同步模式
+     * @return boolean
+     */
     private boolean isSyncMode() {
+        //从NotesPreferenceActivity中获取同步账号名，如果存在则返回true
         return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
     }
 
+    /**
+     * 监听时钟提醒的变化
+     * @param date 提醒时间
+     * @param set
+     */
     public void onClockAlertChanged(long date, boolean set) {
         /**
          * User could set clock to an unsaved note, so before setting the
          * alert clock, we should save the note first
+         * 如果设置提醒的便签未保存，则先保存
          */
         if (!mWorkingNote.existInDatabase()) {
             saveNote();
         }
+        /**
+         * 如果便签Id存在（worthsaving，已编辑过）
+         */
         if (mWorkingNote.getNoteId() > 0) {
+            //设置向AlarmReceiver发送的Intent
             Intent intent = new Intent(this, AlarmReceiver.class);
+            //设置其Data域为附加便签Id后的表示内容的Uri
             intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+            //设置延迟触发Intent
             PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+            //获得系统的提醒服务
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+            //显示提醒标头
             showAlertHeader();
+            //如果未设置，则取消当前设置，否则调用系统的提醒服务设置该提醒，在其被唤醒后解析之前设置的pendingIntent
             if(!set) {
                 alarmManager.cancel(pendingIntent);
             } else {
@@ -626,29 +1092,41 @@ public class NoteEditActivity extends Activity implements OnClickListener,
              * There is the condition that user has input nothing (the note is
              * not worthy saving), we have no note id, remind the user that he
              * should input something
+             * 便签未编辑错误
              */
             Log.e(TAG, "Clock alert setting error");
+            //显示消息提示框，为未编辑的便签设置闹钟
             showToast(R.string.error_note_empty_for_clock);
         }
     }
 
+    /**
+     * 监听挂件的变化，如果有变化更新挂件
+     */
     public void onWidgetChanged() {
         updateWidget();
     }
 
+    /**
+     * 监听文本编辑过程中的删除
+     * @param index 删除文本的位置
+     * @param text 当前位置后的文本
+     */
     public void onEditTextDelete(int index, String text) {
+        //获取文本列表的总项数
         int childCount = mEditTextList.getChildCount();
         if (childCount == 1) {
             return;
         }
-
+        //将删除文本后面项的索引减1
         for (int i = index + 1; i < childCount; i++) {
             ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
                     .setIndex(i - 1);
         }
-
+        //移除当前项的视图
         mEditTextList.removeViewAt(index);
         NoteEditText edit = null;
+        //如果原来编辑的索引值为0则编辑当前行，否则编辑上一行
         if(index == 0) {
             edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
                     R.id.et_edit_text);
@@ -656,54 +1134,90 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
                     R.id.et_edit_text);
         }
+        //获取当前项的长度
         int length = edit.length();
+        //在当前位置后附加文本
         edit.append(text);
+        //获取当前控件的焦点
         edit.requestFocus();
+        //选中该文本块
         edit.setSelection(length);
     }
 
+    /**
+     * 监听文本编辑过程中的换行
+     * @param index 换行的位置
+     * @param text 当前位置后的文本
+     */
     public void onEditTextEnter(int index, String text) {
         /**
          * Should not happen, check for debug
+         * 如果便签长度超过了限制，则提示错误
          */
         if(index > mEditTextList.getChildCount()) {
             Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
         }
 
         View view = getListItem(text, index);
+        //添加当前项的视图
         mEditTextList.addView(view, index);
         NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+        //获取控件焦点
         edit.requestFocus();
+        //选中当前行的首个位置
         edit.setSelection(0);
+        //将当前后面项的索引加1
         for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
             ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
                     .setIndex(i);
         }
     }
 
+    /**
+     * 转换到列表模式
+     * @param text
+     */
     private void switchToListMode(String text) {
+        //清除所有视图
         mEditTextList.removeAllViews();
+        //将文本以\n分离
         String[] items = text.split("\n");
         int index = 0;
+        //从第一个索引块开始添加列表项的视图
         for (String item : items) {
             if(!TextUtils.isEmpty(item)) {
                 mEditTextList.addView(getListItem(item, index));
                 index++;
             }
         }
+        //添加最后一行的视图
         mEditTextList.addView(getListItem("", index));
+        //获取当前列表项焦点
         mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
-
+        //文本编辑器设置为不可见
         mNoteEditor.setVisibility(View.GONE);
+        //文本列表编辑器设置为可见
         mEditTextList.setVisibility(View.VISIBLE);
     }
 
+    /**
+     * 获取匹配到的高亮结果
+     * @param fullText 完整的文本
+     * @param userQuery 用户的请求
+     * @return Spannable类型的文本
+     */
     private Spannable getHighlightQueryResult(String fullText, String userQuery) {
+        //初始化spannable为空字符串
         SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
         if (!TextUtils.isEmpty(userQuery)) {
+            //将用户的请求编译为正则表达式
             mPattern = Pattern.compile(userQuery);
+            //在全文本中匹配该请求
             Matcher m = mPattern.matcher(fullText);
             int start = 0;
+            /**
+             * 将匹配到的部分显示为高亮
+             */
             while (m.find(start)) {
                 spannable.setSpan(
                         new BackgroundColorSpan(this.getResources().getColor(
@@ -715,11 +1229,19 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return spannable;
     }
 
+    /**
+     * 获取列表项
+     * @param item 以字符串格式存储的列表项
+     * @param index 当前项的索引
+     * @return View 列表项的视图
+     */
     private View getListItem(String item, int index) {
         View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
         final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
         edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+        //实例化标签框
         CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
+        //监听是否已标识
         cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 if (isChecked) {
@@ -729,7 +1251,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 }
             }
         });
-
+        /**
+         * 如果列表项含有的标识创建相应的标签框
+         */
         if (item.startsWith(TAG_CHECKED)) {
             cb.setChecked(true);
             edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
@@ -739,18 +1263,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
             edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
             item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
         }
-
+        //监听文本视图的变化
         edit.setOnTextViewChangeListener(this);
+        //将索引值设置为当前索引
         edit.setIndex(index);
+        //设置高亮
         edit.setText(getHighlightQueryResult(item, mUserQuery));
         return view;
     }
 
+    /**
+     * 监听文本的变化
+     * @param index 发生变化位置的索引
+     * @param hasText 是否有文本
+     */
     public void onTextChange(int index, boolean hasText) {
+        //如果索引超过了当前文本内容，报告错误
         if (index >= mEditTextList.getChildCount()) {
             Log.e(TAG, "Wrong index, should not happen");
             return;
         }
+        /**
+         * 如果当前位置有文本则设置为可见，否则设置为不可见
+         */
         if(hasText) {
             mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
         } else {
@@ -758,28 +1293,55 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         }
     }
 
+    /**
+     * 监听清单模式的变化
+     * @param oldMode is previous mode before change
+     * @param newMode is new mode
+     */
     public void onCheckListModeChanged(int oldMode, int newMode) {
+        //如果新模式为列表模式，则调用switchToListMode()方法进行转化
         if (newMode == TextNote.MODE_CHECK_LIST) {
             switchToListMode(mNoteEditor.getText().toString());
         } else {
+            //如果没有保存工作文本，则进行保存该部分文本
             if (!getWorkingText()) {
                 mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
                         ""));
             }
+            //设置高亮文本
             mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+            //取消文本列表视图
             mEditTextList.setVisibility(View.GONE);
+            //设置文本编辑为可见
             mNoteEditor.setVisibility(View.VISIBLE);
         }
     }
 
+    /**
+     * 获取当前活动便签的文本并保存到数据库中
+     * @return boolean
+     */
     private boolean getWorkingText() {
+        //初始化hasChecked变量
         boolean hasChecked = false;
+        /**
+         * 如果当前工作便签为清单模式，转化为文字形式保存其数据
+         * 否则直接保存文字数据到数据库中
+         */
         if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < mEditTextList.getChildCount(); i++) {
+                //获取当前文本编辑列表的第i项
                 View view = mEditTextList.getChildAt(i);
                 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+                /**
+                 * 如果当前便签文本编辑部分不为空
+                 */
                 if (!TextUtils.isEmpty(edit.getText())) {
+                    /**
+                     * 如果已标记当前项，则在文本前添加“TAG_CHECKED”
+                     * 如果未标记当前项，则在文本前添加“TAG_CHECKED”
+                     */
                     if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
                         sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
                         hasChecked = true;
@@ -788,16 +1350,25 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     }
                 }
             }
+            //使用建立好的文本内容设置当前活动便签的内容
             mWorkingNote.setWorkingText(sb.toString());
         } else {
             mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
         }
+        //返回便签是否已标记
         return hasChecked;
     }
 
+    /**
+     * 保存便签
+     * @return boolean
+     */
     private boolean saveNote() {
+        //获取当前文本并存储
         getWorkingText();
+        //调用WorkingNote的saveNote()方法保存便签
         boolean saved = mWorkingNote.saveNote();
+        //如果已保存，则设置结果为已保存
         if (saved) {
             /**
              * There are two modes from List view to edit view, open one note,
@@ -811,19 +1382,26 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         return saved;
     }
 
+    /**
+     * 将便签发送至桌面
+     */
     private void sendToDesktop() {
         /**
          * Before send message to home, we should make sure that current
          * editing note is exists in databases. So, for new note, firstly
          * save it
+         * 在发送消息至主页之前，先保存当前编辑的便签
          */
         if (!mWorkingNote.existInDatabase()) {
             saveNote();
         }
-
+        /**
+         * 如果当前便签具有Id（已编辑）
+         */
         if (mWorkingNote.getNoteId() > 0) {
             Intent sender = new Intent();
             Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+            //设置快捷访问的Intent，将其保存至sender中，以便直接快速调用NoteEditActivity
             shortcutIntent.setAction(Intent.ACTION_VIEW);
             shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
             sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
@@ -833,7 +1411,9 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                     Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
             sender.putExtra("duplicate", true);
             sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+            //显示消息提示框，表示文本以发送至桌面
             showToast(R.string.info_note_enter_desktop);
+            //将sender以广播的形式发出
             sendBroadcast(sender);
         } else {
             /**
@@ -842,10 +1422,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
              * should input something
              */
             Log.e(TAG, "Send to desktop error");
+            //显示消息提示框，将空便签发送到桌面
             showToast(R.string.error_note_empty_for_send_to_desktop);
         }
     }
 
+    /**
+     * 制作快捷访问图标的题目，如果其长度大于最大表示长度，则截断
+     * @param content 便签内容
+     * @return 返回修剪过的内容字符串
+     */
     private String makeShortcutIconTitle(String content) {
         content = content.replace(TAG_CHECKED, "");
         content = content.replace(TAG_UNCHECKED, "");
@@ -853,10 +1439,20 @@ public class NoteEditActivity extends Activity implements OnClickListener,
                 SHORTCUT_ICON_TITLE_MAX_LEN) : content;
     }
 
+    /**
+     * 显示消息提示框
+     * @param resId 结果标识（不同的消息）
+     */
     private void showToast(int resId) {
         showToast(resId, Toast.LENGTH_SHORT);
     }
 
+
+    /**
+     * 显示消息提示框
+     * @param resId 结果标识（不同的消息）
+     * @param duration 显示时长
+     */
     private void showToast(int resId, int duration) {
         Toast.makeText(this, resId, duration).show();
     }
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..b85b724 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -37,15 +37,21 @@ import net.micode.notes.R;
 import java.util.HashMap;
 import java.util.Map;
 
+//类：便签编辑文本类，继承了Android控件EditText
 public class NoteEditText extends EditText {
+    //语句：常量标识
     private static final String TAG = "NoteEditText";
+    //语句：声明整型变量，文本索引
     private int mIndex;
+    //语句：声明整型变量
     private int mSelectionStartBeforeDelete;
 
+    //语句：声明字符串常量，标志电话、网址、邮件
     private static final String SCHEME_TEL = "tel:" ;
     private static final String SCHEME_HTTP = "http:" ;
     private static final String SCHEME_EMAIL = "mailto:" ;
 
+    //语句块：设置映射，将文本内容（电话、网址、邮件）做链接处理
     private static final Map<String, Integer> sSchemaActionResMap = new HashMap<String, Integer>();
     static {
         sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
@@ -55,50 +61,60 @@ public class NoteEditText extends EditText {
 
     /**
      * Call by the {@link NoteEditActivity} to delete or add edit text
+     * 接口：该接口用于实现对TextView组件中的文字信息进行修改
      */
     public interface OnTextViewChangeListener {
         /**
          * Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
          * and the text is null
+         * 方法：当delete键按下时删除当前编辑的文字块
          */
         void onEditTextDelete(int index, String text);
 
         /**
          * Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
          * happen
+         * 方法：当enter键按下时添加一个文字编辑块
          */
         void onEditTextEnter(int index, String text);
 
         /**
          * Hide or show item option when text change
+         * 方法：当文字发生变化时隐藏或者显示设置
          */
         void onTextChange(int index, boolean hasText);
     }
 
+    //语句：声明文本视图变化监听器
     private OnTextViewChangeListener mOnTextViewChangeListener;
 
+    //方法：构造方法，实例化NoteEditText
     public NoteEditText(Context context) {
         super(context, null);
         mIndex = 0;
     }
 
+    //方法：设置索引号
     public void setIndex(int index) {
         mIndex = index;
     }
 
+    //方法：设置文本视图变化监听器
     public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
         mOnTextViewChangeListener = listener;
     }
 
+    //方法：构造方法，是由参数集（文本编辑风格）实例化NoteEditText
     public NoteEditText(Context context, AttributeSet attrs) {
         super(context, attrs, android.R.attr.editTextStyle);
     }
-
+    //方法：构造方法，是由参数集（文本编辑风格、定义风格）实例化NoteEditText
     public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         // TODO Auto-generated constructor stub
     }
 
+    //方法：监听触摸事件
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         switch (event.getAction()) {
@@ -111,25 +127,38 @@ public class NoteEditText extends EditText {
                 x += getScrollX();
                 y += getScrollY();
 
+                //语句：获取布局
                 Layout layout = getLayout();
+                //语句：获取纵向的行数
                 int line = layout.getLineForVertical(y);
+                //语句：获取横向的偏移量
                 int off = layout.getOffsetForHorizontal(line, x);
                 Selection.setSelection(getText(), off);
                 break;
         }
-
+        //语句：继续调用父类的监听事件方法
         return super.onTouchEvent(event);
     }
 
+    /**
+     * 方法：监听键盘按键按下
+     * @param keyCode 键盘按键的编码
+     * @param event 按键事件
+     * @return boolean
+     */
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
+            //语句块：按下回车键
             case KeyEvent.KEYCODE_ENTER:
+                //语句块：如果文本视图没有变化
                 if (mOnTextViewChangeListener != null) {
                     return false;
                 }
                 break;
+                //语句块：按下删除键
             case KeyEvent.KEYCODE_DEL:
+                //语句：获取删除文本的开始位置
                 mSelectionStartBeforeDelete = getSelectionStart();
                 break;
             default:
@@ -138,26 +167,45 @@ public class NoteEditText extends EditText {
         return super.onKeyDown(keyCode, event);
     }
 
+
+    /**
+     * 方法：监听按键抬起
+     * @param keyCode
+     * @param event
+     * @return
+     */
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         switch(keyCode) {
+            //语句块：抬起删除键
             case KeyEvent.KEYCODE_DEL:
+                //语句块：如果文本视图发生变化
                 if (mOnTextViewChangeListener != null) {
+                    //语句块：选择了删除的文字
                     if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
+                        //语句：监听文本的删除
                         mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
                         return true;
                     }
                 } else {
+                    //语句：报告文本视图变化监听器没有设置
                     Log.d(TAG, "OnTextViewChangeListener was not seted");
                 }
                 break;
+                //语句块：抬起回车键
             case KeyEvent.KEYCODE_ENTER:
+                //语句块：如果文本视图发生变化
                 if (mOnTextViewChangeListener != null) {
+                    //语句：获取选择区域的起点位置
                     int selectionStart = getSelectionStart();
+                    //语句：获取选择区域后面的文本信息
                     String text = getText().subSequence(selectionStart, length()).toString();
+                    //语句：实现文本换行的功能
                     setText(getText().subSequence(0, selectionStart));
+                    //语句：将选择区域内的文字移到下一行
                     mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
                 } else {
+                    //语句：报告文本视图变化监听器没有设置
                     Log.d(TAG, "OnTextViewChangeListener was not seted");
                 }
                 break;
@@ -167,9 +215,17 @@ public class NoteEditText extends EditText {
         return super.onKeyUp(keyCode, event);
     }
 
+    /**
+     * 处理当前视图下的焦点改变事件
+     * @param focused 代表获得或失去焦点
+     * @param direction
+     * @param previouslyFocusedRect 上一个访问的焦点区域
+     */
     @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+        //语句块：如果文本视图发生变化
         if (mOnTextViewChangeListener != null) {
+            //语句块：当焦点存在或者当前文本不为空时，监听文本的变化
             if (!focused && TextUtils.isEmpty(getText())) {
                 mOnTextViewChangeListener.onTextChange(mIndex, false);
             } else {
@@ -179,9 +235,13 @@ public class NoteEditText extends EditText {
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
     }
 
+    /**
+     * 方法：创建环境菜单
+     */
     @Override
     protected void onCreateContextMenu(ContextMenu menu) {
         if (getText() instanceof Spanned) {
+            //语句块：获取高亮元素
             int selStart = getSelectionStart();
             int selEnd = getSelectionEnd();
 
@@ -189,6 +249,7 @@ public class NoteEditText extends EditText {
             int max = Math.max(selStart, selEnd);
 
             final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
+            //语句块：针对不同的高亮元素，使用不同的操作进行处理
             if (urls.length == 1) {
                 int defaultResId = 0;
                 for(String schema: sSchemaActionResMap.keySet()) {
@@ -201,7 +262,7 @@ public class NoteEditText extends EditText {
                 if (defaultResId == 0) {
                     defaultResId = R.string.note_link_other;
                 }
-
+                //语句块：添加环境菜单的点击事件
                 menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
                         new OnMenuItemClickListener() {
                             public boolean onMenuItemClick(MenuItem item) {
diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..94fdab2 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -40,6 +40,8 @@ public class NoteItemData {
         NoteColumns.TYPE,
         NoteColumns.WIDGET_ID,
         NoteColumns.WIDGET_TYPE,
+        NoteColumns.PASSWORD,
+        NoteColumns.IMPORTANCE
     };
 
     private static final int ID_COLUMN                    = 0;
@@ -54,6 +56,8 @@ public class NoteItemData {
     private static final int TYPE_COLUMN                  = 9;
     private static final int WIDGET_ID_COLUMN             = 10;
     private static final int WIDGET_TYPE_COLUMN           = 11;
+    private static final int PASSWORD                     = 12;
+    private static final int IMPORTANCE                   = 13;
 
     private long mId;
     private long mAlertDate;
@@ -69,6 +73,8 @@ public class NoteItemData {
     private int mWidgetType;
     private String mName;
     private String mPhoneNumber;
+    private String mPassword;
+    private int mImportance;
 
     private boolean mIsLastItem;
     private boolean mIsFirstItem;
@@ -91,6 +97,8 @@ public class NoteItemData {
         mType = cursor.getInt(TYPE_COLUMN);
         mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
         mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+        mPassword = cursor.getString(PASSWORD);
+        mImportance = cursor.getInt(IMPORTANCE);
 
         mPhoneNumber = "";
         if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
@@ -133,6 +141,13 @@ public class NoteItemData {
             }
         }
     }
+    public boolean hasPassword() { return !mPassword.equals(""); }
+
+    public String getPassword() { return mPassword; }
+
+    public boolean hasImportance() { return (mImportance > 0); }
+
+    public int getImportance() { return mImportance; }
 
     public boolean isOneFollowingFolder() {
         return mIsOneNoteFollowingFolder;
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 08b2bbc..bbdaff7 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -81,7 +81,7 @@ import java.util.HashSet;
 public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
-    private int mode = -1;
+    private int mode =-1;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
 
@@ -442,6 +442,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         }
     }
 
+    /**
+     * 显示文件夹列表菜单，用于在选中一个到多个便签后选择文件夹进行移动时的界面，并在完成后显示相关信息
+     * @param cursor
+     */
     private void showFolderListMenu(Cursor cursor) {
         AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
         builder.setTitle(R.string.menu_title_select_folder);
@@ -539,6 +543,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         intent.setAction(Intent.ACTION_VIEW);
         intent.putExtra(Intent.EXTRA_UID, data.getId());
         this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
+
     }
 
     private void openFolder(NoteItemData data) {
@@ -762,7 +767,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         menu.clear();
         if (mState == ListEditState.NOTE_LIST) {
             getMenuInflater().inflate(R.menu.note_list, menu);
-            // set sync or sync_cancel
+            // set s
+            // ync or sync_cancel
             menu.findItem(R.id.menu_sync).setTitle(
                     GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
         } else if (mState == ListEditState.SUB_FOLDER) {
@@ -772,9 +778,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
         } else {
             Log.e(TAG, "Wrong state:" + mState);
         }
-        if(mode ==-1){
-            menu.findItem(R.id.menu_grass).setVisible(false);
-        }else if(mode==1){
+
+        if(mode  ==-1){
+            menu.findItem(R.id.menu_grassland).setVisible(false);
+        }else if(mode ==1){
             menu.findItem(R.id.menu_water).setVisible(false);
         }
         return true;
@@ -803,12 +810,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
             createNewNote();
         } else if (itemId == R.id.menu_search) {
             onSearchRequested();
-        } else if(itemId == R.id.menu_water){
-            mode =1;
-            getWindow().setBackgroundDrawableResource(R.drawable.water);
-        }else if(itemId == R.id.menu_grass){
-            mode =1;
+        } else if (itemId == R.id.menu_grassland){
+            mode=-1;
             getWindow().setBackgroundDrawableResource(R.drawable.grassland);
+        } else if (itemId == R.id.menu_water){
+            mode=1;
+            getWindow().setBackgroundDrawableResource(R.drawable.water);
         }
         return true;
     }
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..8172014 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -32,20 +32,24 @@ import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
 
 public class NotesListItem extends LinearLayout {
     private ImageView mAlert;
+    private ImageView mLock;
     private TextView mTitle;
     private TextView mTime;
     private TextView mCallName;
     private NoteItemData mItemData;
     private CheckBox mCheckBox;
+    private ImageView mLabel;
 
     public NotesListItem(Context context) {
         super(context);
         inflate(context, R.layout.note_item, this);
         mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
+        mLock = (ImageView) findViewById(R.id.iv_lock_icon);
         mTitle = (TextView) findViewById(R.id.tv_title);
         mTime = (TextView) findViewById(R.id.tv_time);
         mCallName = (TextView) findViewById(R.id.tv_name);
         mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
+        mLabel= (ImageView) findViewById(R.id.iv_importance);
     }
 
     public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
@@ -92,10 +96,41 @@ public class NotesListItem extends LinearLayout {
                 } else {
                     mAlert.setVisibility(View.GONE);
                 }
+                if (data.hasPassword()) {
+                    mLock.setImageResource(R.drawable.lock);
+                    mLock.setVisibility(View.VISIBLE);
+                } else {
+                    mLock.setVisibility(View.GONE);
+                }
             }
         }
         mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
 
+        if(data.hasImportance()){
+            switch (data.getImportance()) {
+                case 1:
+                    mLabel.setImageResource(R.drawable.attention1);
+                    break;
+                case 2:
+                    mLabel.setImageResource(R.drawable.attention2);
+                    break;
+                case 3:
+                    mLabel.setImageResource(R.drawable.attention3);
+                    break;
+                case 4:
+                    mLabel.setImageResource(R.drawable.attention4);
+                    break;
+                case 5:
+                    mLabel.setImageResource(R.drawable.attention5);
+                    break;
+                default:
+                   // mLabel.setImageResource(R.drawable.attention0);
+
+            }
+        }else{
+            //mLabel.setImageResource(R.drawable.attention0);
+        }
+        mLabel.setVisibility(View.VISIBLE);
         setBackground(data);
     }
 
diff --git a/app/src/main/java/net/micode/notes/ui/OnPasswordInputFinish.java b/app/src/main/java/net/micode/notes/ui/OnPasswordInputFinish.java
new file mode 100644
index 0000000..1023419
--- /dev/null
+++ b/app/src/main/java/net/micode/notes/ui/OnPasswordInputFinish.java
@@ -0,0 +1,5 @@
+package net.micode.notes.ui;
+
+public interface OnPasswordInputFinish {
+    void inputFinish();
+}
diff --git a/app/src/main/java/net/micode/notes/ui/PasswordView.java b/app/src/main/java/net/micode/notes/ui/PasswordView.java
new file mode 100644
index 0000000..10d42ce
--- /dev/null
+++ b/app/src/main/java/net/micode/notes/ui/PasswordView.java
@@ -0,0 +1,217 @@
+package net.micode.notes.ui;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.RelativeLayout;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.GridView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+
+public class PasswordView extends RelativeLayout implements View.OnClickListener {
+    Context context;
+
+    private String strPassword; //输入的密码
+    private TextView[] tvList;  //用数组保存4个TextView
+    private GridView gridView;  //GridView布局键盘
+    private ArrayList<Map<String, String>> valueList;   //要用Adapter中适配，用数组不能往adapter中填充
+
+    private ImageView imgCancel;
+
+    private int currentIndex = -1;    //用于记录当前输入密码格位置
+
+    /**
+     * 声明整型常量用于描述三种不同的口令输入界面
+     */
+    public static final int NEW_PWD_VIEW = 0; //表示“设置便签访问密码”界面的序号
+    public static final int RPT_PWD_VIEW = 1; //表示“确认设置访问密码”界面的序号
+    public static final int CUR_PWD_VIEW = 2; //表示“根据密码访问便签”界面的序号
+
+
+    public PasswordView(Context context, int mode) {
+        this(context, null, mode);
+    }
+
+    /**
+     * 该构造方法用于在界面上方创建便签输入的界面
+     * @param context 便签密码输入界面的上下文
+     * @param attrs 便签密码输入界面的控件参数
+     * @param mode 便签密码输入界面的序号
+     */
+    public PasswordView(Context context, AttributeSet attrs, int mode) {
+        //调用父类方法处理参数
+        super(context, attrs);
+        this.context = context;
+        View view;
+        /**
+         * 根据输入参数mode跳转到不同的界面
+         */
+        switch (mode) {
+            case NEW_PWD_VIEW:
+                view = View.inflate(context, R.layout.note_encryption, null);
+                break;
+            case RPT_PWD_VIEW:
+                view = View.inflate(context, R.layout.note_encryption_repeat, null);
+                break;
+            case CUR_PWD_VIEW:
+                view = View.inflate(context, R.layout.note_decryption, null);
+                break;
+            default:
+                view = View.inflate(context, R.layout.homepage, null);
+        }
+
+        valueList = new ArrayList<Map<String, String>>();
+        tvList = new TextView[4];
+
+        imgCancel = (ImageView) view.findViewById(R.id.img_cancel);
+        imgCancel.setOnClickListener(this);
+
+        tvList[0] = (TextView) view.findViewById(R.id.tv_pass1);
+        tvList[1] = (TextView) view.findViewById(R.id.tv_pass2);
+        tvList[2] = (TextView) view.findViewById(R.id.tv_pass3);
+        tvList[3] = (TextView) view.findViewById(R.id.tv_pass4);
+
+        gridView = (GridView) view.findViewById(R.id.gv_keyboard);
+
+        setView();
+        addView(view);      //必须要，不然不显示控件
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.img_cancel) {
+            Toast.makeText(context, "Cancel", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    private void setView() {
+        /* 初始化按钮上应该显示的数字 */
+        for (int i = 1; i < 13; i++) {
+            Map<String, String> map = new HashMap<String, String>();
+            if (i < 10) {
+                map.put("name", String.valueOf(i));
+            } else if (i == 10) {
+                map.put("name", "");
+            } else if (i == 12) {
+                map.put("name", "<<-");
+            } else if (i == 11) {
+                map.put("name", String.valueOf(0));
+            }
+            valueList.add(map);
+        }
+
+        gridView.setAdapter(adapter);
+        gridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (position < 11 && position != 9) {    //点击0~9按钮
+                    if (currentIndex >= -1 && currentIndex < 3) {      //判断输入位置————要小心数组越界
+                        tvList[++currentIndex].setText(valueList.get(position).get("name"));
+                    }
+                } else {
+                    if (position == 11) {      //点击退格键
+                        if (currentIndex - 1 >= -1) {      //判断是否删除完毕————要小心数组越界
+                            tvList[currentIndex--].setText("");
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    //设置监听方法，在第6位输入完成后触发
+    public void setOnFinishInput(final OnPasswordInputFinish pass) {
+        tvList[3].addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s.toString().length() == 1) {
+                    strPassword = "";     //每次触发都要先将strPassword置空，再重新获取，避免由于输入删除再输入造成混乱
+                    for (int i = 0; i < 4; i++) {
+                        strPassword += tvList[i].getText().toString().trim();
+                    }
+                    pass.inputFinish();    //接口中要实现的方法，完成密码输入完成后的响应逻辑
+                }
+            }
+        });
+    }
+
+    /* 获取输入的密码 */
+    public String getStrPassword() {
+        return strPassword;
+    }
+
+    /* 暴露取消支付的按钮，可以灵活改变响应 */
+    public ImageView getCancelImageView() {
+        return imgCancel;
+    }
+
+    //GridView的适配器
+    BaseAdapter adapter = new BaseAdapter() {
+        @Override
+        public int getCount() {
+            return valueList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return valueList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder viewHolder;
+            if (convertView == null) {
+                convertView = View.inflate(context, R.layout.item_grid, null);
+                viewHolder = new ViewHolder();
+                viewHolder.btnKey = (TextView) convertView.findViewById(R.id.btn_keys);
+                convertView.setTag(viewHolder);
+            } else {
+                viewHolder = (ViewHolder) convertView.getTag();
+            }
+            viewHolder.btnKey.setText(valueList.get(position).get("name"));
+            if(position == 9){
+                viewHolder.btnKey.setBackgroundResource(R.drawable.selector_key_del);
+                viewHolder.btnKey.setEnabled(false);
+            }
+            if(position == 11){
+                viewHolder.btnKey.setBackgroundResource(R.drawable.selector_key_del);
+            }
+
+            return convertView;
+        }
+    };
+
+    /**
+     * 存放控件
+     */
+    public final class ViewHolder {
+        public TextView btnKey;
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/attention0.png b/app/src/main/res/drawable-hdpi/attention0.png
new file mode 100644
index 0000000..0772486
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention0.png differ
diff --git a/app/src/main/res/drawable-hdpi/attention1.png b/app/src/main/res/drawable-hdpi/attention1.png
new file mode 100644
index 0000000..42aa899
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention1.png differ
diff --git a/app/src/main/res/drawable-hdpi/attention2.png b/app/src/main/res/drawable-hdpi/attention2.png
new file mode 100644
index 0000000..5edf7f8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention2.png differ
diff --git a/app/src/main/res/drawable-hdpi/attention3.png b/app/src/main/res/drawable-hdpi/attention3.png
new file mode 100644
index 0000000..21eef66
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention3.png differ
diff --git a/app/src/main/res/drawable-hdpi/attention4.png b/app/src/main/res/drawable-hdpi/attention4.png
new file mode 100644
index 0000000..9c61ae9
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention4.png differ
diff --git a/app/src/main/res/drawable-hdpi/attention5.png b/app/src/main/res/drawable-hdpi/attention5.png
new file mode 100644
index 0000000..e438546
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/attention5.png differ
diff --git a/app/src/main/res/drawable-hdpi/cancel.png b/app/src/main/res/drawable-hdpi/cancel.png
new file mode 100644
index 0000000..96463e5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/cancel.png differ
diff --git a/app/src/main/res/drawable-hdpi/lock.png b/app/src/main/res/drawable-hdpi/lock.png
new file mode 100644
index 0000000..d19b9ac
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/lock.png differ
diff --git a/app/src/main/res/drawable/selector_grid.xml b/app/src/main/res/drawable/selector_grid.xml
new file mode 100644
index 0000000..e2d3f48
--- /dev/null
+++ b/app/src/main/res/drawable/selector_grid.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="false">
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="true">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_key_del.xml b/app/src/main/res/drawable/selector_key_del.xml
new file mode 100644
index 0000000..91e8c4d
--- /dev/null
+++ b/app/src/main/res/drawable/selector_key_del.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="false">
+        <shape>
+            <solid android:color="#C0C4C7" />
+        </shape>
+    </item>
+    <item android:state_enabled="true" android:state_pressed="true">
+        <shape>
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_dialog_title.xml b/app/src/main/res/layout/account_dialog_title.xml
index 7717112..0b72974 100644
--- a/app/src/main/res/layout/account_dialog_title.xml
+++ b/app/src/main/res/layout/account_dialog_title.xml
@@ -15,29 +15,27 @@
      limitations under the License.
 -->
 
-<LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
     <TextView
         android:id="@+id/account_dialog_title"
         style="?android:attr/textAppearanceMedium"
-        android:singleLine="true"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="-2.7dip"
+        android:layout_marginTop="-2.7dip"
         android:ellipsize="end"
         android:gravity="center"
-        android:layout_marginTop="-2.7dip"
-        android:layout_marginBottom="-2.7dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:singleLine="true" />
 
     <TextView
         android:id="@+id/account_dialog_subtitle"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dip"
         android:layout_marginBottom="1dip"
-        android:gravity="center"/>
+        android:layout_marginTop="5dip"
+        android:gravity="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/current_password_head.xml b/app/src/main/res/layout/current_password_head.xml
new file mode 100644
index 0000000..6979527
--- /dev/null
+++ b/app/src/main/res/layout/current_password_head.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="输入密码以访问便签"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
+
+
diff --git a/app/src/main/res/layout/homepage.xml b/app/src/main/res/layout/homepage.xml
new file mode 100644
index 0000000..0159f78
--- /dev/null
+++ b/app/src/main/res/layout/homepage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/Red"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="100pt"
+        android:height="100pt"
+        android:background="#f00" />
+
+    <TextView
+        android:id="@+id/Green"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="80pt"
+        android:height="80pt"
+        android:background="#0f0" />
+
+    <TextView
+        android:id="@+id/Blue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:width="60pt"
+        android:height="60pt"
+        android:background="#00f" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
new file mode 100644
index 0000000..6e4189d
--- /dev/null
+++ b/app/src/main/res/layout/item_grid.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- 模拟键盘按钮，当然你可以用Button，但要注意Button和GridView的点击响应问题 -->
+    <TextView
+        android:id="@+id/btn_keys"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="10dp"
+        android:gravity="center"
+        android:textSize="25sp"
+        android:background="@drawable/selector_grid"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout.xml b/app/src/main/res/layout/layout.xml
new file mode 100644
index 0000000..ebe748a
--- /dev/null
+++ b/app/src/main/res/layout/layout.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#3354fc" />
+
+        <TableLayout android:id="@+id/TableLayout01"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:shrinkColumns="1"
+            android:stretchColumns="2">
+
+            <Button
+                android:id="@+id/Button01"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Button01" />
+
+            <TableRow>
+                <Button
+                    android:id="@+id/Button02"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Btn02" />
+
+                <Button
+                    android:id="@+id/Button03"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button03" />
+
+                <Button
+                    android:id="@+id/Button04"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button04" />
+            </TableRow>
+
+            <TableRow>
+                <Button
+                    android:id="@+id/ButtonR"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_column="2"
+                    android:text="RIGHT" />
+
+            </TableRow>
+        </TableLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#3354fc"/>
+
+        <TableLayout android:id="@+id/TableLayout02"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:collapseColumns="1">
+
+            <TableRow>
+
+                <Button
+                    android:id="@+id/Button06"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button06" />
+
+                <Button
+                    android:id="@+id/Button07"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button07" />
+
+                <Button
+                    android:id="@+id/Button08"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Button08" />
+            </TableRow>
+        </TableLayout>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#3354fc"/>
+    </LinearLayout>
diff --git a/app/src/main/res/layout/layout2.xml b/app/src/main/res/layout/layout2.xml
new file mode 100644
index 0000000..f7e04b4
--- /dev/null
+++ b/app/src/main/res/layout/layout2.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <!-- 定义一个文本框，使用绝对定位 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="20dp"
+        android:layout_y="20dp"
+        android:text=" User：" />
+
+    <!-- 定义一个文本编辑框，使用绝对定位 -->
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="105dp"
+        android:layout_y="15dp"
+        android:width="250dp" />
+    <!-- 定义一个文本框，使用绝对定位 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="20dp"
+        android:layout_y="80dp"
+        android:text=" Password：" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="105dp"
+        android:layout_y="75dp"
+        android:width="250dp"
+        android:password="true" />
+    <!-- 定义一个按钮，使用绝对定位 -->
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="130dp"
+        android:layout_y="135dp"
+        android:text=" Login " />
+</AbsoluteLayout>
diff --git a/app/src/main/res/layout/new_password_head.xml b/app/src/main/res/layout/new_password_head.xml
new file mode 100644
index 0000000..1f5803e
--- /dev/null
+++ b/app/src/main/res/layout/new_password_head.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="设置便签访问密码"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_decryption.xml b/app/src/main/res/layout/note_decryption.xml
new file mode 100644
index 0000000..4261b4a
--- /dev/null
+++ b/app/src/main/res/layout/note_decryption.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/current_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_edit.xml b/app/src/main/res/layout/note_edit.xml
index 10b2aa7..ff388d7 100644
--- a/app/src/main/res/layout/note_edit.xml
+++ b/app/src/main/res/layout/note_edit.xml
@@ -113,6 +113,12 @@
                 android:layout_width="fill_parent"
                 android:layout_height="7dip"
                 android:background="@drawable/bg_color_btn_mask" />
+
+            <TextView
+                android:id="@+id/textCount"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="字数统计" />
         </LinearLayout>
     </LinearLayout>
 
@@ -127,10 +133,10 @@
         android:id="@+id/note_bg_color_selector"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
-        android:layout_marginTop="30dip"
-        android:layout_marginRight="8dip"
         android:layout_gravity="top|right"
+        android:layout_marginRight="8dip"
+        android:layout_marginTop="30dip"
+        android:background="@drawable/note_edit_color_selector_panel"
         android:visibility="gone">
 
         <FrameLayout
@@ -150,8 +156,8 @@
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="5dip"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -169,10 +175,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
                 android:layout_marginRight="3dip"
-                android:src="@drawable/selected" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -190,10 +196,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:focusable="false"
-                android:visibility="gone"
                 android:layout_marginRight="2dip"
-                android:src="@drawable/selected" />
+                android:focusable="false"
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -212,8 +218,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
 
         <FrameLayout
@@ -232,8 +238,8 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
                 android:focusable="false"
-                android:visibility="gone"
-                android:src="@drawable/selected" />
+                android:src="@drawable/selected"
+                android:visibility="gone" />
         </FrameLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/note_encryption.xml b/app/src/main/res/layout/note_encryption.xml
new file mode 100644
index 0000000..aa79770
--- /dev/null
+++ b/app/src/main/res/layout/note_encryption.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/new_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_encryption_repeat.xml b/app/src/main/res/layout/note_encryption_repeat.xml
new file mode 100644
index 0000000..6786dea
--- /dev/null
+++ b/app/src/main/res/layout/note_encryption_repeat.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/note_decryption"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFFFFF"
+    android:gravity="bottom">
+
+    <LinearLayout
+        android:id="@+id/linear_pass"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <include layout="@layout/repeat_password_head" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="#555555" />
+
+        <include layout="@layout/password_item" />
+
+    </LinearLayout>
+
+    <!-- 输入键盘 -->
+    <GridView
+        android:id="@+id/gv_keyboard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/linear_pass"
+        android:layout_marginTop="80dp"
+        android:background="@android:color/black"
+        android:horizontalSpacing="0.5dp"
+        android:numColumns="3"
+        android:verticalSpacing="0.5dp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_importance.xml b/app/src/main/res/layout/note_importance.xml
new file mode 100644
index 0000000..7d23f56
--- /dev/null
+++ b/app/src/main/res/layout/note_importance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RatingBar
+        android:id="@+id/ratingBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:numStars="5"
+        android:visibility="visible" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/note_item.xml b/app/src/main/res/layout/note_item.xml
index d541f6a..df394b5 100644
--- a/app/src/main/res/layout/note_item.xml
+++ b/app/src/main/res/layout/note_item.xml
@@ -17,6 +17,7 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/note_item"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
@@ -65,8 +66,8 @@
             android:id="@android:id/checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:focusable="false"
             android:clickable="false"
+            android:focusable="false"
             android:visibility="gone" />
     </LinearLayout>
 
@@ -75,4 +76,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right"/>
+
+    <ImageView
+        android:id="@+id/iv_lock_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|left"/>
+
+    <ImageView
+        android:id="@+id/iv_importance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml
index 0809313..c6abba2 100644
--- a/app/src/main/res/layout/note_list.xml
+++ b/app/src/main/res/layout/note_list.xml
@@ -17,9 +17,10 @@
 
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <!--android:background="@drawable/list_background" -->
+    <!--android:background="@drawable/list_background"> -->
 
     <LinearLayout
         android:layout_width="fill_parent"
@@ -55,4 +56,6 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
+
+
 </FrameLayout>
diff --git a/app/src/main/res/layout/password_item.xml b/app/src/main/res/layout/password_item.xml
new file mode 100644
index 0000000..b298079
--- /dev/null
+++ b/app/src/main/res/layout/password_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="40dp"
+    android:layout_marginRight="40dp"
+    android:layout_marginTop="80dp"
+    android:orientation="horizontal">
+
+    <!-- inputType设置隐藏密码明文
+          textSize设置大一点，否则“点”太小了，不美观 -->
+    <TextView
+        android:id="@+id/tv_pass1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass3"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:background="#999999" />
+
+    <TextView
+        android:id="@+id/tv_pass4"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:inputType="numberPassword"
+        android:textSize="32sp" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/repeat_password_head.xml b/app/src/main/res/layout/repeat_password_head.xml
new file mode 100644
index 0000000..0f751be
--- /dev/null
+++ b/app/src/main/res/layout/repeat_password_head.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="5dp">
+
+    <!-- 取消按钮 -->
+    <ImageView
+        android:id="@+id/img_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:background="@drawable/cancel" />
+
+
+    <!-- 输入密码文本视图 灰色 -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="确认便签访问密码"
+        android:textColor="#808080"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/note_edit.xml b/app/src/main/res/menu/note_edit.xml
index 35cacd1..fe068b3 100644
--- a/app/src/main/res/menu/note_edit.xml
+++ b/app/src/main/res/menu/note_edit.xml
@@ -49,4 +49,17 @@
     <item
         android:id="@+id/menu_delete_remind"
         android:title="@string/menu_remove_remind" />
+
+    <item
+        android:id="@+id/menu_encrypt"
+        android:title="@string/menu_encrypt" />
+
+    <item
+        android:id="@+id/menu_delete_encrypt"
+        android:title="@string/menu_remove_encrypt" />
+
+    <item
+        android:id="@+id/menu_set_importance"
+        android:title="@string/menu_set_importance"/>
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/note_list.xml b/app/src/main/res/menu/note_list.xml
index f341bca..b6af36c 100644
--- a/app/src/main/res/menu/note_list.xml
+++ b/app/src/main/res/menu/note_list.xml
@@ -40,6 +40,6 @@
         android:id="@+id/menu_water"
         android:title="Background:water"/>
     <item
-        android:id="@+id/menu_grass"
+        android:id="@+id/menu_grassland"
         android:title="Background:grassland"/>
 </menu>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 09f75ed..9f65f6f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -63,6 +63,11 @@
     <string name="menu_send_to_desktop">发送到桌面</string>
     <string name="menu_alert">提醒我</string>
     <string name="menu_remove_remind">删除提醒</string>
+    <!-- #####################################################################################  -->
+    <string name="menu_encrypt">设置密码</string>
+    <string name="menu_remove_encrypt">解除密码</string>
+    <string name="menu_set_importance">设置便签重要性</string>
+    <!-- #####################################################################################  -->
     <string name="menu_title_select_folder">选择文件夹</string>
     <string name="menu_move_parent_folder">上一级文件夹</string>
     <string name="info_note_enter_desktop">已添加到桌面</string>
@@ -70,6 +75,16 @@
     <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
     <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
     <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <!-- #####################################################################################  -->
+    <string name="alert_title_encrypt">密码提示</string>
+    <string name="alert_message_encrypt">便签访问密码设置成功， 密码是 %s</string>
+    <string name="alert_message_encrypt_error">便签访问密码设置成功，两次密码输入不一致</string>
+    <string name="alert_message_decrypt">密码输入正确，即将进入便签</string>
+    <string name="alert_message_decrypt_error">密码输入错误，请重新输入</string>
+    <string name="alert_message_remove_encrypt">解除便签访问密码成功</string>
+
+    <string name="alert_title_importance">设置重要性</string>
+    <!-- #####################################################################################  -->
     <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
     <!-- export text -->
     <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 888c390..d90c396 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,12 +38,13 @@
     <!-- Text export file information -->
     <string name="file_path">/MIUI/notes/</string>
     <string name="file_name_txt_format">notes_%s.txt</string>
-    <!-- Background -->
+
+
+    <!--SB luzhiyuan's Background -->
     <string name="menu_water">Background:water</string>
     <string name="menu_grassland">Background:grassland</string>
 
 
-
     <!-- notes list string -->
     <string name="format_folder_files_count">(%d)</string>
     <string name="menu_create_folder">New Folder</string>
@@ -73,6 +74,12 @@
     <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_encrypt">Encrypt note</string>
+    <string name="menu_remove_encrypt">Delete encryption</string>
+
+    <string name="menu_set_importance">Set importance</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>
@@ -80,6 +87,16 @@
     <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="alert_title_encrypt">Encryption</string>
+    <string name="alert_message_encrypt">Encrypt note successfully, password is %s</string>
+    <string name="alert_message_encrypt_error">Encrypt note unsuccessfully, password input is not same</string>
+    <string name="alert_message_decrypt">Decrypt note successfully</string>
+    <string name="alert_message_decrypt_error">Decrypt note unsuccessfully, password is wrong</string>
+    <string name="alert_message_remove_encrypt">Remove encryption successfully</string>
+
+    <string name="alert_title_importance">Set Importance</string>
+    <!-- #####################################################################################  -->
     <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
     <!-- Error information -->
     <string name="error_sdcard_unmounted">SD card busy, not available now</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 318860d..1241bbd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <!--        <item name="android:displayOptions" />-->
+     <!--   <item name="android:displayOptions" />-->
         <item name="android:visibility">visible</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 004e2d0..a97535f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c3c52f5..dfa32f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Nov 06 15:15:04 CST 2023
+#Tue Nov 07 10:47:24 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
diff --git a/import-summary.txt b/import-summary.txt
index c288790..f2e6428 100644
--- a/import-summary.txt
+++ b/import-summary.txt
@@ -1,16 +1,6 @@
 ECLIPSE ANDROID PROJECT IMPORT SUMMARY
 ======================================
 
-Risky Project Location:
------------------------
-The tools *should* handle project locations in any directory. However,
-due to bugs, placing projects in directories containing spaces in the
-path, or characters like ", ' and &, have had issues. We're working to
-eliminate these bugs, but to save yourself headaches you may want to
-move your project to a location where this is not a problem.
-D:\software gongcheng\Notes-master
-           -                      
-
 Ignored Files:
 --------------
 The following files were *not* copied into the new Gradle project; you
@@ -20,187 +10,6 @@ so manually move them:
 * .gitignore
 * NOTICE
 * README
-* app\
-* app\build.gradle
-* app\src\
-* app\src\main\
-* app\src\main\AndroidManifest.xml
-* app\src\main\java\
-* app\src\main\java\net\
-* app\src\main\java\net\micode\
-* app\src\main\java\net\micode\notes\
-* app\src\main\java\net\micode\notes\data\
-* app\src\main\java\net\micode\notes\data\Contact.java
-* app\src\main\java\net\micode\notes\data\Notes.java
-* app\src\main\java\net\micode\notes\data\NotesDatabaseHelper.java
-* app\src\main\java\net\micode\notes\data\NotesProvider.java
-* app\src\main\java\net\micode\notes\gtask\
-* app\src\main\java\net\micode\notes\gtask\data\
-* app\src\main\java\net\micode\notes\gtask\data\MetaData.java
-* app\src\main\java\net\micode\notes\gtask\data\Node.java
-* app\src\main\java\net\micode\notes\gtask\data\SqlData.java
-* app\src\main\java\net\micode\notes\gtask\data\SqlNote.java
-* app\src\main\java\net\micode\notes\gtask\data\Task.java
-* app\src\main\java\net\micode\notes\gtask\data\TaskList.java
-* app\src\main\java\net\micode\notes\gtask\exception\
-* app\src\main\java\net\micode\notes\gtask\exception\ActionFailureException.java
-* app\src\main\java\net\micode\notes\gtask\exception\NetworkFailureException.java
-* app\src\main\java\net\micode\notes\gtask\remote\
-* app\src\main\java\net\micode\notes\gtask\remote\GTaskASyncTask.java
-* app\src\main\java\net\micode\notes\gtask\remote\GTaskClient.java
-* app\src\main\java\net\micode\notes\gtask\remote\GTaskManager.java
-* app\src\main\java\net\micode\notes\gtask\remote\GTaskSyncService.java
-* app\src\main\java\net\micode\notes\model\
-* app\src\main\java\net\micode\notes\model\Note.java
-* app\src\main\java\net\micode\notes\model\WorkingNote.java
-* app\src\main\java\net\micode\notes\tool\
-* app\src\main\java\net\micode\notes\tool\BackupUtils.java
-* app\src\main\java\net\micode\notes\tool\DataUtils.java
-* app\src\main\java\net\micode\notes\tool\GTaskStringUtils.java
-* app\src\main\java\net\micode\notes\tool\ResourceParser.java
-* app\src\main\java\net\micode\notes\ui\
-* app\src\main\java\net\micode\notes\ui\AlarmAlertActivity.java
-* app\src\main\java\net\micode\notes\ui\AlarmInitReceiver.java
-* app\src\main\java\net\micode\notes\ui\AlarmReceiver.java
-* app\src\main\java\net\micode\notes\ui\DateTimePicker.java
-* app\src\main\java\net\micode\notes\ui\DateTimePickerDialog.java
-* app\src\main\java\net\micode\notes\ui\DropdownMenu.java
-* app\src\main\java\net\micode\notes\ui\FoldersListAdapter.java
-* app\src\main\java\net\micode\notes\ui\NoteEditActivity.java
-* app\src\main\java\net\micode\notes\ui\NoteEditText.java
-* app\src\main\java\net\micode\notes\ui\NoteItemData.java
-* app\src\main\java\net\micode\notes\ui\NotesListActivity.java
-* app\src\main\java\net\micode\notes\ui\NotesListAdapter.java
-* app\src\main\java\net\micode\notes\ui\NotesListItem.java
-* app\src\main\java\net\micode\notes\ui\NotesPreferenceActivity.java
-* app\src\main\java\net\micode\notes\widget\
-* app\src\main\java\net\micode\notes\widget\NoteWidgetProvider.java
-* app\src\main\java\net\micode\notes\widget\NoteWidgetProvider_2x.java
-* app\src\main\java\net\micode\notes\widget\NoteWidgetProvider_4x.java
-* app\src\main\res\
-* app\src\main\res\color\
-* app\src\main\res\color\primary_text_dark.xml
-* app\src\main\res\color\secondary_text_dark.xml
-* app\src\main\res\drawable-hdpi\
-* app\src\main\res\drawable-hdpi\bg_btn_set_color.png
-* app\src\main\res\drawable-hdpi\bg_color_btn_mask.png
-* app\src\main\res\drawable-hdpi\call_record.png
-* app\src\main\res\drawable-hdpi\clock.png
-* app\src\main\res\drawable-hdpi\delete.png
-* app\src\main\res\drawable-hdpi\dropdown_icon.9.png
-* app\src\main\res\drawable-hdpi\edit_blue.9.png
-* app\src\main\res\drawable-hdpi\edit_green.9.png
-* app\src\main\res\drawable-hdpi\edit_red.9.png
-* app\src\main\res\drawable-hdpi\edit_title_blue.9.png
-* app\src\main\res\drawable-hdpi\edit_title_green.9.png
-* app\src\main\res\drawable-hdpi\edit_title_red.9.png
-* app\src\main\res\drawable-hdpi\edit_title_white.9.png
-* app\src\main\res\drawable-hdpi\edit_title_yellow.9.png
-* app\src\main\res\drawable-hdpi\edit_white.9.png
-* app\src\main\res\drawable-hdpi\edit_yellow.9.png
-* app\src\main\res\drawable-hdpi\font_large.png
-* app\src\main\res\drawable-hdpi\font_normal.png
-* app\src\main\res\drawable-hdpi\font_size_selector_bg.9.png
-* app\src\main\res\drawable-hdpi\font_small.png
-* app\src\main\res\drawable-hdpi\font_super.png
-* app\src\main\res\drawable-hdpi\icon_app.png
-* app\src\main\res\drawable-hdpi\list_background.png
-* app\src\main\res\drawable-hdpi\list_blue_down.9.png
-* app\src\main\res\drawable-hdpi\list_blue_middle.9.png
-* app\src\main\res\drawable-hdpi\list_blue_single.9.png
-* app\src\main\res\drawable-hdpi\list_blue_up.9.png
-* app\src\main\res\drawable-hdpi\list_folder.9.png
-* app\src\main\res\drawable-hdpi\list_footer_bg.9.png
-* app\src\main\res\drawable-hdpi\list_green_down.9.png
-* app\src\main\res\drawable-hdpi\list_green_middle.9.png
-* app\src\main\res\drawable-hdpi\list_green_single.9.png
-* app\src\main\res\drawable-hdpi\list_green_up.9.png
-* app\src\main\res\drawable-hdpi\list_red_down.9.png
-* app\src\main\res\drawable-hdpi\list_red_middle.9.png
-* app\src\main\res\drawable-hdpi\list_red_single.9.png
-* app\src\main\res\drawable-hdpi\list_red_up.9.png
-* app\src\main\res\drawable-hdpi\list_white_down.9.png
-* app\src\main\res\drawable-hdpi\list_white_middle.9.png
-* app\src\main\res\drawable-hdpi\list_white_single.9.png
-* app\src\main\res\drawable-hdpi\list_white_up.9.png
-* app\src\main\res\drawable-hdpi\list_yellow_down.9.png
-* app\src\main\res\drawable-hdpi\list_yellow_middle.9.png
-* app\src\main\res\drawable-hdpi\list_yellow_single.9.png
-* app\src\main\res\drawable-hdpi\list_yellow_up.9.png
-* app\src\main\res\drawable-hdpi\menu_delete.png
-* app\src\main\res\drawable-hdpi\menu_move.png
-* app\src\main\res\drawable-hdpi\new_note_normal.png
-* app\src\main\res\drawable-hdpi\new_note_pressed.png
-* app\src\main\res\drawable-hdpi\note_edit_color_selector_panel.png
-* app\src\main\res\drawable-hdpi\notification.png
-* app\src\main\res\drawable-hdpi\search_result.png
-* app\src\main\res\drawable-hdpi\selected.png
-* app\src\main\res\drawable-hdpi\title_alert.png
-* app\src\main\res\drawable-hdpi\title_bar_bg.9.png
-* app\src\main\res\drawable-hdpi\widget_2x_blue.png
-* app\src\main\res\drawable-hdpi\widget_2x_green.png
-* app\src\main\res\drawable-hdpi\widget_2x_red.png
-* app\src\main\res\drawable-hdpi\widget_2x_white.png
-* app\src\main\res\drawable-hdpi\widget_2x_yellow.png
-* app\src\main\res\drawable-hdpi\widget_4x_blue.png
-* app\src\main\res\drawable-hdpi\widget_4x_green.png
-* app\src\main\res\drawable-hdpi\widget_4x_red.png
-* app\src\main\res\drawable-hdpi\widget_4x_white.png
-* app\src\main\res\drawable-hdpi\widget_4x_yellow.png
-* app\src\main\res\drawable\
-* app\src\main\res\drawable\new_note.xml
-* app\src\main\res\layout\
-* app\src\main\res\layout\account_dialog_title.xml
-* app\src\main\res\layout\add_account_text.xml
-* app\src\main\res\layout\datetime_picker.xml
-* app\src\main\res\layout\dialog_edit_text.xml
-* app\src\main\res\layout\folder_list_item.xml
-* app\src\main\res\layout\note_edit.xml
-* app\src\main\res\layout\note_edit_list_item.xml
-* app\src\main\res\layout\note_item.xml
-* app\src\main\res\layout\note_list.xml
-* app\src\main\res\layout\note_list_dropdown_menu.xml
-* app\src\main\res\layout\note_list_footer.xml
-* app\src\main\res\layout\settings_header.xml
-* app\src\main\res\layout\widget_2x.xml
-* app\src\main\res\layout\widget_4x.xml
-* app\src\main\res\menu\
-* app\src\main\res\menu\call_note_edit.xml
-* app\src\main\res\menu\call_record_folder.xml
-* app\src\main\res\menu\note_edit.xml
-* app\src\main\res\menu\note_list.xml
-* app\src\main\res\menu\note_list_dropdown.xml
-* app\src\main\res\menu\note_list_options.xml
-* app\src\main\res\menu\sub_folder.xml
-* app\src\main\res\raw-zh-rCN\
-* app\src\main\res\raw-zh-rCN\introduction
-* app\src\main\res\raw\
-* app\src\main\res\raw\introduction
-* app\src\main\res\values-zh-rCN\
-* app\src\main\res\values-zh-rCN\arrays.xml
-* app\src\main\res\values-zh-rCN\strings.xml
-* app\src\main\res\values-zh-rTW\
-* app\src\main\res\values-zh-rTW\arrays.xml
-* app\src\main\res\values-zh-rTW\strings.xml
-* app\src\main\res\values\
-* app\src\main\res\values\arrays.xml
-* app\src\main\res\values\colors.xml
-* app\src\main\res\values\dimens.xml
-* app\src\main\res\values\strings.xml
-* app\src\main\res\values\styles.xml
-* app\src\main\res\xml\
-* app\src\main\res\xml\preferences.xml
-* app\src\main\res\xml\searchable.xml
-* app\src\main\res\xml\widget_2x_info.xml
-* app\src\main\res\xml\widget_4x_info.xml
-* build.gradle
-* gradle\
-* gradle\wrapper\
-* gradle\wrapper\gradle-wrapper.jar
-* gradle\wrapper\gradle-wrapper.properties
-* gradlew
-* gradlew.bat
-* settings.gradle
 
 Moved Files:
 ------------
diff --git a/local.properties b/local.properties
index 92b469d..79c3d08 100644
--- a/local.properties
+++ b/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.
-#Mon Nov 06 20:55:25 CST 2023
+#Thu Jan 04 08:12:42 CST 2024
 sdk.dir=D\:\\software gongcheng\\sdk
diff --git a/test.puml b/test.puml
new file mode 100644
index 0000000..b7fb975
--- /dev/null
+++ b/test.puml
@@ -0,0 +1,106 @@
+@startuml
+class net.micode.notes.ui.DateTimePicker {
+- {static} boolean DEFAULT_ENABLE_STATE
+- {static} int HOURS_IN_HALF_DAY
+- {static} int HOURS_IN_ALL_DAY
+- {static} int DAYS_IN_ALL_WEEK
+- {static} int DATE_SPINNER_MIN_VAL
+- {static} int DATE_SPINNER_MAX_VAL
+- {static} int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW
+- {static} int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW
+- {static} int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW
+- {static} int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW
+- {static} int MINUT_SPINNER_MIN_VAL
+- {static} int MINUT_SPINNER_MAX_VAL
+- {static} int AMPM_SPINNER_MIN_VAL
+- {static} int AMPM_SPINNER_MAX_VAL
+- NumberPicker mDateSpinner
+- NumberPicker mHourSpinner
+- NumberPicker mMinuteSpinner
+- NumberPicker mAmPmSpinner
+- Calendar mDate
+- String[] mDateDisplayValues
+- boolean mIsAm
+- boolean mIs24HourView
+- boolean mIsEnabled
+- boolean mInitialising
+- OnDateTimeChangedListener mOnDateTimeChangedListener
+- NumberPicker.OnValueChangeListener mOnDateChangedListener
+- NumberPicker.OnValueChangeListener mOnHourChangedListener
+- NumberPicker.OnValueChangeListener mOnMinuteChangedListener
+- NumberPicker.OnValueChangeListener mOnAmPmChangedListener
++ void setEnabled(boolean)
++ boolean isEnabled()
++ long getCurrentDateInTimeMillis()
++ void setCurrentDate(long)
++ void setCurrentDate(int,int,int,int,int)
++ int getCurrentYear()
++ void setCurrentYear(int)
++ int getCurrentMonth()
++ void setCurrentMonth(int)
++ int getCurrentDay()
++ void setCurrentDay(int)
++ int getCurrentHourOfDay()
+- int getCurrentHour()
++ void setCurrentHour(int)
++ int getCurrentMinute()
++ void setCurrentMinute(int)
++ boolean is24HourView()
++ void set24HourView(boolean)
+- void updateDateControl()
+- void updateAmPmControl()
+- void updateHourControl()
++ void setOnDateTimeChangedListener(OnDateTimeChangedListener)
+- void onDateTimeChanged()
+}
+interface net.micode.notes.ui.DateTimePicker$OnDateTimeChangedListener {
+~ void onDateTimeChanged(DateTimePicker,int,int,int,int,int)
+}
+class net.micode.notes.ui.AlarmReceiver {
++ void onReceive(Context,Intent)
+}
+class net.micode.notes.ui.AlarmInitReceiver {
+- {static} String[] PROJECTION
+- {static} int COLUMN_ID
+- {static} int COLUMN_ALERTED_DATE
++ void onReceive(Context,Intent)
+}
+class net.micode.notes.ui.DateTimePickerDialog {
+- Calendar mDate
+- boolean mIs24HourView
+- OnDateTimeSetListener mOnDateTimeSetListener
+- DateTimePicker mDateTimePicker
++ void set24HourView(boolean)
++ void setOnDateTimeSetListener(OnDateTimeSetListener)
+- void updateTitle(long)
++ void onClick(DialogInterface,int)
+}
+interface net.micode.notes.ui.DateTimePickerDialog$OnDateTimeSetListener {
+~ void OnDateTimeSet(AlertDialog,long)
+}
+class net.micode.notes.ui.AlarmAlertActivity {
+- long mNoteId
+- String mSnippet
+- {static} int SNIPPET_PREW_MAX_LEN
+~ MediaPlayer mPlayer
+# void onCreate(Bundle)
+- boolean isScreenOn()
+- void playAlarmSound()
+- void showActionDialog()
++ void onClick(DialogInterface,int)
++ void onDismiss(DialogInterface)
+- void stopAlarmSound()
+}
+
+
+android.widget.FrameLayout <|-- net.micode.notes.ui.DateTimePicker
+net.micode.notes.ui.DateTimePicker +.. net.micode.notes.ui.DateTimePicker$OnDateTimeChangedListener
+android.content.BroadcastReceiver <|-- net.micode.notes.ui.AlarmReceiver
+android.content.BroadcastReceiver <|-- net.micode.notes.ui.AlarmInitReceiver
+android.content.DialogInterface.OnClickListener <|.. net.micode.notes.ui.DateTimePickerDialog
+android.app.AlertDialog <|-- net.micode.notes.ui.DateTimePickerDialog
+net.micode.notes.ui.DateTimePickerDialog +.. net.micode.notes.ui.DateTimePickerDialog$OnDateTimeSetListener
+android.content.DialogInterface.OnClickListener <|.. net.micode.notes.ui.AlarmAlertActivity
+android.content.DialogInterface.OnDismissListener <|.. net.micode.notes.ui.AlarmAlertActivity
+android.app.Activity <|-- net.micode.notes.ui.AlarmAlertActivity
+@enduml
\ No newline at end of file