富文本

Src/app/build.gradle

@@ -6,13 +6,14 @@ ext {
 }
 
 android {
-    compileSdk 21
+    compileSdk 30
     buildToolsVersion "34.0.0"
     useLibrary 'org.apache.http.legacy'
+    namespace 'net.micode.notes' // 添加命名空间
     defaultConfig {
         applicationId "net.micode.notes"
         minSdk 21
-        targetSdkVersion defaultTargetSdkVersion
+        targetSdkVersion 33
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" // 确保包含目标架构
         }
@@ -35,6 +36,7 @@ android {
         implementation 'com.alphacephei:vosk-android:0.3.38'
         implementation 'net.java.dev.jna:jna:5.5.0'
         implementation 'net.java.dev.jna:jna-platform:5.5.0'
+        implementation 'androidx.core:core:1.6.0'
     }
     sourceSets {
         main {

Src/app/build/generated/source/buildConfig/androidTest/debug/net/micode/notes/test/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package net.micode.notes.test;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String APPLICATION_ID = "net.micode.notes.test";
-  public static final String BUILD_TYPE = "debug";
-}

Src/app/build/intermediates/annotation_processor_list/debugAndroidTest/annotationProcessors.json

@@ -1 +0,0 @@
-{}

Src/app/build/intermediates/apk_ide_redirect_file/debugAndroidTest/redirect.txt

@@ -1,2 +0,0 @@
-#- File Locator -
-listingFile=../../../outputs/apk/androidTest/debug/output-metadata.json

Src/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out

@@ -1 +0,0 @@
-10

Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,260 +1,121 @@
-<<<<<<< HEAD
+#Sun Jan 12 18:30:52 CST 2025
-#Sat Jan 11 10:32:30 CST 2025
+net.micode.notes.app-main-9\:/color/primary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-9\:/color/secondary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-9\:/color/text_color_state_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat
-net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/bg_btn_set_color.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/call_record.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/clock.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/dropdown_icon.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_title_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_title_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_title_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_title_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/edit_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/font_large.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/font_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/font_small.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/font_super.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/icon_app.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_background.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_blue_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_blue_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_blue_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_blue_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_folder.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_footer_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_green_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_green_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_green_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_green_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_red_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_red_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_red_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_red_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_white_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_white_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_white_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_white_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_yellow_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_yellow_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/list_yellow_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/menu_delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/menu_move.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/new_note_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/new_note_pressed.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/notification.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/search_result.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/selected.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/title_alert.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/title_bar_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_2x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_2x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_2x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_2x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_2x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_4x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_4x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_4x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_4x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-9\:/drawable-hdpi/widget_4x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-9\:/drawable/button_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/button_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat
+net.micode.notes.app-main-9\:/drawable/edittext_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/edittext_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat
+net.micode.notes.app-main-9\:/drawable/gesture_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat
+net.micode.notes.app-main-9\:/drawable/gesture_button_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat
+net.micode.notes.app-main-9\:/drawable/gesture_panel_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_audio.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
-net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
+net.micode.notes.app-main-9\:/drawable/ic_delete.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_delete.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_bold.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_bold.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_bullet.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_bullet.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_color.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_color.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_italic.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_italic.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_strikethrough.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_strikethrough.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_format_underline.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_underline.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_lock_outline.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat
+net.micode.notes.app-main-9\:/drawable/ic_warning.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
-net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
+net.micode.notes.app-main-9\:/drawable/new_note.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-9\:/drawable/toast_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat
+net.micode.notes.app-main-9\:/layout/account_dialog_title.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-9\:/layout/activity_login.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+net.micode.notes.app-main-9\:/layout/activity_register.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat
+net.micode.notes.app-main-9\:/layout/activity_user_management.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_user_management.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat
+net.micode.notes.app-main-9\:/layout/add_account_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-9\:/layout/datetime_picker.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-9\:/layout/dialog_add_user.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_add_user.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat
+net.micode.notes.app-main-9\:/layout/dialog_edit_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-9\:/layout/folder_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-9\:/layout/item_user.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat
-net.micode.notes.app-main-7\:/layout/item_user.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat
+net.micode.notes.app-main-9\:/layout/layout_custom_toast.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat
-net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat
+net.micode.notes.app-main-9\:/layout/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-9\:/layout/note_edit_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-9\:/layout/note_gesture_password.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat
-net.micode.notes.app-main-7\:/layout/note_gesture_password.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat
+net.micode.notes.app-main-9\:/layout/note_gesture_verify.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat
-net.micode.notes.app-main-7\:/layout/note_gesture_verify.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat
+net.micode.notes.app-main-9\:/layout/note_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-9\:/layout/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-9\:/layout/note_list_dropdown_menu.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-9\:/layout/note_list_footer.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-9\:/layout/settings_header.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-9\:/layout/widget_2x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-9\:/layout/widget_4x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-9\:/menu/call_note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-9\:/menu/call_record_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-9\:/menu/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-9\:/menu/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-9\:/menu/note_list_dropdown.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-9\:/menu/note_list_options.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-9\:/menu/sub_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-9\:/raw-zh-rCN/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-9\:/raw/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-9\:/xml/preferences.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-9\:/xml/searchable.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-9\:/xml/widget_2x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-9\:/xml/widget_4x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Mon Dec 30 21:15:33 CST 2024
-=======
-#Mon Jan 06 19:32:33 CST 2025
->>>>>>> a
-=======
-#Thu Jan 09 10:35:48 CST 2025
->>>>>>> a
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/color/text_color_state_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\color_text_color_state_list.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable/button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_button_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/edittext_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_edittext_background.xml.flat
-<<<<<<< HEAD
-net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
-=======
-net.micode.notes.app-main-7\:/drawable/gesture_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/gesture_button_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_button_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/gesture_panel_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_gesture_panel_background.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_audio.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_audio.png.flat
-net.micode.notes.app-main-7\:/drawable/ic_delete.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_delete.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_bold.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bold.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_bullet.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_bullet.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_color.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_color.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_italic.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_italic.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_strikethrough.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_strikethrough.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_format_underline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_format_underline.xml.flat
-net.micode.notes.app-main-7\:/drawable/ic_lock_outline.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_lock_outline.xml.flat
->>>>>>> a
-net.micode.notes.app-main-7\:/drawable/ic_warning.png=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_ic_warning.png.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable/toast_background.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_toast_background.xml.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat
-net.micode.notes.app-main-7\:/layout/activity_user_management.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_user_management.xml.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_add_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_user.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/layout/item_user.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_item_user.xml.flat
-net.micode.notes.app-main-7\:/layout/layout_custom_toast.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_layout_custom_toast.xml.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-<<<<<<< HEAD
-=======
-net.micode.notes.app-main-7\:/layout/note_gesture_password.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_password.xml.flat
-net.micode.notes.app-main-7\:/layout/note_gesture_verify.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_gesture_verify.xml.flat
->>>>>>> a
-net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitnote\\notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06

Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

@@ -1,132 +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="cancel">取消</string>
-    <string name="confirm_gesture">确认</string>
-    <string name="confirm_gesture_pattern">请再次绘制手势密码确认</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_bold">加粗</string>
-    <string name="format_bullet">项目符号</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_italic">斜体</string>
-    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
-    <string name="format_strikethrough">删除线</string>
-    <string name="format_text_color">文字颜色</string>
-    <string name="format_underline">下划线</string>
-    <string name="gesture_forgot_message">您可以通过其他方式重置密码</string>
-    <string name="gesture_forgot_pattern">忘记密码？</string>
-    <string name="gesture_forgot_title">忘记密码</string>
-    <string name="gesture_instruction">请绘制手势密码</string>
-    <string name="gesture_matched">手势匹配成功</string>
-    <string name="gesture_not_matched">手势不匹配，请重试</string>
-    <string name="gesture_password_set">手势密码设置成功</string>
-    <string name="gesture_too_short">手势太短，至少需要4个点</string>
-    <string name="gesture_verify_error">图案错误，还可以尝试%d次</string>
-    <string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string>
-    <string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string>
-    <string name="gesture_verify_hint">请绘制手势密码解锁笔记</string>
-    <string name="gesture_verify_success">验证成功</string>
-    <string name="hint_foler_name">请输入名称</string>
-    <string name="info_note_enter_desktop">已添加到桌面</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_set_gesture">设置手势密码</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="ok">确定</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="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>

Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="format_for_exported_note">
-        <item>-%s</item>      
-        <item>--%s</item>     
-        <item>--%s</item>     
-        <item>--%s</item>     
-    </string-array>
-    <string-array name="menu_share_ways">
-        <item>Messaging</item>
-        <item>Email</item>
-    </string-array>
-    <color name="background_color">#FFFFFF</color>
-    <color name="button_color">#2196F3</color>
-    <color name="button_text_color">#FFFFFF</color>
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
-    <color name="gesture_background">#F5F5F5</color>
-    <color name="gesture_button_background">#2196F3</color>
-    <color name="gesture_button_ripple">#80FFFFFF</color>
-    <color name="gesture_button_text">#FFFFFF</color>
-    <color name="gesture_error_color">#F44336</color>
-    <color name="gesture_hint_color">#757575</color>
-    <color name="gesture_icon_color">#2196F3</color>
-    <color name="gesture_line_error">#F44336</color>
-    <color name="gesture_line_normal">#2196F3</color>
-    <color name="gesture_link_color">#2196F3</color>
-    <color name="gesture_panel_background">#FFFFFF</color>
-    <color name="gesture_panel_border">#E0E0E0</color>
-    <color name="gesture_point_error">#F44336</color>
-    <color name="gesture_point_normal">#E0E0E0</color>
-    <color name="gesture_point_selected">#2196F3</color>
-    <color name="gesture_success_color">#4CAF50</color>
-    <color name="gesture_text_color">#333333</color>
-<<<<<<< HEAD
-=======
->>>>>>> a
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
-    <color name="hint_color">#808080</color>
-    <color name="text_color">#000000</color>
-    <color name="toolbar_background">#F5F5F5</color>
-    <color name="toolbar_button_selected">#E0E0E0</color>
-    <color name="user_query_highlight">#335b5b5b</color>
-    <dimen name="text_font_size_large">26sp</dimen>
-    <dimen name="text_font_size_medium">20sp</dimen>
-    <dimen name="text_font_size_normal">17sp</dimen>
-    <dimen name="text_font_size_small">14sp</dimen>
-    <dimen name="text_font_size_super">33sp</dimen>
-    <plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="button_delete">Delete</string>
-    <string name="call_record_folder_name">Call notes</string>
-    <string name="cancel">取消</string>
-    <string name="confirm_gesture">确认</string>
-    <string name="confirm_gesture_pattern">请再次绘制手势密码确认</string>
-    <string name="datetime_dialog_cancel">cancel</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="error_sync_internal">Sync failed, internal error occurs</string>
-    <string name="error_sync_network">Sync failed, please check network and account settings</string>
-    <string name="failed_sdcard_export">Export fail</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="folder_exist">The folder %1$s exist, please rename</string>
-    <string name="format_bold">加粗</string>
-    <string name="format_bullet">项目符号</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
-    <string name="format_folder_files_count">(%d)</string>
-    <string name="format_italic">斜体</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
-<<<<<<< HEAD
-    <string name="format_strikethrough">删除线</string>
-    <string name="format_text_color">文字颜色</string>
-    <string name="format_underline">下划线</string>
-=======
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
-    <string name="gesture_forgot_message">您可以通过其他方式重置密码</string>
-    <string name="gesture_forgot_pattern">忘记密码？</string>
-    <string name="gesture_forgot_title">忘记密码</string>
-    <string name="gesture_instruction">请绘制手势密码</string>
-    <string name="gesture_matched">手势匹配成功</string>
-    <string name="gesture_not_matched">手势不匹配，请重试</string>
-    <string name="gesture_password_set">手势密码设置成功</string>
-    <string name="gesture_too_short">手势太短，至少需要4个点</string>
-    <string name="gesture_verify_error">图案错误，还可以尝试%d次</string>
-    <string name="gesture_verify_fail_max">验证失败次数过多，笔记已锁定</string>
-    <string name="gesture_verify_fail_tries">验证失败，还剩 %d 次机会</string>
-    <string name="gesture_verify_hint">请绘制手势密码解锁笔记</string>
-    <string name="gesture_verify_success">验证成功</string>
-    <string name="hint_foler_name">Input name</string>
-    <string name="info_note_enter_desktop">Note added to home</string>
-    <string name="menu_alert">Remind me</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_folder_change_name">Change folder name</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_move_parent_folder">Parent folder</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_send_to_desktop">Send to home</string>
-    <string name="menu_set_gesture">设置手势密码</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_share">Share</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_title_select_folder">Select folder</string>
-    <string name="note_alert_expired">Expired</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_other">Open map</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="notelist_string_info">...</string>
-    <string name="ok">确定</string>
-    <string name="preferences_account_summary">Sync notes with google task</string>
-    <string name="preferences_account_title">Sync account</string>
-    <string name="preferences_add_account">Add account</string>
-    <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_button_sync_cancel">Cancel syncing</string>
-    <string name="preferences_button_sync_immediately">Sync immediately</string>
-    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
-    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
-    <string name="preferences_dialog_select_account_title">Sync notes</string>
-    <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
-    <string name="preferences_menu_cancel">Cancel</string>
-    <string name="preferences_menu_change_account">Change sync account</string>
-    <string name="preferences_menu_remove_account">Remove sync account</string>
-    <string name="preferences_title">Settings</string>
-    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
-    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
-    <string name="search">Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_label">Searching Notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="success_sdcard_export">Export successful</string>
-    <string name="success_sync_account">Sync is successful with account %1$s</string>
-    <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
-    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
-    <string name="ticker_cancel">Sync is canceled</string>
-    <string name="ticker_fail">Sync is failed</string>
-    <string name="ticker_success">Sync is successful</string>
-    <string name="ticker_syncing">Syncing notes...</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
-    <style name="CustomEditTextStyle" parent="android:Widget.EditText">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/text_color_state_list</item>
-        <item name="android:textColorHint">@color/hint_color</item>
-    </style>
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
-    <style name="GestureVerifyTheme" parent="android:Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">@color/gesture_background</item>
-        <item name="android:windowFullscreen">true</item>
-        <item name="android:windowIsTranslucent">false</item>
-        <item name="android:windowDisablePreview">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-<<<<<<< HEAD
-=======
->>>>>>> a
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
-    <style name="HighlightTextAppearancePrimary">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="HighlightTextAppearanceSecondary">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-
-        <item name="android:visibility">visible</item>
-    </style>
-    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
-    </style>
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceMedium">
-        <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceNormal">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearancePrimaryItem">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSecondaryItem">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSuper">
-        <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceUnderMenuIcon">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-</resources>

Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties

@@ -1 +0,0 @@
-#Wed Jan 08 10:29:59 CST 2025

Src/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTest\res"/><source path="D:\gitnote\notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\gitnote\notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTest\res"/><source path="D:\gitnote\notes\app\build\generated\res\rs\androidTest\debug"/><source path="D:\gitnote\notes\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>

Src/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTest\assets"/><source path="D:\gitnote\notes\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTestDebug\assets"/></dataSet></merger>

Src/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTestDebug\jniLibs"/></dataSet></merger>

Src/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\androidTestDebug\shaders"/></dataSet></merger>

Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\main\assets"><file name="vosk-model-small-cn-0.22/am/final.mdl" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\am\final.mdl"/><file name="vosk-model-small-cn-0.22/conf/mfcc.conf" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\conf\mfcc.conf"/><file name="vosk-model-small-cn-0.22/conf/model.conf" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\conf\model.conf"/><file name="vosk-model-small-cn-0.22/graph/disambig_tid.int" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\graph\disambig_tid.int"/><file name="vosk-model-small-cn-0.22/graph/Gr.fst" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\graph\Gr.fst"/><file name="vosk-model-small-cn-0.22/graph/HCLr.fst" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\graph\HCLr.fst"/><file name="vosk-model-small-cn-0.22/graph/phones/word_boundary.int" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\graph\phones\word_boundary.int"/><file name="vosk-model-small-cn-0.22/ivector/final.dubm" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.dubm"/><file name="vosk-model-small-cn-0.22/ivector/final.ie" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.ie"/><file name="vosk-model-small-cn-0.22/ivector/final.mat" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.mat"/><file name="vosk-model-small-cn-0.22/ivector/global_cmvn.stats" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\global_cmvn.stats"/><file name="vosk-model-small-cn-0.22/ivector/online_cmvn.conf" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\online_cmvn.conf"/><file name="vosk-model-small-cn-0.22/ivector/splice.conf" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\ivector\splice.conf"/><file name="vosk-model-small-cn-0.22/README" path="D:\gitnote\notes\app\src\main\assets\vosk-model-small-cn-0.22\README"/></source><source path="D:\gitnote\notes\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\main\assets"><file name="vosk-model-small-cn-0.22/am/final.mdl" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\am\final.mdl"/><file name="vosk-model-small-cn-0.22/conf/mfcc.conf" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\conf\mfcc.conf"/><file name="vosk-model-small-cn-0.22/conf/model.conf" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\conf\model.conf"/><file name="vosk-model-small-cn-0.22/graph/disambig_tid.int" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\graph\disambig_tid.int"/><file name="vosk-model-small-cn-0.22/graph/Gr.fst" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\graph\Gr.fst"/><file name="vosk-model-small-cn-0.22/graph/HCLr.fst" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\graph\HCLr.fst"/><file name="vosk-model-small-cn-0.22/graph/phones/word_boundary.int" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\graph\phones\word_boundary.int"/><file name="vosk-model-small-cn-0.22/ivector/final.dubm" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.dubm"/><file name="vosk-model-small-cn-0.22/ivector/final.ie" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.ie"/><file name="vosk-model-small-cn-0.22/ivector/final.mat" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\final.mat"/><file name="vosk-model-small-cn-0.22/ivector/global_cmvn.stats" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\global_cmvn.stats"/><file name="vosk-model-small-cn-0.22/ivector/online_cmvn.conf" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\online_cmvn.conf"/><file name="vosk-model-small-cn-0.22/ivector/splice.conf" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\ivector\splice.conf"/><file name="vosk-model-small-cn-0.22/README" path="D:\github\XiaoMiNote\Src\app\src\main\assets\vosk-model-small-cn-0.22\README"/></source><source path="D:\github\XiaoMiNote\Src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\debug\assets"/></dataSet></merger>

Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\main\jniLibs"><file name="arm64-v8a/libjnidispatch.so" path="D:\gitnote\notes\app\src\main\jniLibs\arm64-v8a\libjnidispatch.so"/><file name="arm64-v8a/libvosk.so" path="D:\gitnote\notes\app\src\main\jniLibs\arm64-v8a\libvosk.so"/><file name="armeabi-v7a/libjnidispatch.so" path="D:\gitnote\notes\app\src\main\jniLibs\armeabi-v7a\libjnidispatch.so"/><file name="armeabi-v7a/libvosk.so" path="D:\gitnote\notes\app\src\main\jniLibs\armeabi-v7a\libvosk.so"/><file name="x86/libjnidispatch.so" path="D:\gitnote\notes\app\src\main\jniLibs\x86\libjnidispatch.so"/><file name="x86/libvosk.so" path="D:\gitnote\notes\app\src\main\jniLibs\x86\libvosk.so"/><file name="x86_64/libjnidispatch.so" path="D:\gitnote\notes\app\src\main\jniLibs\x86_64\libjnidispatch.so"/><file name="x86_64/libvosk.so" path="D:\gitnote\notes\app\src\main\jniLibs\x86_64\libvosk.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs"><file name="arm64-v8a/libjnidispatch.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\arm64-v8a\libjnidispatch.so"/><file name="arm64-v8a/libvosk.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\arm64-v8a\libvosk.so"/><file name="armeabi-v7a/libjnidispatch.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\armeabi-v7a\libjnidispatch.so"/><file name="armeabi-v7a/libvosk.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\armeabi-v7a\libvosk.so"/><file name="x86/libjnidispatch.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\x86\libjnidispatch.so"/><file name="x86/libvosk.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\x86\libvosk.so"/><file name="x86_64/libjnidispatch.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\x86_64\libjnidispatch.so"/><file name="x86_64/libvosk.so" path="D:\github\XiaoMiNote\Src\app\src\main\jniLibs\x86_64\libvosk.so"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\debug\jniLibs"/></dataSet></merger>

Src/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,96 +0,0 @@
-#Mon Mar 11 20:40:05 CST 2024
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-F\:\\Android\\Prj\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\Android\\Prj\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat

Src/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

@@ -1,108 +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="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="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="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>

Src/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml

@@ -1,108 +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="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="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="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>

Src/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
-    <string-array name="format_for_exported_note">
-        <item>-%s</item>      <!-- format_folder_name -->
-        <item>--%s</item>     <!-- format_folder_note_date -->
-        <item>--%s</item>     <!-- format_note_date -->
-        <item>--%s</item>     <!-- format_note_content -->
-    </string-array>
-    <string-array name="menu_share_ways">
-        <item>Messaging</item>
-        <item>Email</item>
-    </string-array>
-    <color name="user_query_highlight">#335b5b5b</color>
-    <dimen name="text_font_size_large">26sp</dimen>
-    <dimen name="text_font_size_medium">20sp</dimen>
-    <dimen name="text_font_size_normal">17sp</dimen>
-    <dimen name="text_font_size_small">14sp</dimen>
-    <dimen name="text_font_size_super">33sp</dimen>
-    <plurals name="search_results_title">
-         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-        <!-- Case of 0 or 2 or more results. -->
-        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
-    </plurals>
-    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
-    <string name="alert_message_delete_note">Confirm to delete this note?</string>
-    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
-    <string name="alert_title_delete">Delete selected notes</string>
-    <string name="app_name">Notes</string>
-    <string name="app_widget2x2">Notes 2x2</string>
-    <string name="app_widget4x4">Notes 4x4</string>
-    <string name="button_delete">Delete</string>
-    <string name="call_record_folder_name">Call notes</string>
-    <string name="datetime_dialog_cancel">cancel</string>
-    <string name="datetime_dialog_ok">set</string>
-    <string name="delete_remind_time_message">Delete reminder successfully</string>
-    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
-    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
-    <string name="error_note_not_exist">The note is not exist</string>
-    <string name="error_sdcard_export">Export failed, please check SD card</string>
-    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
-    <string name="error_sync_cancelled">Sync is canceled</string>
-    <string name="error_sync_internal">Sync failed, internal error occurs</string>
-    <string name="error_sync_network">Sync failed, please check network and account settings</string>
-    <string name="failed_sdcard_export">Export fail</string>
-    <string name="file_name_txt_format">notes_%s.txt</string>
-    <string name="file_path">/MIUI/notes/</string>
-    <string name="folder_exist">The folder %1$s exist, please rename</string>
-    <string name="format_date_ymd">yyyyMMdd</string>
-    <string name="format_datetime_mdhm">MMMd kk:mm</string>
-    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
-    <string name="format_folder_files_count">(%d)</string>
-    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
-    <string name="hint_foler_name">Input name</string>
-    <string name="info_note_enter_desktop">Note added to home</string>
-    <string name="menu_alert">Remind me</string>
-    <string name="menu_create_folder">New Folder</string>
-    <string name="menu_delete">Delete</string>
-    <string name="menu_deselect_all">Deselect all</string>
-    <string name="menu_export_text">Export text</string>
-    <string name="menu_folder_change_name">Change folder name</string>
-    <string name="menu_folder_delete">Delete folder</string>
-    <string name="menu_folder_view">View folder</string>
-    <string name="menu_font_large">Large</string>
-    <string name="menu_font_normal">Medium</string>
-    <string name="menu_font_size">Font size</string>
-    <string name="menu_font_small">Small</string>
-    <string name="menu_font_super">Super</string>
-    <string name="menu_list_mode">Enter check list</string>
-    <string name="menu_move">Move to folder</string>
-    <string name="menu_move_parent_folder">Parent folder</string>
-    <string name="menu_normal_mode">Leave check list</string>
-    <string name="menu_remove_remind">Delete reminder</string>
-    <string name="menu_search">Search</string>
-    <string name="menu_select_all">Select all</string>
-    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
-    <string name="menu_select_title">%d selected</string>
-    <string name="menu_send_to_desktop">Send to home</string>
-    <string name="menu_setting">Settings</string>
-    <string name="menu_share">Share</string>
-    <string name="menu_sync">Sync</string>
-    <string name="menu_sync_cancel">Cancel syncing</string>
-    <string name="menu_title_select_folder">Select folder</string>
-    <string name="note_alert_expired">Expired</string>
-    <string name="note_link_email">Send email</string>
-    <string name="note_link_other">Open map</string>
-    <string name="note_link_tel">Call</string>
-    <string name="note_link_web">Browse web</string>
-    <string name="notealert_enter">Take a look</string>
-    <string name="notealert_ok">Got it</string>
-    <string name="notelist_menu_new">Add note</string>
-    <string name="notelist_string_info">...</string>
-    <string name="preferences_account_summary">Sync notes with google task</string>
-    <string name="preferences_account_title">Sync account</string>
-    <string name="preferences_add_account">Add account</string>
-    <string name="preferences_bg_random_appear_title">New note background color random</string>
-    <string name="preferences_button_sync_cancel">Cancel syncing</string>
-    <string name="preferences_button_sync_immediately">Sync immediately</string>
-    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
-    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
-    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
-    <string name="preferences_dialog_select_account_title">Sync notes</string>
-    <string name="preferences_last_sync_time">Last sync time %1$s</string>
-    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
-    <string name="preferences_menu_cancel">Cancel</string>
-    <string name="preferences_menu_change_account">Change sync account</string>
-    <string name="preferences_menu_remove_account">Remove sync account</string>
-    <string name="preferences_title">Settings</string>
-    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
-    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
-    <string name="search">Notes</string>
-    <string name="search_hint">Search notes</string>
-    <string name="search_label">Searching Notes</string>
-    <string name="search_setting_description">Text in your notes</string>
-    <string name="set_remind_time_message">Set reminder</string>
-    <string name="success_sdcard_export">Export successful</string>
-    <string name="success_sync_account">Sync is successful with account %1$s</string>
-    <string name="sync_progress_init_list">Getting remote note list...</string>
-    <string name="sync_progress_login">Logging into %1$s...</string>
-    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
-    <string name="ticker_cancel">Sync is canceled</string>
-    <string name="ticker_fail">Sync is failed</string>
-    <string name="ticker_success">Sync is successful</string>
-    <string name="ticker_syncing">Syncing notes...</string>
-    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
-    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
-    <style name="HighlightTextAppearancePrimary">
-    <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="HighlightTextAppearanceSecondary">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions"/>
-        <item name="android:visibility">gone</item>
-    </style>
-    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
-        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
-    </style>
-    <style name="TextAppearanceLarge">
-        <item name="android:textSize">@dimen/text_font_size_large</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceMedium">
-        <item name="android:textSize">@dimen/text_font_size_medium</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceNormal">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearancePrimaryItem">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@color/primary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSecondaryItem">
-        <item name="android:textSize">@dimen/text_font_size_small</item>
-        <item name="android:textColor">@color/secondary_text_dark</item>
-    </style>
-    <style name="TextAppearanceSuper">
-        <item name="android:textSize">@dimen/text_font_size_super</item>
-        <item name="android:textColorLink">#0000ff</item>
-    </style>
-    <style name="TextAppearanceUnderMenuIcon">
-        <item name="android:textSize">@dimen/text_font_size_normal</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-</resources>

Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\gitnote\notes\app\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\github\XiaoMiNote\Src\app\src\debug\shaders"/></dataSet></merger>

Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
+#Sun Jan 12 18:49:45 CST 2025
-#Sat Jan 11 10:33:04 CST 2025
 base.0=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
 base.1=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
 base.2=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
@@ -9,26 +8,6 @@ base.5=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\merg
 base.6=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
 base.7=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
 base.8=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Tue Dec 31 09:10:17 CST 2024
-=======
-#Mon Jan 06 20:13:24 CST 2025
->>>>>>> a
-=======
-#Thu Jan 09 10:35:49 CST 2025
->>>>>>> a
-base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
-base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
-base.2=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
-base.3=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
-base.4=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
-base.5=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
-base.6=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
-base.7=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
-base.8=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex
->>>>>>> 1b80de9aefc055633c8aabedaa3d2074a3b00e06
 path.0=classes.dex
 path.1=0/classes.dex
 path.2=11/classes.dex

Src/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt

@@ -1,7 +0,0 @@
-#Wed Jan 08 10:30:02 CST 2025
-base.0=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
-base.1=D\:\\gitnote\\notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
-path.0=0/classes.dex
-path.1=13/classes.dex
-renamed.0=classes.dex
-renamed.1=classes2.dex