diff --git a/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx b/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx
new file mode 100644
index 0000000..a0869da
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的团队自评报告.xlsx differ
diff --git a/doc/实践考评-阅读维护开源软件的汇报.pptx b/doc/实践考评-阅读维护开源软件的汇报.pptx
new file mode 100644
index 0000000..b32d1c4
Binary files /dev/null and b/doc/实践考评-阅读维护开源软件的汇报.pptx differ
diff --git a/doc/小米便签软件泛读、标注和维护报告文档.docx b/doc/小米便签软件泛读、标注和维护报告文档.docx
index 180ef6c..989c7ac 100644
Binary files a/doc/小米便签软件泛读、标注和维护报告文档.docx and b/doc/小米便签软件泛读、标注和维护报告文档.docx differ
diff --git a/src/Notes/.gradle/7.5/checksums/checksums.lock b/src/Notes/.gradle/7.5/checksums/checksums.lock
index a862ede..cad93d6 100644
Binary files a/src/Notes/.gradle/7.5/checksums/checksums.lock and b/src/Notes/.gradle/7.5/checksums/checksums.lock differ
diff --git a/src/Notes/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes/.gradle/7.5/checksums/md5-checksums.bin
index 95cd048..73aa858 100644
Binary files a/src/Notes/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes/.gradle/7.5/checksums/md5-checksums.bin differ
diff --git a/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin
index f7631fa..f1f8402 100644
Binary files a/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes/.gradle/7.5/checksums/sha1-checksums.bin differ
diff --git a/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin
index d273ec1..2c93579 100644
Binary files a/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes/.gradle/7.5/executionHistory/executionHistory.bin differ
diff --git a/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock
index 35ab29b..80f19c0 100644
Binary files a/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes/.gradle/7.5/executionHistory/executionHistory.lock differ
diff --git a/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin
index 854e514..01072c4 100644
Binary files a/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes/.gradle/7.5/fileHashes/fileHashes.bin differ
diff --git a/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock
index 31ed720..821b9a8 100644
Binary files a/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes/.gradle/7.5/fileHashes/fileHashes.lock differ
diff --git a/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin
index 1d49b39..70face6 100644
Binary files a/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes/.gradle/7.5/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 569a0a5..aa5a4b7 100644
Binary files a/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin
index 8aa5019..384325a 100644
Binary files a/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes/.gradle/file-system.probe b/src/Notes/.gradle/file-system.probe
index 03fcddf..dc2bc8f 100644
Binary files a/src/Notes/.gradle/file-system.probe and b/src/Notes/.gradle/file-system.probe differ
diff --git a/src/Notes/.idea/deploymentTargetDropDown.xml b/src/Notes/.idea/deploymentTargetDropDown.xml
index 3a084b2..aae1813 100644
--- a/src/Notes/.idea/deploymentTargetDropDown.xml
+++ b/src/Notes/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/deploymentTargetSelector.xml b/src/Notes/.idea/deploymentTargetSelector.xml
index ec2ecd2..cae6a0e 100644
--- a/src/Notes/.idea/deploymentTargetSelector.xml
+++ b/src/Notes/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
-
+
-
+
diff --git a/src/Notes/.idea/gradle.xml b/src/Notes/.idea/gradle.xml
index 122f11e..70f372b 100644
--- a/src/Notes/.idea/gradle.xml
+++ b/src/Notes/.idea/gradle.xml
@@ -4,6 +4,7 @@
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index 8c79201..ebe8b03 100644
--- a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
index c44ac30..b748586 100644
--- a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index 6f4e22b..9a53f7d 100644
--- a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index d95b0e1..47a2025 100644
--- a/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_databinding_viewbinding_7_2_2_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_databinding_viewbinding_7_2_2_aar.xml
index 03fe42a..d3e1aa0 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_databinding_viewbinding_7_2_2_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_databinding_viewbinding_7_2_2_aar.xml
@@ -1,12 +1,12 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index adb8fde..aefe760 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
index 0ad0774..d23598c 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index c89ee41..031abd8 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
index 773174a..bdc4505 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index c39e45a..843cb2e 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
index 4487f4e..93ebf75 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index 73f997f..f1c7018 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
index af4eaa2..0c4649b 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index 5c75803..ee5ac3c 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
index 7757d61..04a6f58 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index af56625..166f059 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
index 28a3bd0..2557d04 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index 58a1eeb..6d78331 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
index 7a683e2..77a79e4 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
index 9d9a8ce..38639da 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
index 4a0a284..e4587fd 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
+
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
index 1e6b8d1..f8d2276 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
index f598d97..46d9203 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
index 9319fd7..e3eca6f 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index 17d9269..96222fd 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
index 85f2bf8..465a60d 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,11 +1,11 @@
-
+
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
index 8bce7fe..50119cb 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/src/Notes/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
index 4bc50f0..a10e10c 100644
--- a/src/Notes/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/src/Notes/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -1,8 +1,8 @@
-
-
+
+
diff --git a/src/Notes/.idea/misc.xml b/src/Notes/.idea/misc.xml
index c7d890c..3891535 100644
--- a/src/Notes/.idea/misc.xml
+++ b/src/Notes/.idea/misc.xml
@@ -3,12 +3,14 @@
diff --git a/src/Notes/.idea/modules/app/Notes.app.iml b/src/Notes/.idea/modules/app/Notes.app.iml
index aa09759..b0216a2 100644
--- a/src/Notes/.idea/modules/app/Notes.app.iml
+++ b/src/Notes/.idea/modules/app/Notes.app.iml
@@ -23,7 +23,7 @@
-
+
\ No newline at end of file
diff --git a/src/Notes/.idea/modules/app/Notes.app.main.iml b/src/Notes/.idea/modules/app/Notes.app.main.iml
index 2879a3f..6b625be 100644
--- a/src/Notes/.idea/modules/app/Notes.app.main.iml
+++ b/src/Notes/.idea/modules/app/Notes.app.main.iml
@@ -18,10 +18,11 @@
+
-
+
@@ -32,7 +33,7 @@
-
+
@@ -65,6 +66,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes/.idea/modules/app/Notes.app.unitTest.iml b/src/Notes/.idea/modules/app/Notes.app.unitTest.iml
index ffe7255..14d6b3f 100644
--- a/src/Notes/.idea/modules/app/Notes.app.unitTest.iml
+++ b/src/Notes/.idea/modules/app/Notes.app.unitTest.iml
@@ -17,7 +17,7 @@
-
+
@@ -51,6 +51,11 @@
+
+
+
+
+
diff --git a/src/Notes/app/build.gradle b/src/Notes/app/build.gradle
index 7e277c9..0714584 100644
--- a/src/Notes/app/build.gradle
+++ b/src/Notes/app/build.gradle
@@ -32,6 +32,11 @@ android {
dependencies {
implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.squareup.retrofit2:retrofit:2.0.2'
+ implementation 'com.squareup.okhttp3:okhttp:3.2.0'
+ implementation 'com.squareup.okio:okio:1.8.0'
+ implementation 'com.google.code.gson:gson:2.6.2'
+ implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
}
diff --git a/src/Notes/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java b/src/Notes/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java
index 5cd4fbd..707f1eb 100644
--- a/src/Notes/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java
+++ b/src/Notes/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java
@@ -8,6 +8,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.viewbinding.ViewBinding;
import android.viewbinding.ViewBindings;
+import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
@@ -107,6 +108,9 @@ public final class NoteEditBinding implements ViewBinding {
@NonNull
public final TextView textNum;
+ @NonNull
+ public final Button translate;
+
@NonNull
public final TextView tvAlertDate;
@@ -130,7 +134,7 @@ public final class NoteEditBinding implements ViewBinding {
@NonNull FrameLayout llFontSuper, @NonNull LinearLayout noteBgColorSelector,
@NonNull LinearLayout noteEditList, @NonNull NoteEditText noteEditView,
@NonNull LinearLayout noteTitle, @NonNull LinearLayout svNoteEdit, @NonNull TextView textNum,
- @NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate,
+ @NonNull Button translate, @NonNull TextView tvAlertDate, @NonNull TextView tvModifiedDate,
@NonNull TextView tvTopText) {
this.rootView = rootView;
this.addImgButton = addImgButton;
@@ -161,6 +165,7 @@ public final class NoteEditBinding implements ViewBinding {
this.noteTitle = noteTitle;
this.svNoteEdit = svNoteEdit;
this.textNum = textNum;
+ this.translate = translate;
this.tvAlertDate = tvAlertDate;
this.tvModifiedDate = tvModifiedDate;
this.tvTopText = tvTopText;
@@ -361,6 +366,12 @@ public final class NoteEditBinding implements ViewBinding {
break missingId;
}
+ id = R.id.translate;
+ Button translate = ViewBindings.findChildViewById(rootView, id);
+ if (translate == null) {
+ break missingId;
+ }
+
id = R.id.tv_alert_date;
TextView tvAlertDate = ViewBindings.findChildViewById(rootView, id);
if (tvAlertDate == null) {
@@ -384,7 +395,7 @@ public final class NoteEditBinding implements ViewBinding {
ivBgRed, ivBgRedSelect, ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect,
ivLargeSelect, ivMediumSelect, ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal,
llFontSmall, llFontSuper, noteBgColorSelector, noteEditList, noteEditView, noteTitle,
- svNoteEdit, textNum, tvAlertDate, tvModifiedDate, tvTopText);
+ svNoteEdit, textNum, translate, tvAlertDate, tvModifiedDate, tvTopText);
}
String missingId = rootView.getResources().getResourceName(id);
throw new NullPointerException("Missing required view with ID: ".concat(missingId));
diff --git a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk
index 441468a..8d43810 100644
Binary files a/src/Notes/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 52cc64a..cd8b32a 100644
Binary files a/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
index 6e1b267..25957e3 100644
Binary files a/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml b/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml
index 24c1a9a..b7ef5ab 100644
--- a/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml
+++ b/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml b/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml
index 698d814..816a5b8 100644
--- a/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml
+++ b/src/Notes/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_list-layout.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_0/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_1/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_2/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_3/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_4/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_5/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_6/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_7/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_8/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_8/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_8/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_9/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_9/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e0376ba0e45314e79e8e83314b49742108f8462398e0c25d248d6618a6c791e3_bucket_9/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_0/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_0/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_0/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_1/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_1/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_1/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_2/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_2/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_2/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_3/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_3/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_3/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_4/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_4/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_4/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_5/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_5/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_5/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_6/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_6/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_6/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_7/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_7/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_7/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_8/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_8/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_8/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_9/graph.bin b/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_9/graph.bin
deleted file mode 100644
index 601f245..0000000
Binary files a/src/Notes/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_eece6700fe76ef6373c03bd1455e3138c72812018e6f35316b7f647b42c091e5_bucket_9/graph.bin and /dev/null differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
index 6f04f86..88b9c04 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
index d6cb27f..39a2e8b 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex
index 87e74cb..e3ce883 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/11/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex
index 7930ee2..7c1efa9 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
index af372ff..e41d999 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex
index 9799134..7b6cdd4 100644
Binary files a/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/src/Notes/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ
diff --git a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 65e58a4..0717bbe 100644
Binary files a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
index caf65e6..97e9812 100644
Binary files a/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/src/Notes/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
index 13eb9c6..8c84b40 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0=
index b322a60..083d96b 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ZKJBFY7CMZHy69x_wl9yDf4Ll0= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns=
index d03b977..2dae2f9 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4saabp8CJ2a+ZtfEz1ixGErMvns= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo=
index 3b85954..e9e7608 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9YU3iwFztWvwyvs+zTk6qL4fsNo= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM=
index a20288b..06e914d 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Aqz88YoDSYM9sQ0AZD2jztcXQEM= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo=
index f3ed40b..0fb7130 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/B_oWS7iCYaluhsmpGKTjVGN5bYo= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc=
index 6a09445..6bb2c49 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C3wtgA1q4WeohPIeRoDwgqvEEzc= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8=
index 3e3acf4..c063f2b 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/C9jroaRXwFXp_D2RDUqtZysylj8= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM=
index 172691b..27924dd 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CkZ1HD3i2Yp3jrXtMAIGpZKBdaM= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs=
index 810547b..a19a2a5 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D5Qb9Ll9D3W9Ty+4X60Zi6+6Rqs= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00=
index 091b6b6..e27d24a 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F6Fnx55Rif4tKHRturEDrgm3B00= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc=
index ea6f509..b12b287 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/J1Hkp+uynDypwdXgTiIgb18kDfc= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k=
index e40b65d..32d47c0 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7VIrSpMlXeQ8ly3BVnrm5nTC_k= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU=
index 2e46a7c..1423435 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NlB1oymp_vxmUaQDIwr65TEzUtU= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw=
index 2b28058..a69b1ec 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ONjvaSdthQgsIJpTG3bB53bKYbw= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g=
index 46d3cb3..feebff2 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZOicE_mOTB6dVCU6lvYXpu8O7g= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0=
index 85e5545..e7159a9 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VgljsqM_Ld+qtdBOxJwB0b2yZQ0= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs=
index 5137d2e..d0dcd9c 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/X2jqmtPJi81FtcXN5m9MyGIcHCs= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w=
index 1b70268..f6dab42 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XhYyM8rLB6K7yKMOrPHwWuOGB3w= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4=
index 9f562b5..87586a5 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cyhY31xvrzDva_Q0ojTwmo+Alk4= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c=
index 3aad90c..f61d762 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hW0653hTJfHM0Zci_ct9XwdxV1c= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI=
index 2400090..b6ac9fe 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/i5_diqLULFiF83meqrL0guXhqOI= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI=
index 5afb9b4..e49acf7 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Y6aRjdjEZsVr+ljo7SEJhCGvI= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM=
index 3402ba5..2365cb9 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mtOauOk1+mBX3wu8ABzja1enrhM= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs=
index 0d4a161..3c086f3 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mv3x1lB+8EjBUAMQiplN7mm9Vzs= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ=
index 5405370..1c79806 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qtmN_Ho9eMZ0HVpNEtXO9+BKRoQ= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8=
index f27829e..371b441 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uLyHmlGMQqgFAKukY92Y2Bc4gc8= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM=
index ee0fc38..865488d 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ud2yvUkoY1n09AC5BUdJTKxfMDM= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0=
index b5e5cbc..2b56acd 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wOBApgBXGnqi9jkHHNOV5VrLST0= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY=
index 1f8cc12..483b42c 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xGdFRZXKXJ21QhQKNPBp6_EIvuY= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y=
index 93b769e..25547cc 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yrBDggEPCoz7zGVA5zmA8Ro+52Y= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA=
index 8190f88..8d3e763 100644
Binary files a/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= and b/src/Notes/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zJnzddHSfoeBYZPAQLQ8pBSz4EA= differ
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 1ddbee0..ec91df8 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,107 +1,108 @@
-#Wed Dec 25 11:32:06 CST 2024
-net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/key.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_key.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_background1.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background1.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_background2.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background2.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/splash.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-10\:/raw/introduction=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/account_dialog_title.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/activity_change_loginpassword.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/activity_delete_loginpassword.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/activity_login.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/activity_set_loginpassword.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/activity_splash.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/add_account_text.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/datetime_picker.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_edit_text.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_pwd.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_pwd.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/folder_list_item.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit_list_item.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_item.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_dropdown_menu.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_footer.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/settings_header.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/widget_2x.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-mergeDebugResources-7\:/layout/widget_4x.xml=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+#Tue Jan 07 21:10:22 CST 2025
+net.micode.notes.app-main-10\:/color/primary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-10\:/color/secondary_text_dark.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/bg_btn_set_color.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/call_record.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/clock.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/delete.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/dropdown_icon.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_blue.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_green.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_red.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_blue.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_green.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_red.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_white.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_white.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/edit_yellow.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_large.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_normal.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_small.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/font_super.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/icon_app.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/key.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_key.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_background.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_background1.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background1.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_background2.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background2.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_blue_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_folder.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_footer_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_green_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_red_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_white_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_down.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_single.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/list_yellow_up.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/menu_delete.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/menu_move.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/new_note_normal.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/new_note_pressed.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/notification.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/search_result.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/selected.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/splash.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/title_alert.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/title_bar_bg.9.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/translate.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_translate.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_blue.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_green.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_red.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_white.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_2x_yellow.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_blue.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_green.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_red.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_white.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-10\:/drawable-hdpi/widget_4x_yellow.png=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-10\:/drawable/new_note.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-10\:/menu/call_note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-10\:/menu/call_record_folder.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-10\:/menu/note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-10\:/menu/note_list.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-10\:/menu/note_list_dropdown.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-10\:/menu/note_list_options.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-10\:/menu/sub_folder.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-10\:/raw-zh-rCN/introduction=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-10\:/raw/introduction=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-10\:/xml/preferences.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-10\:/xml/searchable.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-10\:/xml/widget_2x_info.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-10\:/xml/widget_4x_info.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/account_dialog_title.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_change_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_delete_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_login.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_set_loginpassword.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/activity_splash.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/add_account_text.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/datetime_picker.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_edit_text.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/dialog_pwd.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_pwd.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/folder_list_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_edit_list_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_item.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_dropdown_menu.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/note_list_footer.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/settings_header.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/widget_2x.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-mergeDebugResources-7\:/layout/widget_4x.xml=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
index ddf22e1..0094f26 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -337,6 +337,7 @@
Sync
Cancel syncing
Select folder
+ Trash Folder
night mode
Expired
Length
@@ -1912,11 +1913,11 @@
-
+
-
+
-
+
@@ -2065,17 +2066,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2087,17 +2093,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2116,9 +2127,10 @@
-
+
-
+
@@ -2499,17 +2511,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2530,70 +2547,76 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2626,14 +2649,23 @@
-
+
-
+
-
+
@@ -2821,15 +2853,24 @@
-
+
-
+
-
+
-
+
-
+
@@ -2853,17 +2894,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2978,17 +3024,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2997,17 +3048,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3068,9 +3124,9 @@
-
+
-
+
@@ -3112,17 +3168,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index a86ce2b..c2e69d4 100644
--- a/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -2600,7 +2600,7 @@
- 60%
- 90%
- 50%
- 70%
- 45%
- 72%
"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha"
+ - 60%
- 90%
- 50%
- 70%
- 45%
- 72%
"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha"
- -%s
- --%s
- --%s
@@ -2608,14 +2608,14 @@
- Messaging
- Email
-
+
- #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancelsecret modelquit secret modellight modenight mode
+ #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancelsecret modelquit secret modellight modenight modeTrash Folder
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
- LengthSplashActivityDummy ButtonHELLO\nWORLD!!!
+
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消私密模式退出私密模式亮背景暗背景
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消私密模式退出私密模式亮背景暗背景回收站
- %1$s 条符合“%2$s”的搜索结果
- 字符数
+ 字符数
- 短信
- 郵件
- 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消私密模式退出私密模式亮背景暗背景
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消私密模式退出私密模式亮背景暗背景回收站
- %1$s 條符合”%2$s“的搜尋結果
- 字符数
+ 字符数
diff --git a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
index 73e925a..a7e84d9 100644
--- a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Wed Dec 25 11:27:49 CST 2024
+#Tue Jan 07 21:10:23 CST 2025
diff --git a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
index f4918dd..526f7cd 100644
--- a/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
index 02e4bd2..558e957 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
index bd91cc3..2b85763 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
index 4584500..953a7b2 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index a1db441..76da6ab 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 1512c86..dfe0f60 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 6dbbbc4..a41e7c3 100644
--- a/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 70f56ff..1ee6dd4 100644
--- a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,12 +1,12 @@
-#Wed Dec 25 23:49:12 CST 2024
-base.0=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
-base.1=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
-base.2=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
-base.3=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
-base.4=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
-base.5=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
-base.6=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
-base.7=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
+#Tue Jan 07 21:10:41 CST 2025
+base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
+base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
+base.2=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
+base.3=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
+base.4=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
+base.5=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
+base.6=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
+base.7=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
path.0=classes.dex
path.1=0/classes.dex
path.2=11/classes.dex
diff --git a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 6557919..aa86ced 100644
Binary files a/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index 8fdfe45..e297159 100644
--- a/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/src/Notes/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,6 +1,6 @@
-#Wed Dec 25 11:27:54 CST 2024
-base.0=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
-base.1=D\:\\SoftWareEngineering\\b_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
+#Tue Jan 07 21:10:29 CST 2025
+base.0=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\0\\classes.dex
+base.1=D\:\\SoftWareEngineering\\a_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeProjectDexDebugAndroidTest\\13\\classes.dex
path.0=0/classes.dex
path.1=13/classes.dex
renamed.0=classes.dex
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityChangeLoginpasswordBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityChangeLoginpasswordBinding.class
index 8fbd9ca..eceeb05 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityChangeLoginpasswordBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityChangeLoginpasswordBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityDeleteLoginpasswordBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityDeleteLoginpasswordBinding.class
index 19c60d1..b1005d4 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityDeleteLoginpasswordBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivityDeleteLoginpasswordBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySetLoginpasswordBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySetLoginpasswordBinding.class
index 2e1bc7a..9a7b05a 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySetLoginpasswordBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/ActivitySetLoginpasswordBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class
index 8eeeaac..97f1c74 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DatetimePickerBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogPwdBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogPwdBinding.class
index 83a6bca..fac8671 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogPwdBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogPwdBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class
index 5bf65e9..65eb50d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/FolderListItemBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class
index 7db3109..9189ca4 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteEditBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class
index 170cb55..2794a97 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteItemBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class
index 9356946..b7fef3b 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class
index 1ea7773..5d8bbb4 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/NoteListDropdownMenuBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class
index c97a066..5f0cb38 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/SettingsHeaderBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class
index bd9e91e..8e1ff5d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget2xBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class
index 38c527a..2721c7c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/Widget4xBinding.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class
index f1f018b..b118bf9 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class
index fe44750..2fc4405 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index fdb27d9..e2f48a5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index e1a9a5b..f80b52d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class
index cff290b..7cc005d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index b67c67d..448ef9a 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class
index 1345916..10a9c28 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 3edff79..925198e 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class
index 00dd59d..7db3d57 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class
index a6295a8..6315ae6 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 879a444..8ba070e 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index d255a04..83b72f8 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 9013b31..1d8c1f3 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
index ea48cfd..55bbd3d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class
index 20179d7..534f1ad 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class
index 5f89b9a..72327f3 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class
index 82acf7d..595cbfe 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class
index 7019d47..2570c09 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class
index edcd669..9d64176 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 547db85..dd6da87 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index a263b14..eaf1327 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 260cd42..ca9e8d7 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 09f8a3d..e8fb992 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class
index fd96699..c54c8ca 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class
index 34dc9a6..2e0a1e5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class
index bb185a0..9838fd0 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class
index 5e4845b..7f9b4c7 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class
index 6bd4eff..b633c9d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$14.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index 89f1f0c..a95a692 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index e6616d5..e183b5c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 6f30609..494d5ce 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index f31b79c..a1bff2d 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index 957f9e7..a3727dd 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 10843b4..5410a11 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 4c380a9..252a257 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 151f005..2a73ae5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 146a103..e41bd10 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class
index 8b90717..8716d3c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index eb6d9a5..c8091c0 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index 36217cd..1fe66e0 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index eab3704..47aef1c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 36e6382..756e019 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 21ba74c..5e78723 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 7ee8481..a9f4455 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 44e9806..8d258c5 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 0ac7c57..ea556ac 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 089c38e..a7d2a73 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index bc64641..80a294c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class
index f252065..b78e029 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class differ
diff --git a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index da1d627..23d3a1c 100644
Binary files a/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 0b5ecc0..279ae1b 100644
--- a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -4,344 +4,345 @@
4 android:versionCode="1"
5 android:versionName="0.1" >
6 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44
+6-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44
7 android:minSdkVersion="21"
-7-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41
+7-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:15-41
8 android:targetSdkVersion="21" />
-8-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44
+8-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:6:5-44
9
10
11
-11-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81
-11-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78
+11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:5-81
+11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:9:22-78
12
-12-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88
-12-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85
+12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:5-88
+12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:10:22-85
13
-13-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67
-13-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64
+13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:5-67
+13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:11:22-64
14
-14-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72
-14-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69
+14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:5-72
+14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:12:22-69
15
-15-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74
-15-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71
+15-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:5-74
+15-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:13:22-71
16
-16-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80
-16-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77
+16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:5-80
+16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:14:22-77
17
-17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71
-17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68
+17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:5-71
+17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:15:22-68
18
-18-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74
-18-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71
+18-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:5-74
+18-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:16:22-71
19
-19-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81
-19-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78
+19-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:5-81
+19-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:17:22-78
20
21 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-175:19
+21-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:19:5-177:19
22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
22-->[com.android.support:support-compat:28.0.0] D:\ASSDK\caches\transforms-3\d9f0b9f6301870925ec9be62a3ecf027\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91
23 android:debuggable="true"
24 android:icon="@drawable/icon_app"
-24-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42
+24-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:20:9-42
25 android:label="@string/app_name"
-25-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41
+25-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:21:9-41
26 android:testOnly="true" >
27 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:22:9-32:20
-28 android:name="net.micode.notes.ui.SplashActivity"
-28-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:13-46
-29 android:configChanges="orientation|keyboardHidden|screenSize"
-29-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-74
-30 android:label="@string/title_activity_splash"
-30-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-58
-31 android:theme="@style/Theme.Notes.Fullscreen" >
-31-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-58
-32
-32-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-33
-33-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-33-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-34
-35
-35-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-35-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-36
-37
-38 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:9-47:20
-39 android:name="net.micode.notes.ui.LoginActivity"
-39-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:34:13-45
-40 android:configChanges="keyboardHidden|orientation|screenSize"
-40-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:13-74
-41 android:label="@string/app_name"
-41-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:36:13-45
-42 android:launchMode="singleTop"
-42-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:37:13-43
-43 android:theme="@style/NoteTheme"
-43-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:13-45
-44 android:uiOptions="splitActionBarWhenNarrow"
-44-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-57
-45 android:windowSoftInputMode="adjustPan" >
-45-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-52
-46
-46-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-47
-47-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-47-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-48
-49
-49-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-49-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-50
-51
-52 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:9-55:20
-53 android:name="net.micode.notes.ui.ChangedLoginPassword"
-53-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-52
-54 android:configChanges="keyboardHidden|orientation|screenSize"
-54-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-74
-55 android:label="@string/app_name"
-55-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
-56 android:launchMode="singleTop"
-56-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-43
-57 android:theme="@style/NoteTheme"
-57-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:53:13-45
-58 android:windowSoftInputMode="adjustPan" >
-58-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:13-52
-59
-60 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:9-63:20
-61 android:name="net.micode.notes.ui.RegisterLoginPassword"
-61-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-53
-62 android:configChanges="keyboardHidden|orientation|screenSize"
-62-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-74
-63 android:label="@string/app_name"
-63-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
-64 android:launchMode="singleTop"
-64-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-43
-65 android:theme="@style/NoteTheme"
-65-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:61:13-45
-66 android:windowSoftInputMode="adjustPan" >
-66-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:13-52
-67
-68 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:9-71:20
-69 android:name="net.micode.notes.ui.DeleteLoginPassword"
-69-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:65:13-51
-70 android:configChanges="keyboardHidden|orientation|screenSize"
-70-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-74
-71 android:label="@string/app_name"
-71-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-45
-72 android:launchMode="singleTop"
-72-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:68:13-43
-73 android:theme="@style/NoteTheme"
-73-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:69:13-45
-74 android:windowSoftInputMode="adjustPan" >
-74-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:70:13-52
-75
-76 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:72:9-83:20
-77 android:name="net.micode.notes.ui.NotesListActivity"
-77-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:73:13-49
-78 android:configChanges="keyboardHidden|orientation|screenSize"
-78-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:13-74
-79 android:label="@string/app_name"
-79-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-45
-80 android:launchMode="singleTop"
-80-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-43
-81 android:theme="@style/NoteTheme"
-81-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
-82 android:windowSoftInputMode="adjustPan" >
-82-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-52
-83
-83-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-31:29
-84
-84-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:17-69
-84-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:25-66
-85
-86
-86-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:17-77
-86-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:27-74
-87
-88
-89 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:84:9-120:20
-90 android:name="net.micode.notes.ui.NoteEditActivity"
-90-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:85:13-48
-91 android:configChanges="keyboardHidden|orientation|screenSize"
-91-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:13-74
-92 android:launchMode="singleTop"
-92-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-43
-93 android:theme="@style/NoteTheme" >
-93-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-45
-94
-95
-96
-96-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:91:13-100:29
-96-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:92:17-38
-97
-97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-69
-97-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:25-66
-98
-99
-99-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-99-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-100
-101
-101-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-101-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-102
-102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-102-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-103
-104
-105
-105-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:102:13-109:29
-106
-106-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:17-79
-106-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:103:25-76
-107
-108
-108-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-108-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-109
-110
-110-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-110-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-111
-111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-78
-111-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:23-75
-112
-113
-114
-114-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:111:13-115:29
-115
-115-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:17-71
-115-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:112:25-68
-116
-117
-117-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-76
-117-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:27-73
-118
-119
-120 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:117:13-119:54
-121 android:name="android.app.searchable"
-121-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:118:17-54
-122 android:resource="@xml/searchable" />
-122-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:17-51
-123
-124 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:9-124:43
-125 android:name="net.micode.notes.data.NotesProvider"
-125-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:122:13-47
-126 android:authorities="micode_notes"
-126-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:13-47
-127 android:multiprocess="true" />
-127-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-40
-128 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:9-137:20
-129 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-129-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-57
-130 android:label="@string/app_widget2x2" >
-130-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:13-50
-131
-131-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-132:29
-132
-132-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:17-84
-132-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:25-81
-133
-133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:17-85
-133-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:25-82
-134
-134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-85
-134-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-82
-135
-136
-137 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:134:13-136:58
-138 android:name="android.appwidget.provider"
-138-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:135:17-58
-139 android:resource="@xml/widget_2x_info" />
-139-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:17-55
-140
-141 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:9-150:20
-142 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-142-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:139:13-57
-143 android:label="@string/app_widget4x4" >
-143-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:13-50
-144
-144-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-132:29
-145
-145-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:17-84
-145-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:25-81
-146
-146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:17-85
-146-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:25-82
-147
-147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-85
-147-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-82
-148
-149
-150 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:134:13-136:58
-151 android:name="android.appwidget.provider"
-151-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:135:17-58
-152 android:resource="@xml/widget_4x_info" />
-152-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:17-55
-153
-154
-154-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:9-155:20
-154-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:151:19-55
-155
-155-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:152:13-154:29
-156
-156-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:17-79
-156-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:25-76
-157
-158
-159 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:156:9-158:41
-160 android:name="net.micode.notes.ui.AlarmReceiver"
-160-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:157:13-45
-161 android:process=":remote" />
-161-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:13-38
-162 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:9-163:78
-163 android:name="net.micode.notes.ui.AlarmAlertActivity"
-163-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-50
-164 android:label="@string/app_name"
-164-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:13-45
-165 android:launchMode="singleInstance"
-165-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-48
-166 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
-166-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-75
-167 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:9-168:63
-168 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-168-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-55
-169 android:label="@string/preferences_title"
-169-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:13-54
-170 android:launchMode="singleTop"
-170-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-43
-171 android:theme="@android:style/Theme.Holo.Light" />
-171-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-60
-172 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:9-171:40
-173 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-173-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-58
-174 android:exported="false" />
-174-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:13-37
-175 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:9-174:52
-176 android:name="android.app.default_searchable"
-176-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-58
-177 android:value=".ui.NoteEditActivity" />
-177-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:13-49
-178
-179
-180
+27-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:23:9-37:20
+28 android:name="net.micode.notes.ui.LoginActivity"
+28-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:24:13-45
+29 android:configChanges="keyboardHidden|orientation|screenSize"
+29-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:25:13-74
+30 android:label="@string/app_name"
+30-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:26:13-45
+31 android:launchMode="singleTop"
+31-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:27:13-43
+32 android:theme="@style/NoteTheme"
+32-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:28:13-45
+33 android:uiOptions="splitActionBarWhenNarrow"
+33-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:29:13-57
+34 android:windowSoftInputMode="adjustPan" >
+34-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:30:13-52
+35
+35-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+36
+36-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+36-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+37
+38
+38-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+38-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+39
+40
+41 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:38:9-45:20
+42 android:name="net.micode.notes.ui.ChangedLoginPassword"
+42-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:39:13-52
+43 android:configChanges="keyboardHidden|orientation|screenSize"
+43-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:40:13-74
+44 android:label="@string/app_name"
+44-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:41:13-45
+45 android:launchMode="singleTop"
+45-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:42:13-43
+46 android:theme="@style/NoteTheme"
+46-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:43:13-45
+47 android:windowSoftInputMode="adjustPan" >
+47-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:44:13-52
+48
+49 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:46:9-53:20
+50 android:name="net.micode.notes.ui.RegisterLoginPassword"
+50-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:47:13-53
+51 android:configChanges="keyboardHidden|orientation|screenSize"
+51-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:48:13-74
+52 android:label="@string/app_name"
+52-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:49:13-45
+53 android:launchMode="singleTop"
+53-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:50:13-43
+54 android:theme="@style/NoteTheme"
+54-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:51:13-45
+55 android:windowSoftInputMode="adjustPan" >
+55-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:52:13-52
+56
+57 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:54:9-61:20
+58 android:name="net.micode.notes.ui.DeleteLoginPassword"
+58-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:55:13-51
+59 android:configChanges="keyboardHidden|orientation|screenSize"
+59-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:56:13-74
+60 android:label="@string/app_name"
+60-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:57:13-45
+61 android:launchMode="singleTop"
+61-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:58:13-43
+62 android:theme="@style/NoteTheme"
+62-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:59:13-45
+63 android:windowSoftInputMode="adjustPan" >
+63-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:60:13-52
+64
+65 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:62:9-72:20
+66 android:name="net.micode.notes.ui.SplashActivity"
+66-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:63:13-46
+67 android:configChanges="orientation|keyboardHidden|screenSize"
+67-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:64:13-74
+68 android:label="@string/title_activity_splash"
+68-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:66:13-58
+69 android:theme="@style/Theme.Notes.Fullscreen" >
+69-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:67:13-58
+70
+70-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+71
+71-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+71-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+72
+73
+73-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+73-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+74
+75
+76
+77 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:74:9-85:20
+78 android:name="net.micode.notes.ui.NotesListActivity"
+78-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:75:13-49
+79 android:configChanges="keyboardHidden|orientation|screenSize"
+79-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:76:13-74
+80 android:label="@string/app_name"
+80-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:77:13-45
+81 android:launchMode="singleTop"
+81-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:78:13-43
+82 android:theme="@style/NoteTheme"
+82-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:79:13-45
+83 android:windowSoftInputMode="adjustPan" >
+83-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:80:13-52
+84
+84-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:32:13-36:29
+85
+85-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:17-69
+85-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:33:25-66
+86
+87
+87-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:17-77
+87-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:35:27-74
+88
+89
+90 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:86:9-122:20
+91 android:name="net.micode.notes.ui.NoteEditActivity"
+91-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:87:13-48
+92 android:configChanges="keyboardHidden|orientation|screenSize"
+92-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:88:13-74
+93 android:launchMode="singleTop"
+93-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:89:13-43
+94 android:theme="@style/NoteTheme" >
+94-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:90:13-45
+95
+96
+97
+97-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:93:13-102:29
+97-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:94:17-38
+98
+98-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:17-69
+98-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:96:25-66
+99
+100
+100-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+100-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+101
+102
+102-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+102-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+103
+103-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+103-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+104
+105
+106
+106-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:104:13-111:29
+107
+107-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:17-79
+107-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:105:25-76
+108
+109
+109-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+109-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+110
+111
+111-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+111-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+112
+112-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:17-78
+112-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:100:23-75
+113
+114
+115
+115-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:113:13-117:29
+116
+116-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:17-71
+116-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:114:25-68
+117
+118
+118-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:17-76
+118-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:98:27-73
+119
+120
+121 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:119:13-121:54
+122 android:name="android.app.searchable"
+122-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:120:17-54
+123 android:resource="@xml/searchable" />
+123-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:121:17-51
+124
+125 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:123:9-126:43
+126 android:name="net.micode.notes.data.NotesProvider"
+126-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:124:13-47
+127 android:authorities="micode_notes"
+127-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:125:13-47
+128 android:multiprocess="true" />
+128-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:126:13-40
+129 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:127:9-139:20
+130 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+130-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:128:13-57
+131 android:label="@string/app_widget2x2" >
+131-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:129:13-50
+132
+132-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29
+133
+133-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84
+133-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81
+134
+134-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85
+134-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82
+135
+135-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85
+135-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82
+136
+137
+138 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58
+139 android:name="android.appwidget.provider"
+139-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58
+140 android:resource="@xml/widget_2x_info" />
+140-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55
+141
+142 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:140:9-152:20
+143 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+143-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:141:13-57
+144 android:label="@string/app_widget4x4" >
+144-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:142:13-50
+145
+145-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:130:13-134:29
+146
+146-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:17-84
+146-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:131:25-81
+147
+147-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:17-85
+147-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:132:25-82
+148
+148-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:17-85
+148-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:133:25-82
+149
+150
+151 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:136:13-138:58
+152 android:name="android.appwidget.provider"
+152-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:137:17-58
+153 android:resource="@xml/widget_4x_info" />
+153-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:138:17-55
+154
+155
+155-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:9-157:20
+155-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:153:19-55
+156
+156-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:154:13-156:29
+157
+157-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:17-79
+157-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:155:25-76
+158
+159
+160 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:158:9-160:41
+161 android:name="net.micode.notes.ui.AlarmReceiver"
+161-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:159:13-45
+162 android:process=":remote" />
+162-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:160:13-38
+163 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:161:9-165:78
+164 android:name="net.micode.notes.ui.AlarmAlertActivity"
+164-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:162:13-50
+165 android:label="@string/app_name"
+165-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:163:13-45
+166 android:launchMode="singleInstance"
+166-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:164:13-48
+167 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+167-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:165:13-75
+168 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:166:9-170:63
+169 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+169-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:167:13-55
+170 android:label="@string/preferences_title"
+170-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:168:13-54
+171 android:launchMode="singleTop"
+171-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:169:13-43
+172 android:theme="@android:style/Theme.Holo.Light" />
+172-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:170:13-60
+173 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:171:9-173:40
+174 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+174-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:172:13-58
+175 android:exported="false" />
+175-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:173:13-37
+176 D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:174:9-176:52
+177 android:name="android.app.default_searchable"
+177-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:175:13-58
+178 android:value=".ui.NoteEditActivity" />
+178-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\src\main\AndroidManifest.xml:176:13-49
+179
+180
+181
diff --git a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
index 16b4782..122fc23 100644
--- a/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -3,30 +3,30 @@
3 package="net.micode.notes.test" >
4
5 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:5-74
+5-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:5-74
6 android:minSdkVersion="21"
-6-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:15-41
+6-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:15-41
7 android:targetSdkVersion="21" />
-7-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:5:42-71
+7-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:5:42-71
8
9 D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:11:5-15:66
+9-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:11:5-15:66
10 android:name="android.test.InstrumentationTestRunner"
-10-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:11:22-75
+10-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:11:22-75
11 android:functionalTest="false"
-11-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:14:22-52
+11-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:14:22-52
12 android:handleProfiling="false"
-12-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:13:22-53
+12-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:13:22-53
13 android:label="Tests for net.micode.notes"
-13-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:15:22-64
+13-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:15:22-64
14 android:targetPackage="net.micode.notes" />
-14-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:12:22-62
+14-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:12:22-62
15
16
-16-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:7:5-9:19
+16-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:7:5-9:19
17
-17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:8:9-60
-17-->D:\SoftWareEngineering\b_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest1652767463974212737.xml:8:23-57
+17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:8:9-60
+17-->D:\SoftWareEngineering\a_branch\xiaomi\src\Notes\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17568062568050340915.xml:8:23-57
18
19
20
diff --git a/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 375c595..83bed53 100644
--- a/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -24,17 +24,6 @@
android:icon="@drawable/icon_app"
android:label="@string/app_name"
android:testOnly="true" >
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
call = baiduTranslateService.translate(word, from, to, appid, salt, sign);
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(retrofit2.Call call, Response response) {
+ Log.d(TAG, "onResponse: 请求成功");
+ RespondBean respondBean = response.body();
+ String result = respondBean.getTrans_result().get(0).getDst();
+ editable.setText(result);
+ Log.d(TAG, "中译英结果" + result);
+ }
+ @Override
+ public void onFailure(retrofit2.Call call, Throwable t) {
+ Log.d(TAG, "onResponse: 请求失败 " + t);
+ }
+ });
+ }
+
+ public void translate_u2z() {
+ final EditText editable = findViewById(R.id.note_edit_view);
+ String word = editable.getText().toString();
+ word = word.replaceAll("\\n", "//");
+ String from ="en";
+ String to="zh";
+ final String appid="20250106002246245";
+ String key="9FW9ybSm5bOw4L12SPIX";
+ String salt=(int)(Math.random()*100+1)+"";
+ String secretKey=appid+word+salt+key;
+ String sign=MD5Utils.getMD5Code(secretKey);
+ Log.d(TAG,"secretKey: "+secretKey);
+ Log.d(TAG,"sign: "+sign);
+ Retrofit retrofitBaidu = new Retrofit.Builder()
+ .baseUrl("https://fanyi-api.baidu.com/api/trans/vip/")
+ .addConverterFactory(GsonConverterFactory.create())
+ .build();
+ BaiduTranslateService baiduTranslateService = retrofitBaidu.create(BaiduTranslateService.class);
+ retrofit2.Call call = baiduTranslateService.translate(word, from, to, appid, salt, sign);
+ call.enqueue(new Callback() {
+ @Override
+ public void onResponse(retrofit2.Call call, Response response) {
+ Log.d(TAG, "onResponse: 请求成功");
+ RespondBean respondBean = response.body();
+ String result = respondBean.getTrans_result().get(0).getDst();
+ editable.setText(result);
+ Log.d(TAG, "英译中结果" + result);
+ }
+
+ @Override
+ public void onFailure(retrofit2.Call call, Throwable t) {
+ Log.d(TAG, "onResponse: 请求失败 " + t);
+ }
+ });
+ }
//获取图片路径
+ @RequiresApi(api = Build.VERSION_CODES.KITKAT)
public String getPath(final Context context, final Uri uri) {
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
@@ -1374,6 +1505,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return null;
}
+ @RequiresApi(api = Build.VERSION_CODES.KITKAT)
protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
super.onActivityResult(requestCode, resultCode, intent);
ContentResolver resolver = getContentResolver();
@@ -1518,8 +1650,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public void onTextChanged(CharSequence s, int start, int before, int count) {
- /*currentLength = editText.getText().length() + 100;*/
- currentLength = 100;
+ currentLength = editText.getText().length() - countSpacesAndNewlines(s)[0] - countSpacesAndNewlines(s)[1] - countSpacesAndNewlines(s)[2];
}
public void afterTextChanged(Editable s) {
@@ -1614,9 +1745,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return stringBuffer.toString();
}
-
-
-
-
-
}
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 8e3e59f..b4bc297 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -40,7 +40,7 @@ import java.util.Map;
/**
* 自定义的可编辑文本视图,支持文本变化监听、删除和新增文本事件。
*/
-public class NoteEditText extends EditText {
+public class NoteEditText extends android.support.v7.widget.AppCompatEditText {
private static final String TAG = "NoteEditText";
private int mIndex; // 当前文本视图的索引
private int mSelectionStartBeforeDelete; // 删除操作前的选择起始位置
diff --git a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 936fc55..f238a29 100644
--- a/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -67,6 +67,7 @@ import net.micode.notes.R;
import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.NotesDatabaseHelper;
+import net.micode.notes.data.NotesProvider;
import net.micode.notes.gtask.remote.GTaskSyncService;
import net.micode.notes.model.WorkingNote;
import net.micode.notes.tool.BackupUtils;
@@ -692,24 +693,24 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
*/
private void batchDelete() {
new AsyncTask>() {
- // 在后台执行任务,获取选中的widgets并执行删除操作
protected HashSet doInBackground(Void... unused) {
- // 获取当前选中的widgets
HashSet widgets = mNotesListAdapter.getSelectedWidget();
- if (!isSyncMode()) {
- // 如果当前不处于同步模式,直接删除笔记
+ if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ // 只需要修改这里
+ // if in trash, really delete notes
if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
.getSelectedItemIds())) {
- // 删除成功无需额外操作
} else {
- // 删除失败,记录错误
Log.e(TAG, "Delete notes error, should not happens");
}
} else {
- // 如果处于同步模式,将笔记移动到回收站文件夹
- if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
- .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
- // 移动失败,记录错误
+ HashSet ids=mNotesListAdapter.getSelectedItemIds();
+ for(Long id : ids){
+ if(NotesProvider.isPrivateNote(id)){
+ ids.remove(id);
+ }
+ }
+ // move notes to trash
+ if (!DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens");
}
}
@@ -1256,6 +1257,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
public void onClick(DialogInterface dialog, int which){}
})
*/
+
dialog.show();
startAsyncNotesListQuery();
Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show();
@@ -1298,14 +1300,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
default:
break;
}
+
+
+ if (item.getItemId() == R.id.menu_trash) {
+ openTrashFolder();
+ }
return true;
}
- /**
- * 处理搜索请求。
- *
- * @return 总是返回true。
- */
+
@Override
public boolean onSearchRequested() {
startSearch(null, false, null /* appData */, false);
@@ -1504,4 +1507,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
builder.setPositiveButton(android.R.string.ok, null);
builder.show();
}
+
+ private void openTrashFolder() {
+ mCurrentFolderId = Notes.ID_TRASH_FOLER;
+ startAsyncNotesListQuery();
+ // 正常打开文件夹
+ mState = ListEditState.SUB_FOLDER;
+ // 将顶部栏设置为 data.getSnippet 文件夹名称
+ mTitleBar.setText(NotesListActivity.this
+ .getString(R.string.menu_trash));
+ // 不显示底部的“写便签”
+ mAddNewNote.setVisibility(View.GONE);
+ mTitleBar.setVisibility(View.VISIBLE);
+ }
}
diff --git a/src/Notes/app/src/main/res/drawable-hdpi/key.png b/src/Notes/app/src/main/res/drawable-hdpi/key.png
index 252baf3..9933b1f 100644
Binary files a/src/Notes/app/src/main/res/drawable-hdpi/key.png and b/src/Notes/app/src/main/res/drawable-hdpi/key.png differ
diff --git a/src/Notes/app/src/main/res/drawable-hdpi/menu_top.png b/src/Notes/app/src/main/res/drawable-hdpi/menu_top.png
index d8eb8ce..bbf1d66 100644
Binary files a/src/Notes/app/src/main/res/drawable-hdpi/menu_top.png and b/src/Notes/app/src/main/res/drawable-hdpi/menu_top.png differ
diff --git a/src/Notes/app/src/main/res/layout/note_edit.xml b/src/Notes/app/src/main/res/layout/note_edit.xml
index 85237a5..077c3e5 100644
--- a/src/Notes/app/src/main/res/layout/note_edit.xml
+++ b/src/Notes/app/src/main/res/layout/note_edit.xml
@@ -35,7 +35,13 @@
android:layout_width="45dp"
android:layout_height="match_parent"
android:src="@android:drawable/ic_menu_gallery" />
-
+
-
-
diff --git a/src/Notes/app/src/main/res/layout/note_list.xml b/src/Notes/app/src/main/res/layout/note_list.xml
index 5a6ae60..80db7ea 100644
--- a/src/Notes/app/src/main/res/layout/note_list.xml
+++ b/src/Notes/app/src/main/res/layout/note_list.xml
@@ -17,6 +17,8 @@
android:layout_height="fill_parent"
android:orientation="vertical">
+
+
+
diff --git a/src/Notes/app/src/main/res/menu/note_list.xml b/src/Notes/app/src/main/res/menu/note_list.xml
index c867bfb..9e5f870 100644
--- a/src/Notes/app/src/main/res/menu/note_list.xml
+++ b/src/Notes/app/src/main/res/menu/note_list.xml
@@ -22,6 +22,11 @@
android:id="@+id/menu_new_folder"
android:title="@string/menu_create_folder"/>
+
+
+
-
+
diff --git a/src/Notes/app/src/main/res/values-zh-rCN/strings.xml b/src/Notes/app/src/main/res/values-zh-rCN/strings.xml
index 1969527..29da798 100644
--- a/src/Notes/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/Notes/app/src/main/res/values-zh-rCN/strings.xml
@@ -125,6 +125,7 @@
亮背景
暗背景
+ 回收站
- %1$s 条符合“%2$s”的搜索结果
diff --git a/src/Notes/app/src/main/res/values-zh-rTW/strings.xml b/src/Notes/app/src/main/res/values-zh-rTW/strings.xml
index 8b2a760..0c7664c 100644
--- a/src/Notes/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/Notes/app/src/main/res/values-zh-rTW/strings.xml
@@ -126,6 +126,7 @@
亮背景
暗背景
+ 回收站
- %1$s 條符合”%2$s“的搜尋結果
diff --git a/src/Notes/app/src/main/res/values/strings.xml b/src/Notes/app/src/main/res/values/strings.xml
index 14b094a..ad69d49 100644
--- a/src/Notes/app/src/main/res/values/strings.xml
+++ b/src/Notes/app/src/main/res/values/strings.xml
@@ -133,6 +133,8 @@
light mode
night mode
+ Trash Folder
+
- %1$s result for \"%2$s\"
diff --git a/src/Notes/local.properties b/src/Notes/local.properties
index 949b141..f3604c4 100644
--- a/src/Notes/local.properties
+++ b/src/Notes/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed Dec 25 08:38:52 CST 2024
+#Tue Jan 07 21:08:32 CST 2025
sdk.dir=D\:\\ASSDK