Merge branch 'develop' of https://bdgit.educoder.net/ml5sa8pux/gitProject1 into develop

# Conflicts: # src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin # src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin # src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock # src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master1/.gradle/file-system.probe # src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt # src/Notes-master1/caches/7.5/executionHistory/executionHistory.bin # src/Notes-master1/caches/7.5/executionHistory/executionHistory.lock # src/Notes-master1/caches/7.5/fileHashes/fileHashes.bin # src/Notes-master1/caches/7.5/fileHashes/fileHashes.lock # src/Notes-master1/caches/journal-1/file-access.bin # src/Notes-master1/caches/journal-1/journal-1.lock # src/Notes-master1/caches/modules-2/modules-2.lock # src/Notes-master1/daemon/7.5/registry.bin # src/Notes-master1/daemon/7.5/registry.bin.lock # src/Notes-master1/gradle.properties
2 years ago · 302d3bf269
parent 51a04a1427 e1bbdffad0
commit 302d3bf269
124 changed files with 1566 additions and 969 deletions
--- a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock
+++ b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock
--- a/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin
+++ b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin
--- a/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin
+++ b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin
--- a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master1/app/build.gradle
+++ b/src/Notes-master1/app/build.gradle
@ -26,7 +26,14 @@ android {
    packagingOptions{
        exclude 'META-INF/DEPENDENCIES'
    }
+    buildFeatures {
+        viewBinding true
+    }
+
+}

+dependencies {
+    implementation 'com.android.support:appcompat-v7:22.+'
 }


--- a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
--- a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
+++ b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex
+++ b/src/Notes-master1/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex
--- a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,4 +1,8 @@
+<<<<<<< HEAD
 #Tue Jun 06 23:08:08 ULAT 2023
+=======
+#Tue Jun 06 19:30:40 ULAT 2023
+>>>>>>> e1bbdffad0961a76bc66dfb88976603efcb7d667
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
@ -13,8 +17,8 @@ net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\gitProject1\\src\\Not
 net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
 net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
 net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
@ -64,6 +68,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\gitProj
 net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/background0.jpg=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_background0.jpg.flat
 net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
@ -72,6 +77,7 @@ net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\gitProject1\\
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/background1.jpg=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_background1.jpg.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
 net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\gitProject1\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>邮件</item>
-    </string-array>
-    <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_delete_folder">确认删除文件夹及所包含的便签吗？</string>
-    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
-    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
-    <string name="alert_title_delete">删除</string>
-    <string name="app_name">便签</string>
-    <string name="app_widget2x2">便签2x2</string>
-    <string name="app_widget4x4">便签4x4</string>
-    <string name="button_delete">删除</string>
-    <string name="call_record_folder_name">通话便签</string>
-    <string name="check_error">登录失败</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">设置</string>
-    <string name="delete_remind_time_message">成功删除提醒</string>
-    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
-    <string name="error_note_not_exist">要查看的便签不存在</string>
-    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失败，发生内部错误</string>
-    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
-    <string name="failed_sdcard_export">导出失败</string>
-    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="input_error">输入为空</string>
-    <string name="login_accept">登录</string>
-    <string name="login_account">账号</string>
-    <string name="login_password">密码</string>
-    <string name="login_register">注册</string>
-    <string name="login_title">请登录</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夹</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_deselect_all">取消全选</string>
-    <string name="menu_export_text">导出文本</string>
-    <string name="menu_folder_change_name">修改文件夹名称</string>
-    <string name="menu_folder_delete">刪除文件夹</string>
-    <string name="menu_folder_view">查看文件夹</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">进入清单模式</string>
-    <string name="menu_move">移动到文件夹</string>
-    <string name="menu_move_parent_folder">上一级文件夹</string>
-    <string name="menu_normal_mode">退出清单模式</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_setting">设置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">选择文件夹</string>
-    <string name="note_alert_expired">已过期</string>
-    <string name="note_link_email">发送邮件</string>
-    <string name="note_link_other">打开地图</string>
-    <string name="note_link_tel">呼叫电话</string>
-    <string name="note_link_web">浏览网页</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便签</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便签记录</string>
-    <string name="preferences_account_title">同步账号</string>
-    <string name="preferences_add_account">添加账号</string>
-    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</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_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便签</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更换账号</string>
-    <string name="preferences_menu_remove_account">删除账号</string>
-    <string name="preferences_title">设置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
-    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
-    <string name="register_ok">注册成功</string>
-    <string name="search">便签</string>
-    <string name="search_hint">搜索便签</string>
-    <string name="search_label">正在搜索便签</string>
-    <string name="search_setting_description">便签中的文字</string>
-    <string name="set_remind_time_message">创建提醒</string>
-    <string name="success_sdcard_export">导出成功</string>
-    <string name="success_sync_account">与%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
-    <string name="sync_progress_login">登录%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便签...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失败</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便签...</string>
-    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
-    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
-</resources>
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="menu_share_ways">
-        <item>短信</item>
-        <item>郵件</item>
-    </string-array>
-    <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_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
-    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
-    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
-    <string name="alert_title_delete">刪除</string>
-    <string name="app_name">便簽</string>
-    <string name="app_widget2x2">便簽2x2</string>
-    <string name="app_widget4x4">便簽4x4</string>
-    <string name="button_delete">刪除</string>
-    <string name="call_record_folder_name">通話便籤</string>
-    <string name="check_error">登录失败</string>
-    <string name="datetime_dialog_cancel">取消</string>
-    <string name="datetime_dialog_ok">設置</string>
-    <string name="delete_remind_time_message">成功刪除提醒</string>
-    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
-    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
-    <string name="error_note_not_exist">要查看的便籤不存在</string>
-    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
-    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
-    <string name="error_sync_cancelled">同步已取消</string>
-    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
-    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
-    <string name="failed_sdcard_export">導出失敗</string>
-    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
-    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
-    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
-    <string name="hint_foler_name">請輸入名稱</string>
-    <string name="info_note_enter_desktop">已添加到桌面</string>
-    <string name="input_error">输入为空</string>
-    <string name="login_accept">登录</string>
-    <string name="login_account">账号</string>
-    <string name="login_password">密码</string>
-    <string name="login_register">注册</string>
-    <string name="login_title">请登录</string>
-    <string name="menu_alert">提醒我</string>
-    <string name="menu_create_folder">新建文件夾</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_deselect_all">取消全選</string>
-    <string name="menu_export_text">導出文本</string>
-    <string name="menu_folder_change_name">修改文件夾名稱</string>
-    <string name="menu_folder_delete">刪除文件夾</string>
-    <string name="menu_folder_view">查看文件夾</string>
-    <string name="menu_font_large">大</string>
-    <string name="menu_font_normal">正常</string>
-    <string name="menu_font_size">文字大小</string>
-    <string name="menu_font_small">小</string>
-    <string name="menu_font_super">超大</string>
-    <string name="menu_list_mode">進入清單模式</string>
-    <string name="menu_move">移動到文件夾</string>
-    <string name="menu_move_parent_folder">上一級文件夾</string>
-    <string name="menu_normal_mode">退出清單模式</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_setting">設置</string>
-    <string name="menu_share">分享</string>
-    <string name="menu_sync">同步</string>
-    <string name="menu_sync_cancel">取消同步</string>
-    <string name="menu_title_select_folder">選擇文件夾</string>
-    <string name="note_alert_expired">已過期</string>
-    <string name="note_link_email">發送郵件</string>
-    <string name="note_link_other">打開地圖</string>
-    <string name="note_link_tel">呼叫電話</string>
-    <string name="note_link_web">浏覽網頁</string>
-    <string name="notealert_enter">查看</string>
-    <string name="notealert_ok">知道了</string>
-    <string name="notelist_menu_new">新建便簽</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">与google task同步便簽記錄</string>
-    <string name="preferences_account_title">同步賬號</string>
-    <string name="preferences_add_account">添加賬號</string>
-    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
-    <string name="preferences_button_sync_cancel">取消同步</string>
-    <string name="preferences_button_sync_immediately">立即同步</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_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
-    <string name="preferences_dialog_select_account_title">同步便簽</string>
-    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
-    <string name="preferences_menu_cancel">取消</string>
-    <string name="preferences_menu_change_account">更換賬號</string>
-    <string name="preferences_menu_remove_account">刪除賬號</string>
-    <string name="preferences_title">設置</string>
-    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
-    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
-    <string name="register_ok">注册成功</string>
-    <string name="search">便籤</string>
-    <string name="search_hint">搜索便籤</string>
-    <string name="search_label">正在搜索便籤</string>
-    <string name="search_setting_description">便籤中的文字</string>
-    <string name="set_remind_time_message">創建提醒</string>
-    <string name="success_sdcard_export">導出成功</string>
-    <string name="success_sync_account">與%1$s同步成功</string>
-    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
-    <string name="sync_progress_login">登陸%1$s...</string>
-    <string name="sync_progress_syncing">正在同步本地便籤...</string>
-    <string name="ticker_cancel">同步已取消</string>
-    <string name="ticker_fail">同步失敗</string>
-    <string name="ticker_success">同步成功</string>
-    <string name="ticker_syncing">同步便簽...</string>
-    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
-    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
-</resources>
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@ -60,6 +60,8 @@
    <string name="login_register">register</string>
    <string name="login_title">Please login in</string>
    <string name="menu_alert">Remind me</string>
