terminal version

.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

.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>

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

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>

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">

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

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>

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">

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

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>
+<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>

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>
+<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>

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>
+<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>

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>
+<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>

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

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

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

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>