+    <string name="menu_background0" translatable="false">background0</string>
+    <string name="menu_background1" translatable="false">background1</string>
    <string name="menu_create_folder">New Folder</string>
    <string name="menu_delete">Delete</string>
    <string name="menu_deselect_all">Deselect all</string>
--- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,8 @@
+<<<<<<< HEAD
 #Tue Jun 06 23:08:14 ULAT 2023
+=======
+#Tue Jun 06 19:30:48 ULAT 2023
+>>>>>>> e1bbdffad0961a76bc66dfb88976603efcb7d667
 path.4=13/classes.dex
 path.3=12/classes.dex
 path.2=11/classes.dex
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$4.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$4.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
--- a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
+++ b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -37,11 +37,11 @@
 37    3、versionName也为命名空间android的属性，是给用户看的当前版本号，可以为1.1；1.2；1.2.1 这样的形式
 38    -->
 39    <uses-sdk
-39-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:5-44
+39-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:45:5-44
 40        android:minSdkVersion="22"
-40-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:15-41
+40-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:45:15-41
 41        android:targetSdkVersion="22" />
-41-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:41:5-44
+41-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:45:5-44
 42    <!--
 43    配置SDK版本的，在此标签下，可以给android:minSdkVersion， android:maxSdkVersion，android:targetSdkVersion 这3种属性
 44    进行设置，属性值为API版本，与android的版本有对应关系，minSdkVersion的值指定了能使用该软件的最小API也间接指定了最小的安卓版本，
@ -50,48 +50,49 @@
 47    -->
 48
 49    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:5-81
-49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:49:22-78
+49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:53:5-81
+49-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:53:22-78
 50    <!--
 51    该便签为使用应用必须授予的权限，android:name为权限名名字，android.permission.WRITE_EXTERNAL_STORAGE为权限名属性值
 52    不同属性值表示要授予不同的权限，该便签表示必须授权应用将数据写入外部储存的权限
 53    -->
 54    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:5-88
-54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:54:22-85
+54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:5-88
+54-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:22-85
 55<!--     应用必须授予的权限是 能在桌面创建快捷方式 -->
 56    <uses-permission android:name="android.permission.INTERNET" />
-56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:5-67
-56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:58:22-64
+56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:5-67
+56-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:22-64
 57<!--     申请访问网络的权限 -->
 58    <uses-permission android:name="android.permission.READ_CONTACTS" />
-58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:5-72
-58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:62:22-69
+58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:5-72
+58-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:22-69
 59<!--     申请读取联系人信息的权限 -->
 60    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:5-74
-60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:66:22-71
+60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:5-74
+60-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:22-71
 61<!--     申请管理账户的权限 -->
 62    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:5-80
-62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:70:22-77
+62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:5-80
+62-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:22-77
 63<!--     申请验证账户的权限 -->
 64    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:5-71
-64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:74:22-68
+64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:5-71
+64-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:22-68
 65<!--     申请获得gmail账户的权限 -->
 66    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:5-74
-66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:78:22-71
+66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:5-74
+66-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:22-71
 67<!--     申请使用凭证的权限，与账户管理有关 -->
 68    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:5-81
-68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:82:22-78
+68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:86:5-81
+68-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:86:22-78
 69<!--     申请开机启动应用的权限 -->
 70    <application
-70-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:87:5-351:19
+70-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:91:5-358:19
 71        android:debuggable="true"
 72        android:icon="@drawable/icon_app"
+<<<<<<< HEAD
 72-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-42
 73        android:label="@string/app_name" >
 73-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:89:9-41
@ -430,3 +431,344 @@
 302    </application>
 303
 304</manifest>
+=======
+72-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:92:9-42
+73        android:label="@string/app_name"
+73-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:93:9-41
+74        android:testOnly="true" >
+75
+76        <!--
+77        1、manifest元素必须且只能包含一个application元素，application元素中声明了应用需要用到的组件及其属性
+78        2、android:icon 属性是应用的图标,属性值是对包含图片的可绘制资源的引用，即@res文件夹下的文件名/图片
+79        3、android:label 属性是应用的标签，属性值是对字符串资源的引用
+80        -->
+81
+82        <activity
+82-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:100:9-109:20
+83            android:name="net.micode.notes.ui.LoginActivity"
+83-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:101:13-45
+84            android:launchMode="standard" >
+84-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-42
+85            <intent-filter>
+85-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:104:13-108:29
+86                <action android:name="android.intent.action.MAIN" />
+86-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:105:17-68
+86-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:105:25-66
+87
+88                <category android:name="android.intent.category.LAUNCHER" />
+88-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:106:17-76
+88-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:106:27-74
+89            </intent-filter>
+90        </activity>
+91        <activity
+91-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:111:9-157:20
+92            android:name="net.micode.notes.ui.NotesListActivity"
+92-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-49
+93            android:configChanges="keyboardHidden|orientation|screenSize"
+93-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:113:13-74
+94            android:label="@string/app_name"
+94-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:114:13-45
+95            android:launchMode="singleTop"
+95-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:115:13-43
+96            android:theme="@style/NoteTheme"
+96-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:116:13-45
+97            android:uiOptions="splitActionBarWhenNarrow"
+97-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-57
+98            android:windowSoftInputMode="adjustPan" >
+98-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:118:13-52
+99
+100            <!--
+101            1、activity元素 声明了一个可视化界面（是Activity类的一个子类），应用所有的可视化界面都必须在清单里进行声明，未声明的不会进行服务
+102            2、android:name属性 是activity类的类名，属性值必须是完全限定类名，即带包名，用.隔开的路径名，当前类名以.开头，.等于manifest
+103            中的package的属性值，所以完整类名是net.micode.notes.ui.NotesListActivity，必须设置名字
+104            3、android:configChanges属性 是指定了该activity类自动处理的配置变更，若无该属性，当配置变更时，会重启该界面，有该属性不会重启，
+105            保证一直活跃，属性值为该界面会自动处理的配置变更。
+106            keyboardHidden 用户打开虚拟键盘；orientation 用户更改手机界面反向，旋转手机；screenSize 界面方向改变后，界面尺寸改变
+107            多个属性值之间用|分隔
+108            4、android:label属性 是指定当前界面的便签和该activity元素嵌套的intent-filter元素的默认便签，若未指定则为application元素里指定的便签
+109            5、android:launchMode属性 是该activity类的启动模式，一般用standard和singeTop模式，standard（默认模式下，系统始终会
+110            实例化一个新的activity进行intent传递，singleTop模式下，如果目标任务的栈顶有activity实例，不会再实例化，而是通过方法传递intent。
+111            6、android:theme属性 指定了activity的主题，是对样式资源的引用
+112            7、android:uiOptions属性 指定了界面的额外选项，属性值splitActionBarWhenNarrow是当竖屏是，分隔出一个操作栏
+113            8、android:windowSoftInputMode属性  指定了主窗口与包含软键盘窗口之间的交互方式
+114            -->
+115
+116            <intent-filter>
+116-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-156:29
+117
+118                <!--
+119                intent-filter元素 指定了父activity、receiver、provider组件能够响应的intent对象，不是指定的类型则过滤掉
+120                通过子元素action，category、data来进行过滤器的大部分内容设置
+121                组件之间通过intent传递消息
+122                -->
+123                <action android:name="android.intent.action.VIEW" />
+123-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:17-68
+123-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:25-66
+124                <!--
+125                action元素 指定了可接受的intent对象的操作，android:name属性为操作名，属性值为操作
+126                intent对象有一些标准的操作形式为ACTION_MAIN、ACTION_INSERT等等，在将标准操作分配给action元素时，属性值为
+127                android.intent.action.MAIN 这样的类型，若分配自定义操作，则属性值最好为 软件包名.操作名
+128                android.intent.action.MAIN  该属性值表名当前activity为主程序入口即最先启动的activity
+129                -->
+130                <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+131                <!--
+132                category元素 指定了可接受intent对象的类别， android:name为类别名属性，intent中也有一些标准category，在使用标准
+133                category时，也想action属性一样，应加前缀android.intent.category.类别名，若要用自定义类别也最好软件包名.类别名
+134                android.intent.category.LAUNCHER属性值  指定该activity是第一个启动的，即应用主界面，与android.intent.action.MAIN
+135                配对使用
+136                -->
+137            </intent-filter>
+138        </activity>
+139        <activity
+139-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:159:9-234:20
+140            android:name="net.micode.notes.ui.NoteEditActivity"
+140-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:160:13-48
+141            android:configChanges="keyboardHidden|orientation|screenSize"
+141-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:161:13-74
+142            android:launchMode="singleTop"
+142-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:162:13-43
+143            android:theme="@style/NoteTheme" >
+143-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:163:13-45
+144
+145            <!--
+146            1、指定类名为 net.micode.notes.ui.NoteEditActivity
+147            2、自动处理的配置变更   软硬盘|屏幕旋转|界面大小改变
+148            3、启动模式   singleTop  当目标任务的栈顶有该activity实例时，不新实例化而只向其传递intent
+149            4、界面主题   引用样式资源  NoteTheme
+150            -->
+151
+152            <intent-filter>
+152-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:172:13-193:29
+153                <action android:name="android.intent.action.VIEW" />
+153-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:17-68
+153-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:142:25-66
+154                <!--
+155                intent过滤器的action元素的 属性值为android.intent.action.VIEW，指定该activity 是显示用户数据的，根据不同数据
+156                显示不同界面
+157                -->
+158                <category android:name="android.intent.category.DEFAULT" />
+158-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:17-76
+158-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:27-73
+159<!--                 指定该activity能接受隐式intent -->
+160                <data android:mimeType="vnd.android.cursor.item/text_note" />
+160-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:17-78
+160-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:23-75
+161                <!--
+162                data属性 是指定该intent携带的数据形式，android:mimeType属性 是指定该数据的类型
+163                /前面的与URI的数据有关，如果URI的数据是图片，则为image，/后面的是具体的类型，如图片的格式可以是jpg
+164                vnd.android.cursor.item/text_note属性值 指定URI包含的数据是单条的，且具体的类型是text_note
+165                这个类型是自定义的，URI的数据类型是通过provider的getType（URL uri）获得的
+166                -->
+167                <data android:mimeType="vnd.android.cursor.item/call_note" />
+167-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:17-78
+167-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:23-75
+168<!--                 URI的数据是单条的，类型是call_note -->
+169            </intent-filter>
+170            <intent-filter>
+170-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:195:13-212:29
+171                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+171-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:196:17-79
+171-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:196:25-76
+172<!--                 指定了该activity能响应的操作是 添加编辑联系人 -->
+173                <category android:name="android.intent.category.DEFAULT" />
+173-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:17-76
+173-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:27-73
+174<!--                 指定该intent的类别，可以是隐式 -->
+175                <data android:mimeType="vnd.android.cursor.item/text_note" />
+175-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:17-78
+175-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:23-75
+176<!--                 指定了该intent携带的数据的类型，数据是单条的，类型为text_note -->
+177                <data android:mimeType="vnd.android.cursor.item/call_note" />
+177-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:17-78
+177-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:182:23-75
+178<!--                 指定携带的数据类型，数据是单条的，类型为call_note -->
+179            </intent-filter>
+180            <intent-filter>
+180-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:214:13-223:29
+181                <action android:name="android.intent.action.SEARCH" />
+181-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:215:17-71
+181-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:215:25-68
+182<!--                 指定activity能响应的intent的动作是搜索，即能开始搜索操作 -->
+183                <category android:name="android.intent.category.DEFAULT" />
+183-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:17-76
+183-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:178:27-73
+184<!--                 指定该intent为默认类别,可以是隐式intent -->
+185            </intent-filter>
+186
+187            <meta-data
+187-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:225:13-227:54
+188                android:name="android.app.searchable"
+188-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:226:17-54
+189                android:resource="@xml/searchable" />
+189-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:227:17-51
+190            <!--
+191            1、meta-data元素 向父组件提供任一数据项的名值对（数据名称 对应值）
+192            2、android:name="android.app.searchable" 指定该元素名称
+193            3、android:resource  对资源的引用，资源的ID为该名值对的值
+194            4、如为android:value   也是对资源的引用，资源包含的值为该名值对的值
+195            -->
+196        </activity>
+197
+198        <provider
+198-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:236:9-239:43
+199            android:name="net.micode.notes.data.NotesProvider"
+199-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:237:13-63
+200            android:authorities="micode_notes"
+200-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:238:13-47
+201            android:multiprocess="true" />
+201-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:239:13-40
+202        <!--
+203        1、provider元素 声明了一个content provider组件，即一个ContentProvider的子类，是用来向外界提供可访问内容的
+204        2、该组件的名字为net.micode.notes.data.NotesProvider
+205        3、android:authorities属性  是指定提供该内容的授权方，用来标识提供的数据的，至少一个，多个则分号分隔
+206        4、android:multiprocess属性   指定了若应用在多个进程间运行时，是否每个进程都有一个content provider实例，true则是
+207        -->
+208
+209        <receiver
+209-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:247:9-277:20
+210            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+210-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:248:13-57
+211            android:label="@string/app_widget2x2" >
+211-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:249:13-50
+212
+213            <!--
+214            1、receiver元素  声明了一个广播接受器，即BroadcastReceiver的子类，能接受来着系统，其他应用，自己应用的intent对象，
+215            即使其他组件未运行
+216            2、该组件名称为 net.micode.notes.widget.NoteWidgetProvider_2x
+217            3、标签 对字符串资源的引用 @string/app_widget2x2
+218            -->
+219            <intent-filter>
+219-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:13-269:29
+220                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+220-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:257:17-84
+220-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:257:25-81
+221<!--                 指定该receiver能响应的intent的动作为   应用挂件更新 -->
+222                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+222-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:261:17-85
+222-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:261:25-82
+223<!--                 指定响应intent的动作为   应用挂件删除 -->
+224                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+224-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:265:17-85
+224-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:265:25-82
+225<!--                 指定响应的intent的动作为    私人模式变更 -->
+226            </intent-filter>
+227
+228            <meta-data
+228-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:271:13-273:58
+229                android:name="android.appwidget.provider"
+229-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:272:17-58
+230                android:resource="@xml/widget_2x_info" />
+230-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:273:17-55
+231<!--             向该父组件 receiver  提供一个数据项的名值对，名为 android.appwidget.provider，值为 资源@xml/widget_2x_info的id -->
+232        </receiver>
+233        <receiver
+233-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:278:9-300:20
+234            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+234-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:279:13-57
+235            android:label="@string/app_widget4x4" >
+235-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:280:13-50
+236
+237            <!--
+238            声明了一个完全限定类名为net.micode.notes.widget.NoteWidgetProvider_4x的广播接收器子类，标签为对@string/app_widget4x4
+239            的引用
+240            -->
+241            <intent-filter>
+241-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:256:13-269:29
+242                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+242-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:257:17-84
+242-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:257:25-81
+243                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+243-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:261:17-85
+243-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:261:25-82
+244                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+244-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:265:17-85
+244-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:265:25-82
+245<!--                 指定的响应动作  应用挂件更新，应用挂件删除，私人模式变更 -->
+246            </intent-filter>
+247
+248            <meta-data
+248-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:271:13-273:58
+249                android:name="android.appwidget.provider"
+249-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:272:17-58
+250                android:resource="@xml/widget_4x_info" />
+250-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:273:17-55
+251<!--             向该父组件提供一个数据项的名值对 -->
+252        </receiver>
+253        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+253-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:302:9-309:20
+253-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:302:19-55
+254            <intent-filter>
+254-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:303:13-305:29
+255                <action android:name="android.intent.action.BOOT_COMPLETED" />
+255-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:304:17-79
+255-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:304:25-76
+256            </intent-filter>
+257<!--             声明一个广播接收器组件，响应的intent的动作为  开机自启 -->
+258        </receiver>
+259        <receiver
+259-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:311:9-317:20
+260            android:name="net.micode.notes.ui.AlarmReceiver"
+260-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:312:13-61
+261            android:process=":remote" >
+261-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:313:13-38
+262
+263<!--             声明一个广播接收器组件，android:process=":remote"属性 指定该组件的进程名为:remote -->
+264        </receiver>
+265
+266        <activity
+266-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:319:9-328:20
+267            android:name="net.micode.notes.ui.AlarmAlertActivity"
+267-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:320:13-50
+268            android:label="@string/app_name"
+268-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:321:13-45
+269            android:launchMode="singleInstance"
+269-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:322:13-48
+270            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+270-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:323:13-75
+271
+272            <!--
+273            声明了一个界面，android:launchMode属性 指定了该activity的启动模式为singleInstance，即为该activity创建一个单独的任务栈
+274            且只能有一个该activity，其他activity不能进入，界面主题  @android:style/Theme.Holo.Wallpaper.NoTitleBar的引用
+275            -->
+276        </activity>
+277        <activity
+277-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:332:9-340:20
+278            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+278-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:333:13-71
+279            android:label="@string/preferences_title"
+279-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:334:13-54
+280            android:launchMode="singleTop"
+280-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:335:13-43
+281            android:theme="@android:style/Theme.Holo.Light" >
+281-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:336:13-60
+282
+283<!--             声明了一个界面，启动模式singleTop，主题@android:style/Theme.Holo.Light的引用 -->
+284        </activity>
+285
+286        <service
+286-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:342:9-349:19
+287            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+287-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:343:13-74
+288            android:exported="false" >
+288-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:344:13-37
+289
+290            <!--
+291            1、声明了一个服务组件，Service的子类，完全限定类名为net.micode.notes.gtask.remote.GTaskSyncService
+292            2、android:exported属性  指定了该组件是否能被其他应用所访问，交互
+293            -->
+294        </service>
+295
+296        <meta-data
+296-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:351:9-353:52
+297            android:name="android.app.default_searchable"
+297-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:352:13-58
+298            android:value=".ui.NoteEditActivity" />
+298-->E:\gitProject1\src\Notes-master1\app\src\main\AndroidManifest.xml:353:13-49
+299        <!--
+300        向父组件 application提供了一个数据项的名值对，名为android.app.default_searchable，值为net.micode.notes.ui.NoteEditActivity
+301        类包含的值
+302        -->
+303    </application>
+304
+305</manifest>
+>>>>>>> e1bbdffad0961a76bc66dfb88976603efcb7d667
--- a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
+++ b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
--- a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
+++ b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
--- a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
+++ b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -1,10 +1,115 @@
 {
    "logs": [
        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat",
            "map": [
                {
-                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "135,139,143,146,149,153,157,161,165,169,173",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8718,8922,9133,9297,9457,9640,9825,10010,10213,10419,10602",
+                        "endLines": "138,142,145,148,152,156,160,164,168,172,176",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8917,9128,9292,9452,9635,9820,10005,10208,10414,10597,10798"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8765,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8243,8333,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "145,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,88,88,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "9173,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8327,8417,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "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",
+                        "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",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3838,3927,3985,4032,4091,4148,4219,4280,4337,4387,4439,4492,4542,4592,4652,4705,4771,4833,4896,4943,4998,5086,5144,5206,5256,5301,5344,5404,5471,5526,5581,5634,5681,5734,5790,5838,5893,5946,6030,6097,6161,6257,6331,6412,6501,6664,6808,6887,6962,7044,7103,7183,7263,7318,7440,7543,7595,7636,7689,7746,7820,7885,7953,8039,8119,8188,8282,8341,8396,8458,8518,8628",
+                        "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,88,88,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,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,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3833,3922,3980,4027,4086,4143,4214,4275,4332,4382,4434,4487,4537,4587,4647,4700,4766,4828,4891,4938,4993,5081,5139,5201,5251,5296,5339,5399,5466,5521,5576,5629,5676,5729,5785,5833,5888,5941,6025,6092,6156,6252,6326,6407,6496,6659,6803,6882,6957,7039,7098,7178,7258,7313,7435,7538,7590,7631,7684,7741,7815,7880,7948,8034,8114,8183,8277,8336,8391,8453,8513,8623,8713"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "map": [
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "from": {
+                        "startLines": "131,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6999,4017,3950,3876,3825,1216,1257,1306,6539,6585,1029,6944,6893,1595,4281,4350,4221,4154,4090,5024,4963,4899,4484,3388,1768,1822,4539,2175,6643,3765,1168,984,891,937,1075,846,3548,2287,2574,2825,2341,3327,3273,3221,3022,2973,2877,2926,3069,3117,2618,3705,3168,3592,2530,2777,2720,2664,3492,2485,3449,2392,2434,3645,1716,2027,2125,1979,2077,1931,1885,1543,1489,5406,5346,5549,6462,5865,5795,5930,6009,6194,6120,5482,5739,5607,5673,5296,6299,6383,1122,6854,6745,6696,6791,1658,4428,4839,5139,5080,5207,4790,4744,4695,4643,1355,1422",
+                        "endLines": "133,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "7173,4084,4011,3944,3870,1251,1300,1349,6579,6637,1069,6993,6938,1652,4344,4422,4275,4215,4148,5074,5018,4957,4533,3443,1816,1879,4618,2250,6688,3819,1208,1023,931,978,1116,885,3586,2335,2612,2871,2386,3382,3321,3267,3063,3016,2920,2967,3111,3162,2658,3759,3215,3639,2568,2819,2771,2714,3542,2524,3486,2428,2479,3699,1762,2071,2169,2021,2119,1973,1925,1589,1537,5476,5400,5601,6531,5924,5859,6003,6114,6293,6188,5543,5789,5667,5733,5340,6377,6456,1162,6887,6785,6739,6848,1710,4478,4893,5201,5133,5264,4833,4784,4738,4689,1416,1483"
+                    },
+                    "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,107,108,109,110,111,112,113,114",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,928,982,1032,1094,1162,1239,1298,1364,1427,1482,1542,1605,1659,1719,1772,1834,1918,1998,2048,2107,2152,2196,2241,2287,2333,2377,2420,2473,2516,2567,2617,2677,2730,2781,2827,2875,2923,2969,3016,3066,3111,3170,3222,3274,3317,3364,3420,3475,3530,3574,3616,3657,3707,3766,3817,3866,3915,3962,4009,4056,4101,4152,4205,4280,4339,4396,4470,4534,4603,4681,4791,4895,4968,5034,5089,5154,5219,5268,5351,5429,5474,5512,5557,5605,5667,5724,5779,5838,5905,5963,6025,6073,6118,6166,6217,6283",
+                        "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",
+                        "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,923,977,1027,1089,1157,1234,1293,1359,1422,1477,1537,1600,1654,1714,1767,1829,1913,1993,2043,2102,2147,2191,2236,2282,2328,2372,2415,2468,2511,2562,2612,2672,2725,2776,2822,2870,2918,2964,3011,3061,3106,3165,3217,3269,3312,3359,3415,3470,3525,3569,3611,3652,3702,3761,3812,3861,3910,3957,4004,4051,4096,4147,4200,4275,4334,4391,4465,4529,4598,4676,4786,4890,4963,5029,5084,5149,5214,5263,5346,5424,5469,5507,5552,5600,5662,5719,5774,5833,5900,5958,6020,6068,6113,6161,6212,6278,6344"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
@ -21,25 +126,6 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
-                },
-                {
-                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "130,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "7023,3936,3869,3795,3744,1216,1257,1306,6565,6611,1029,6968,6917,1595,4308,4377,4248,4182,4118,5052,4991,4927,4511,3307,1768,1822,4566,4010,6669,3684,1168,984,891,937,1075,846,3467,2206,2493,2744,2260,3246,3192,3140,2941,2892,2796,2845,2988,3036,2537,3624,3087,3511,2449,2696,2639,2583,3411,2404,3368,2311,2353,3564,1716,2027,2125,1979,2077,1931,1885,1543,1489,5434,5374,5577,6490,5893,5823,5958,6037,6222,6148,5510,5767,5635,5701,5324,6327,6411,1122,6878,6769,6720,6815,1658,4455,4867,5167,5108,5235,4818,4772,4723,4671,1355,1422",
-                        "endLines": "132,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "7197,4004,3930,3863,3789,1251,1300,1349,6605,6663,1069,7017,6962,1652,4371,4449,4302,4242,4176,5102,5046,4985,4560,3362,1816,1879,4646,4086,6714,3738,1208,1023,931,978,1116,885,3505,2254,2531,2790,2305,3301,3240,3186,2982,2935,2839,2886,3030,3081,2577,3678,3134,3558,2487,2738,2690,2633,3461,2443,3405,2347,2398,3618,1762,2071,2169,2021,2119,1973,1925,1589,1537,5504,5428,5629,6559,5952,5887,6031,6142,6321,6216,5571,5817,5695,5761,5368,6405,6484,1162,6911,6809,6763,6872,1710,4505,4921,5229,5161,5292,4861,4812,4766,4717,1416,1483"
-                    },
-                    "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,107,108,109,110,111,112,113,114",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,929,983,1033,1095,1163,1240,1299,1364,1427,1482,1542,1605,1659,1719,1772,1834,1919,2000,2050,2109,2154,2198,2243,2289,2335,2379,2422,2475,2518,2569,2619,2679,2732,2783,2829,2877,2925,2971,3018,3068,3113,3172,3224,3276,3319,3366,3422,3477,3532,3576,3618,3659,3709,3768,3819,3868,3917,3964,4011,4058,4103,4154,4207,4282,4341,4398,4472,4536,4605,4683,4793,4897,4970,5036,5091,5156,5221,5270,5353,5431,5476,5514,5559,5607,5669,5726,5781,5840,5907,5965,6027,6075,6120,6168,6219,6285",
-                        "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",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,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,44,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,924,978,1028,1090,1158,1235,1294,1359,1422,1477,1537,1600,1654,1714,1767,1829,1914,1995,2045,2104,2149,2193,2238,2284,2330,2374,2417,2470,2513,2564,2614,2674,2727,2778,2824,2872,2920,2966,3013,3063,3108,3167,3219,3271,3314,3361,3417,3472,3527,3571,3613,3654,3704,3763,3814,3863,3912,3959,4006,4053,4098,4149,4202,4277,4336,4393,4467,4531,4600,4678,4788,4892,4965,5031,5086,5151,5216,5265,5348,5426,5471,5509,5554,5602,5664,5721,5776,5835,5902,5960,6022,6070,6115,6163,6214,6280,6346"
-                    }
                }
            ]
        },
@ -49,12 +135,9 @@
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
                    "from": {
-                        "startLines": "19,26",
-                        "startColumns": "4,4",
-                        "startOffsets": "758,1073",
-                        "endLines": "24,29",
-                        "endColumns": "19,19",
-                        "endOffsets": "1065,1191"
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
                    },
                    "to": {
                        "startLines": "2,8",
@ -68,11 +151,9 @@
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "730",
-                        "endColumns": "56",
-                        "endOffsets": "782"
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
                    },
                    "to": {
                        "startLines": "12",
@ -85,49 +166,44 @@
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
                    "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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
-                        "endLines": "53,58,66,62,25,29,33,38,43,21,48",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2314,2531,2865,2696,1098,1287,1476,1685,1897,911,2104"
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "133,137,141,144,147,151,155,159,163,167,171",
+                        "startLines": "135,139,143,146,149,153,157,161,165,169,173",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8540,8744,8955,9119,9279,9462,9647,9832,10035,10241,10424",
-                        "endLines": "136,140,143,146,150,154,158,162,166,170,174",
+                        "startOffsets": "8696,8900,9111,9275,9435,9618,9803,9988,10191,10397,10580",
+                        "endLines": "138,142,145,148,152,156,160,164,168,172,176",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8739,8950,9114,9274,9457,9642,9827,10030,10236,10419,10620"
+                        "endOffsets": "8895,9106,9270,9430,9613,9798,9983,10186,10392,10575,10776"
                    }
                },
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
-                        "startLines": "138,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33",
-                        "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",
-                        "startOffsets": "8583,4417,4681,4584,4514,1293,1337,1390,8071,8121,1077,8524,8472,1755,5141,5236,5069,4984,4900,6115,6031,5928,5414,2490,2438,3908,1962,2016,5476,2585,4765,8185,4345,1238,1029,924,976,1132,867,4096,2645,2966,3272,2704,3836,3774,3716,3490,3437,3332,3386,3541,3592,3014,4278,3653,4146,2918,3216,3127,3068,4033,2867,3987,2762,2806,4210,1906,2231,2341,2183,2287,2126,2077,1699,1645,6578,6510,6822,7972,7191,7109,7266,7356,7600,7520,6663,6739,7049,6887,6968,6454,7745,7868,1185,8430,8301,8243,8355,1840,5345,5841,6252,6182,6333,5781,5725,5662,5601,1443,1554",
-                        "endLines": "142,82,85,84,83,29,30,31,128,129,24,137,136,36,91,92,90,89,88,104,103,102,94,49,48,74,39,40,95,51,86,130,81,27,23,21,22,25,20,77,52,58,63,53,73,72,71,67,66,64,65,68,69,59,80,70,78,57,62,61,60,76,56,75,54,55,79,38,44,46,43,45,42,41,35,34,111,110,114,126,119,118,120,121,123,122,112,113,117,115,116,109,124,125,26,135,133,132,134,37,93,101,106,105,107,100,99,98,97,32,33",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8991,4508,4759,4675,4578,1331,1384,1437,8115,8179,1126,8577,8518,1834,5230,5339,5135,5063,4978,6176,6109,6025,5470,2547,2484,3981,2010,2071,5576,2639,4862,8235,4411,1285,1071,970,1023,1179,918,4140,2698,3008,3326,2756,3902,3830,3768,3535,3484,3380,3431,3586,3647,3062,4339,3710,4204,2960,3266,3210,3121,4090,2912,4027,2800,2861,4272,1956,2281,2389,2225,2335,2177,2120,1749,1693,6657,6572,6881,8063,7260,7185,7350,7514,7739,7594,6733,6816,7103,6962,7043,6504,7862,7966,1232,8466,8349,8295,8424,1900,5408,5922,6327,6246,6422,5835,5775,5719,5656,1548,1639"
+                        "startLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8743,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8243,8322,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "145,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,77,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8316,8395,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
                    },
                    "to": {
-                        "startLines": "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",
-                        "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",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3807,3854,3913,3970,4041,4102,4159,4209,4261,4314,4364,4414,4474,4527,4593,4655,4718,4765,4820,4908,4966,5028,5078,5123,5166,5226,5293,5348,5403,5456,5503,5556,5612,5660,5715,5768,5852,5919,5983,6079,6153,6234,6323,6486,6630,6709,6784,6866,6925,7005,7085,7140,7262,7365,7417,7458,7511,7568,7642,7707,7775,7861,7941,8010,8104,8163,8218,8280,8340,8450",
-                        "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",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,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,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3802,3849,3908,3965,4036,4097,4154,4204,4256,4309,4359,4409,4469,4522,4588,4650,4713,4760,4815,4903,4961,5023,5073,5118,5161,5221,5288,5343,5398,5451,5498,5551,5607,5655,5710,5763,5847,5914,5978,6074,6148,6229,6318,6481,6625,6704,6779,6861,6920,7000,7080,7135,7257,7360,7412,7453,7506,7563,7637,7702,7770,7856,7936,8005,8099,8158,8213,8275,8335,8445,8535"
+                        "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",
+                        "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",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3827,3905,3963,4010,4069,4126,4197,4258,4315,4365,4417,4470,4520,4570,4630,4683,4749,4811,4874,4921,4976,5064,5122,5184,5234,5279,5322,5382,5449,5504,5559,5612,5659,5712,5768,5816,5871,5924,6008,6075,6139,6235,6309,6390,6479,6642,6786,6865,6940,7022,7081,7161,7241,7296,7418,7521,7573,7614,7667,7724,7798,7863,7931,8017,8097,8166,8260,8319,8374,8436,8496,8606",
+                        "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,77,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,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,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3822,3900,3958,4005,4064,4121,4192,4253,4310,4360,4412,4465,4515,4565,4625,4678,4744,4806,4869,4916,4971,5059,5117,5179,5229,5274,5317,5377,5444,5499,5554,5607,5654,5707,5763,5811,5866,5919,6003,6070,6134,6230,6304,6385,6474,6637,6781,6860,6935,7017,7076,7156,7236,7291,7413,7516,7568,7609,7662,7719,7793,7858,7926,8012,8092,8161,8255,8314,8369,8431,8491,8601,8691"
                    }
                },
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "783,836,890,944,730",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "830,884,938,991,777"
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
                    },
                    "to": {
                        "startLines": "13,14,15,16,17",
@ -140,29 +216,10 @@
            ]
        },
        {
-            "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat",
            "map": [
                {
-                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
-                    "from": {
-                        "startLines": "131,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6999,4017,3950,3876,3825,1216,1257,1306,6539,6585,1029,6944,6893,1595,4281,4350,4221,4154,4090,5024,4963,4899,4484,3388,1768,1822,4539,2175,6643,3765,1168,984,891,937,1075,846,3548,2287,2574,2825,2341,3327,3273,3221,3022,2973,2877,2926,3069,3117,2618,3705,3168,3592,2530,2777,2720,2664,3492,2485,3449,2392,2434,3645,1716,2027,2125,1979,2077,1931,1885,1543,1489,5406,5346,5549,6462,5865,5795,5930,6009,6194,6120,5482,5739,5607,5673,5296,6299,6383,1122,6854,6745,6696,6791,1658,4428,4839,5139,5080,5207,4790,4744,4695,4643,1355,1422",
-                        "endLines": "133,81,80,79,78,28,29,30,121,122,23,130,129,35,85,86,84,83,82,98,97,96,88,70,38,39,89,46,123,77,26,22,20,21,24,19,73,48,54,59,49,69,68,67,63,62,60,61,64,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,37,43,45,42,44,41,40,34,33,105,104,107,119,112,111,113,114,116,115,106,110,108,109,103,117,118,25,128,126,125,127,36,87,95,100,99,101,94,93,92,91,31,32",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "7173,4084,4011,3944,3870,1251,1300,1349,6579,6637,1069,6993,6938,1652,4344,4422,4275,4215,4148,5074,5018,4957,4533,3443,1816,1879,4618,2250,6688,3819,1208,1023,931,978,1116,885,3586,2335,2612,2871,2386,3382,3321,3267,3063,3016,2920,2967,3111,3162,2658,3759,3215,3639,2568,2819,2771,2714,3542,2524,3486,2428,2479,3699,1762,2071,2169,2021,2119,1973,1925,1589,1537,5476,5400,5601,6531,5924,5859,6003,6114,6293,6188,5543,5789,5667,5733,5340,6377,6456,1162,6887,6785,6739,6848,1710,4478,4893,5201,5133,5264,4833,4784,4738,4689,1416,1483"
-                    },
-                    "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,107,108,109,110,111,112,113,114",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,928,982,1032,1094,1162,1239,1298,1364,1427,1482,1542,1605,1659,1719,1772,1834,1918,1998,2048,2107,2152,2196,2241,2287,2333,2377,2420,2473,2516,2567,2617,2677,2730,2781,2827,2875,2923,2969,3016,3066,3111,3170,3222,3274,3317,3364,3420,3475,3530,3574,3616,3657,3707,3766,3817,3866,3915,3962,4009,4056,4101,4152,4205,4280,4339,4396,4470,4534,4603,4681,4791,4895,4968,5034,5089,5154,5219,5268,5351,5429,5474,5512,5557,5605,5667,5724,5779,5838,5905,5963,6025,6073,6118,6166,6217,6283",
-                        "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",
-                        "endColumns": "14,71,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,451,517,590,640,680,728,776,821,878,923,977,1027,1089,1157,1234,1293,1359,1422,1477,1537,1600,1654,1714,1767,1829,1913,1993,2043,2102,2147,2191,2236,2282,2328,2372,2415,2468,2511,2562,2612,2672,2725,2776,2822,2870,2918,2964,3011,3061,3106,3165,3217,3269,3312,3359,3415,3470,3525,3569,3611,3652,3702,3761,3812,3861,3910,3957,4004,4051,4096,4147,4200,4275,4334,4391,4465,4529,4598,4676,4786,4890,4963,5029,5084,5149,5214,5263,5346,5424,5469,5507,5552,5600,5662,5719,5774,5833,5900,5958,6020,6068,6113,6161,6212,6278,6344"
-                    }
-                },
-                {
-                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
@ -179,6 +236,25 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "130,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "7023,3936,3869,3795,3744,1216,1257,1306,6565,6611,1029,6968,6917,1595,4308,4377,4248,4182,4118,5052,4991,4927,4511,3307,1768,1822,4566,4010,6669,3684,1168,984,891,937,1075,846,3467,2206,2493,2744,2260,3246,3192,3140,2941,2892,2796,2845,2988,3036,2537,3624,3087,3511,2449,2696,2639,2583,3411,2404,3368,2311,2353,3564,1716,2027,2125,1979,2077,1931,1885,1543,1489,5434,5374,5577,6490,5893,5823,5958,6037,6222,6148,5510,5767,5635,5701,5324,6327,6411,1122,6878,6769,6720,6815,1658,4455,4867,5167,5108,5235,4818,4772,4723,4671,1355,1422",
+                        "endLines": "132,80,79,78,77,28,29,30,121,122,23,129,128,35,86,87,85,84,83,99,98,97,89,69,38,39,90,81,123,76,26,22,20,21,24,19,72,47,53,58,48,68,67,66,62,61,59,60,63,64,54,75,65,73,52,57,56,55,71,51,70,49,50,74,37,43,45,42,44,41,40,34,33,106,105,108,120,113,112,114,115,117,116,107,111,109,110,104,118,119,25,127,125,124,126,36,88,96,101,100,102,95,94,93,92,31,32",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,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,44,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "7197,4004,3930,3863,3789,1251,1300,1349,6605,6663,1069,7017,6962,1652,4371,4449,4302,4242,4176,5102,5046,4985,4560,3362,1816,1879,4646,4086,6714,3738,1208,1023,931,978,1116,885,3505,2254,2531,2790,2305,3301,3240,3186,2982,2935,2839,2886,3030,3081,2577,3678,3134,3558,2487,2738,2690,2633,3461,2443,3405,2347,2398,3618,1762,2071,2169,2021,2119,1973,1925,1589,1537,5504,5428,5629,6559,5952,5887,6031,6142,6321,6216,5571,5817,5695,5761,5368,6405,6484,1162,6911,6809,6763,6872,1710,4505,4921,5229,5161,5292,4861,4812,4766,4717,1416,1483"
+                    },
+                    "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,107,108,109,110,111,112,113,114",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,929,983,1033,1095,1163,1240,1299,1364,1427,1482,1542,1605,1659,1719,1772,1834,1919,2000,2050,2109,2154,2198,2243,2289,2335,2379,2422,2475,2518,2569,2619,2679,2732,2783,2829,2877,2925,2971,3018,3068,3113,3172,3224,3276,3319,3366,3422,3477,3532,3576,3618,3659,3709,3768,3819,3868,3917,3964,4011,4058,4103,4154,4207,4282,4341,4398,4472,4536,4605,4683,4793,4897,4970,5036,5091,5156,5221,5270,5353,5431,5476,5514,5559,5607,5669,5726,5781,5840,5907,5965,6027,6075,6120,6168,6219,6285",
+                        "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",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,44,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,44,43,44,45,45,43,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,44,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,924,978,1028,1090,1158,1235,1294,1359,1422,1477,1537,1600,1654,1714,1767,1829,1914,1995,2045,2104,2149,2193,2238,2284,2330,2374,2417,2470,2513,2564,2614,2674,2727,2778,2824,2872,2920,2966,3013,3063,3108,3167,3219,3271,3314,3361,3417,3472,3527,3571,3613,3654,3704,3763,3814,3863,3912,3959,4006,4053,4098,4149,4202,4277,4336,4393,4467,4531,4600,4678,4788,4892,4965,5031,5086,5151,5216,5265,5348,5426,5471,5509,5554,5602,5664,5721,5776,5835,5902,5960,6022,6070,6115,6163,6214,6280,6346"
+                    }
                }
            ]
        }
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -2,6 +2,92 @@
    "logs": [
        {
            "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
+            "map": [
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+                    "from": {
+                        "startLines": "-1,-1",
+                        "startColumns": "-1,-1",
+                        "startOffsets": "-1,-1"
+                    },
+                    "to": {
+                        "startLines": "2,8",
+                        "startColumns": "4,4",
+                        "startOffsets": "105,300",
+                        "endLines": "7,11",
+                        "endColumns": "19,19",
+                        "endOffsets": "295,415"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+                    "from": {
+                        "startLines": "-1",
+                        "startColumns": "-1",
+                        "startOffsets": "-1"
+                    },
+                    "to": {
+                        "startLines": "12",
+                        "startColumns": "4",
+                        "startOffsets": "420",
+                        "endColumns": "56",
+                        "endOffsets": "472"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "135,139,143,146,149,153,157,161,165,169,173",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "8696,8900,9111,9275,9435,9618,9803,9988,10191,10397,10580",
+                        "endLines": "138,142,145,148,152,156,160,164,168,172,176",
+                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+                        "endOffsets": "8895,9106,9270,9430,9613,9798,9983,10186,10392,10575,10776"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+                    "from": {
+                        "startLines": "141,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "startOffsets": "8743,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8243,8322,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endLines": "145,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,132,133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,77,77,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
+                        "endOffsets": "9151,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,8316,8395,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "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",
+                        "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",
+                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1749,1807,1858,1942,2036,2144,2215,2299,2382,2448,2531,2633,2694,2756,2807,2885,2938,2998,3103,3162,3264,3319,3390,3442,3489,3540,3592,3644,3700,3749,3827,3905,3963,4010,4069,4126,4197,4258,4315,4365,4417,4470,4520,4570,4630,4683,4749,4811,4874,4921,4976,5064,5122,5184,5234,5279,5322,5382,5449,5504,5559,5612,5659,5712,5768,5816,5871,5924,6008,6075,6139,6235,6309,6390,6479,6642,6786,6865,6940,7022,7081,7161,7241,7296,7418,7521,7573,7614,7667,7724,7798,7863,7931,8017,8097,8166,8260,8319,8374,8436,8496,8606",
+                        "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",
+                        "endColumns": "14,95,82,95,68,42,51,51,48,62,53,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,51,46,50,51,51,55,48,77,77,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,51,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,1744,1802,1853,1937,2031,2139,2210,2294,2377,2443,2526,2628,2689,2751,2802,2880,2933,2993,3098,3157,3259,3314,3385,3437,3484,3535,3587,3639,3695,3744,3822,3900,3958,4005,4064,4121,4192,4253,4310,4360,4412,4465,4515,4565,4625,4678,4744,4806,4869,4916,4971,5059,5117,5179,5229,5274,5317,5377,5444,5499,5554,5607,5654,5707,5763,5811,5866,5919,6003,6070,6134,6230,6304,6385,6474,6637,6781,6860,6935,7017,7076,7156,7236,7291,7413,7516,7568,7609,7662,7719,7793,7858,7926,8012,8092,8161,8255,8314,8369,8431,8491,8601,8691"
+                    }
+                },
+                {
+                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+                    "from": {
+                        "startLines": "-1,-1,-1,-1,-1",
+                        "startColumns": "-1,-1,-1,-1,-1",
+                        "startOffsets": "-1,-1,-1,-1,-1"
+                    },
+                    "to": {
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
+                    }
+                }
+            ]
+        },
+        {
+            "outputFile": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml",
            "map": [
                {
                    "source": "E:\\gitProject1\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@ -1,390 +1,406 @@
 [
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_login.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\login.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat",
-        "source": "net.micode.notes.app-main-7:/raw/introduction"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat",
-        "source": "net.micode.notes.app-main-7:/drawable/new_note.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/preferences.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_imageeee.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/imageeee.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png"
+    },
+    {
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png"
+    },
+    {
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png"
+        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat",
+        "source": "net.micode.notes.app-main-7:/layout/note_list.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png"
    },
    {
        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat",
        "source": "net.micode.notes.app-main-7:/menu/note_list.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png"
+    },
+    {
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png"
+    },
+    {
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_login.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/login.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_imageeee.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\imageeee.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_edit.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png"
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_background0.jpg.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/background0.jpg"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_item.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/settings_header.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat",
-        "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat",
-        "source": "net.micode.notes.app-main-7:/xml/searchable.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat",
-        "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png"
+        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_background1.jpg.flat",
+        "source": "net.micode.notes.app-main-7:/drawable-hdpi/background1.jpg"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat",
-        "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat",
-        "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png"
    },
    {
-        "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat",
-        "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png"
+        "merged": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat",
+        "source": "E:\\gitProject1\\src\\Notes-master1\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png"
    }
 ]
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/ff24fe8937d6c8027a6a097f7ad12dc33db94c4d7ba7e7f85b5460fdcf5f59e1_5.jar
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/ff24fe8937d6c8027a6a097f7ad12dc33db94c4d7ba7e7f85b5460fdcf5f59e1_5.jar
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$4.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$4.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
--- a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
+++ b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
--- a/Show More
+++ b/Show More