diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin
index b3150f0..2cc43f3 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock
index 7a2170f..2e8f51e 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.0.2/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin
index 4a5ddfa..a042ef5 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock
index 0933c7a..ca4f902 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.0.2/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
index b954a72..dbed582 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.0.2/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin
index e3f53fa..d6c43f8 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/classAnalysis.bin differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin
index 58dc9e3..aa783b0 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/jarAnalysis.bin differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock
index d9f082c..de6a3c5 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock and b/src/Notes-master1/.gradle/7.0.2/javaCompile/javaCompile.lock differ
diff --git a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin
index 666a559..1652bda 100644
Binary files a/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin and b/src/Notes-master1/.gradle/7.0.2/javaCompile/taskHistory.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index e7beeac..9721d68 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
index e351e75..eae62ba 100644
Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml b/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml
deleted file mode 100644
index 66fe8d4..0000000
--- a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml b/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml
deleted file mode 100644
index 32054aa..0000000
--- a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml b/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml
deleted file mode 100644
index c3449f5..0000000
--- a/src/Notes-master1/.idea/libraries/Gradle__________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml
new file mode 100644
index 0000000..e2ebab2
--- /dev/null
+++ b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml
new file mode 100644
index 0000000..ff007d0
--- /dev/null
+++ b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml
new file mode 100644
index 0000000..73febf0
--- /dev/null
+++ b/src/Notes-master1/.idea/libraries/Gradle________________StudioProjects_Notes_master1_gradle_httpcomponents_client_4_5_12_bin_httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/libraries/Gradle__org_apache_http_legacy.xml b/src/Notes-master1/.idea/libraries/Gradle__org_apache_http_legacy.xml
deleted file mode 100644
index c2cd5b2..0000000
--- a/src/Notes-master1/.idea/libraries/Gradle__org_apache_http_legacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml b/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml
index 9be7c08..3036eb4 100644
--- a/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml
+++ b/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml
@@ -40,13 +40,14 @@
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/runConfigurations.xml b/src/Notes-master1/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/src/Notes-master1/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
new file mode 100644
index 0000000..a4843ed
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a
@@ -0,0 +1,39 @@
+
+7
+java:S1116,"Remove this empty statement.(
+K
+java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.(
+J
+java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(
+B
+java:S1125_"'Remove the unnecessary boolean literal.(ɯ
+J
+java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(
+B
+java:S1125o"'Remove the unnecessary boolean literal.(ɯ
+A
+java:S1168|"+Return an empty collection instead of null.(
+C
+java:S1125"'Remove the unnecessary boolean literal.(
+t
+java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə
+o
+java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").(
+o
+java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ
+J
+java:S1066U"/Merge this if statement with the enclosing one.(ڧ
+
+java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+
+java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+j
+java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ
+q
+java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬
+E
+java:S5411_"*Use the primitive boolean expression here.(ɯ
+E
+java:S5411o"*Use the primitive boolean expression here.(ɯ
+F
+java:S5411"*Use the primitive boolean expression here.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/2/d/2dae9e201211336406ea62ae1a884241b0a8d3e6 b/src/Notes-master1/.idea/sonarlint/issuestore/2/d/2dae9e201211336406ea62ae1a884241b0a8d3e6
new file mode 100644
index 0000000..dce5b03
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/2/d/2dae9e201211336406ea62ae1a884241b0a8d3e6
@@ -0,0 +1,32 @@
+
+k java:S116"VRename this field "OldPassword" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+k java:S116"VRename this field "NewPassword" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+k java:S116"VRename this field "AckPassword" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+q java:S116"WRename this field "Acknowledged" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(σ
+k java:S116"QRename this field "GoBack" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+=
+java:S11252"'Remove the unnecessary boolean literal.(줗
+=
+java:S11252"'Remove the unnecessary boolean literal.(줗
+=
+java:S11252"'Remove the unnecessary boolean literal.(줗
+B
+java:S11254"'Remove the unnecessary boolean literal.(ڂ
+=
+java:S11257"'Remove the unnecessary boolean literal.(
+=
+java:S1125;"'Remove the unnecessary boolean literal.(嚹
+=
+java:S1125;"'Remove the unnecessary boolean literal.(嚹
+f java:S117-"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ɨ
+f java:S117."QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ӏ
+k java:S117/"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ۉ
+e java:S1171"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(
+>
+java:S1604""(Make this anonymous inner class a lambda(
+C
+java:S1604*"(Make this anonymous inner class a lambda(
+M
+java:S2589;"7Remove this expression which always evaluates to "true"(嚹
+M
+java:S2589;"7Remove this expression which always evaluates to "true"(嚹
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56 b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
new file mode 100644
index 0000000..3c47ecb
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/32360bf24febc78f20db52498c7576b3d8650d56
@@ -0,0 +1,27 @@
+
+Z
+java:S2147H"DCombine this catch with the one at line 70, which has the same body.(暩
+[
+java:S2147o"ECombine this catch with the one at line 109, which has the same body.(暩
+k
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+f
+java:S3252"OUse static access with "net.micode.notes.data.Notes$DataColumns" for "NOTE_ID".(ʹ
+m
+java:S3252"QUse static access with "net.micode.notes.data.Notes$DataColumns" for "MIME_TYPE".(
+b
+java:S1192G"GDefine a constant instead of duplicating this literal "%s: %s" 4 times.(
+c
+java:S1192{"HDefine a constant instead of duplicating this literal "=? AND " 4 times.(
+K
+java:S1066"/Merge this if statement with the enclosing one.(䲜
+v
+java:S1319+"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+{
+java:S1319V"`The type of "ids" should be an interface such as "Set" rather than the implementation "HashSet".(
+
+java:S1319"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(
+T
+java:S11550">Use isEmpty() to check whether the collection is empty or not.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312 b/src/Notes-master1/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312
index 2f619fc..bf1f2d6 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/5/4529b3a97b0f3b19b895aa06f23bed63ff38a312
@@ -1,21 +1,11 @@
-T
-java:S1874K"9Remove this use of "DefaultHttpClient"; it is deprecated.(믥
H
java:S1874"2Remove this use of "HttpParams"; it is deprecated.(ŋE
-M
-java:S1874"7Remove this use of "BasicHttpParams"; it is deprecated.(ŋE
X
java:S1874"").(各
\ No newline at end of file
+java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(各
+j
+java:S2095"LUse try-with-resources or close this "BufferedReader" in a "finally" clause.(ƈ8/
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
index a7451e5..05d8b53 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c
@@ -1,35 +1,38 @@
u
-java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(8/
+java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.(8/
n
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ
O
-java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((
K
-java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ
+java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ
_
-java:S1126"AReplace this if-then-else statement by a single return statement.(8Ã/
+java:S1126"AReplace this if-then-else statement by a single return statement.(8Ã/
?
-java:S1116"Remove this empty statement.(8ƃ/
+java:S1116"Remove this empty statement.(8ƃ/
\
-java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(8˃/
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(8˃/
+> java:S131""Add a default case to this switch.(V8/
N
-java:S1874"0Remove this use of "getColor"; it is deprecated.(8߃/
+java:S1874"0Remove this use of "getColor"; it is deprecated.(8߃/
k
-java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(8/
+java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(8/
\
-java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(8Ⴠ/
+java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(8Ⴠ/
[
-java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð8ꃀ/
+java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð8ꃀ/
Y
-java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(8냀/
+java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(8냀/
b
-java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ8냀/
+java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ8냀/
+K
+java:S1604"(Make this anonymous inner class a lambda(Ҿ8/
F
-java:S1604"(Make this anonymous inner class a lambda(ά8/
+java:S1604"(Make this anonymous inner class a lambda(ά8η/
F
-java:S1604"(Make this anonymous inner class a lambda(8/
+java:S1604"(Make this anonymous inner class a lambda(8/
F
-java:S1604"(Make this anonymous inner class a lambda(ߒ8/
+java:S1604"(Make this anonymous inner class a lambda(ߒ8/
V
-java:S3516"9Refactor this method to not always return the same value.(l8څ/
\ No newline at end of file
+java:S3516"9Refactor this method to not always return the same value.(l8څ/
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
index 870c3c5..99fab85 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32
@@ -36,18 +36,24 @@ java:S1135
java:S1126"BReplace this if-then-else statement by a single method invocation.(玒
N
java:S1135"2Complete the task associated to this TODO comment.(
-h
-java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b
-<
-java:S3398"%Move this method into "ModeCallback".(
-A
-java:S3398"%Move this method into "ModeCallback".(
+E
+java:S1125"'Remove the unnecessary boolean literal.(8/
+p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ͤ8/
+j java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(78/
+p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8/
+o
+java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8/
K
java:S3398"/Move this method into "BackgroundQueryHandler".(
+<
+java:S3398"%Move this method into "ModeCallback".(
+H
+java:S3398"%Move this method into "ModeCallback".(8/
G
java:S3398"0Move this method into "OnListItemClickListener".(
p
java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥
+m java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8/
>
java:S1604"(Make this anonymous inner class a lambda(̺V
?
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f b/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
new file mode 100644
index 0000000..a03ab8b
--- /dev/null
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/c/6/c65f5dc8218ef1da6f6bfb5d1b14aea855a54d7f
@@ -0,0 +1,27 @@
+
+[
+java:S11241"EReorder the modifiers to comply with the Java Language Specification.(Ɠ
+`
+java:S11249"EReorder the modifiers to comply with the Java Language Specification.(
+D
+java:S2140M")Use "java.util.Random.nextInt()" instead.(
+U
+java:S1118S":Add a private constructor to hide the implicit public one.(Ū
+`
+java:S1124T"EReorder the modifiers to comply with the Java Language Specification.(
+`
+java:S1124\"EReorder the modifiers to comply with the Java Language Specification.(
+`
+java:S1124d"EReorder the modifiers to comply with the Java Language Specification.(
+[
+java:S1124l"EReorder the modifiers to comply with the Java Language Specification.(ɜ
+Q
+java:S1118":Add a private constructor to hide the implicit public one.(ֹ
+a
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
+a
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
+V
+java:S1118":Add a private constructor to hide the implicit public one.(
+\
+java:S1124"EReorder the modifiers to comply with the Java Language Specification.(
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
index 7837428..77f8311 100644
--- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
+++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb
@@ -3,8 +3,6 @@
settings.gradle,0\5\05efc8b1657769a27696d478ded1e95f38737233
@
local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca
-o
-?app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java,2\b\2bfc771e07e87c37d3a76a2c815bc8fb30649798
<
build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
X
@@ -21,37 +19,47 @@ d
4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f
j
:app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5
-g
-7app/src/main/java/net/micode/notes/gtask/data/Node.java,3\a\3aac5305cb73bfbdeb8078cd264d04323fa80e92
j
:app/src/main/java/net/micode/notes/gtask/data/SqlData.java,9\3\934a4e2abf19d28a53f6aeb1dcd99248c44b6892
-b
-2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5
k
;app/src/main/java/net/micode/notes/gtask/data/MetaData.java,c\1\c182d0c9c237ea8a46a92ccaae9bb5c751923a88
j
:app/src/main/java/net/micode/notes/gtask/data/SqlNote.java,f\1\f1226eeacd46c914d51f3d1a6d6f27377490d2a4
-g
-7app/src/main/java/net/micode/notes/gtask/data/Task.java,d\1\d187f1271655c3d91661a39fe6de395b6a9f290a
-k
-;app/src/main/java/net/micode/notes/gtask/data/TaskList.java,e\0\e094aec5c3e1b6f44539adff3114f5a1ad603ddc
s
Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468cfdd0b71d4098903b9070e364658e2fbcf
-p
-@app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java,4\5\4529b3a97b0f3b19b895aa06f23bed63ff38a312
q
Aapp/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java,a\b\ab153b0256bc5f6c194e188cec0b8e327e347a90
-l
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/.idea/workspace.xml b/src/Notes-master1/.idea/workspace.xml
index d025986..6743fa2 100644
--- a/src/Notes-master1/.idea/workspace.xml
+++ b/src/Notes-master1/.idea/workspace.xml
@@ -12,19 +12,288 @@
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
deleted file mode 100644
index 0637a08..0000000
--- a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
index 767aac4..06b68a1 100644
Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simfang.ttf.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simfang.ttf.jar
new file mode 100644
index 0000000..2853af6
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simfang.ttf.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simhei.ttf.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simhei.ttf.jar
new file mode 100644
index 0000000..4d5c7c6
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simhei.ttf.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simkai.ttf.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simkai.ttf.jar
new file mode 100644
index 0000000..ace8e29
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simkai.ttf.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsun.ttc.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsun.ttc.jar
new file mode 100644
index 0000000..ae98fcf
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsun.ttc.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsunb.ttc.jar b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsunb.ttc.jar
new file mode 100644
index 0000000..6dcbdc6
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compressed_assets/debug/out/assets/Fonts/simsunb.ttc.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
index 9f88d2d..37de0c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
index 6cd31e7..9a1ac53 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
index fbe08fb..4794014 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
index dc818f1..94f5f93 100644
Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_0/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_0/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_0/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_1/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_1/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_1/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_2/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_2/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_2/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_3/graph.bin
similarity index 100%
rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_a1c0eadc0180a982642eee4f01ca65cf90a23056948d198f7218a7690fe7f4e8_bucket_3/graph.bin
rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_860cdf78987e1ee2102096dbfe4d6c10b0632f25b579bd0ebbae288f165f0b62_bucket_3/graph.bin
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
index d54dd75..c48ac26 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex
deleted file mode 100644
index 4fd3ada..0000000
Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index b5b5945..e281b00 100644
Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5gxKPa6sQzhzDUCbKXxg94LNGbQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5gxKPa6sQzhzDUCbKXxg94LNGbQ=
deleted file mode 100644
index 76df262..0000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5gxKPa6sQzhzDUCbKXxg94LNGbQ= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SmZyljaD9vd4V5YPBe2njsJM8Qw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SmZyljaD9vd4V5YPBe2njsJM8Qw=
deleted file mode 100644
index 163dc43..0000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SmZyljaD9vd4V5YPBe2njsJM8Qw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wVkx1Try4wXddI4tYMkqIafLJWw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wVkx1Try4wXddI4tYMkqIafLJWw=
deleted file mode 100644
index 84b2430..0000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wVkx1Try4wXddI4tYMkqIafLJWw= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index a887559..09f0c32 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master1/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-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 0d1dbb6..c28ffbb 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master1/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-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
index 3642347..b4f38a8 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
@@ -1,96 +1,100 @@
-#Tue Nov 02 20:02:46 CST 2021
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-D\:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+#Wed Nov 10 15:22:39 CST 2021
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_set_loginpassword.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_change_loginpassword.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_delete_loginpassword.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_login.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index c53f189..8122ea8 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+-%s--%s--%s
@@ -7,11 +7,11 @@
MessagingEmail
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 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 notesNotessetcancel
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 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 notesNotessetcancel%1$s result for \"%2$s\"%1$s results for \"%2$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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 便签便签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“的搜尋結果
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index 67e19ca..3b07f4b 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master1/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-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index a8192b9..7a26ea5 100644
--- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri Nov 05 01:12:43 CST 2021
-base.0=D\:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Wed Nov 10 15:33:27 CST 2021
+base.0=D\:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 0c3a4f3..ae031c8 100644
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/qmf3WJn1TfiqDgQgTqzd2bCSYkA= b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/qmf3WJn1TfiqDgQgTqzd2bCSYkA=
deleted file mode 100644
index 528c5b1..0000000
Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/qmf3WJn1TfiqDgQgTqzd2bCSYkA= and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt b/src/Notes-master1/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
deleted file mode 100644
index 2b6142a..0000000
--- a/src/Notes-master1/app/build/intermediates/incremental/processDebugResources/resources-list-for-resources-debug.ap_.txt
+++ /dev/null
@@ -1 +0,0 @@
-E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\color_primary_text_dark.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\color_secondary_text_dark.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_bg_btn_set_color.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_bg_color_btn_mask.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_call_record.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_clock.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_delete.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_dropdown_icon.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_blue.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_green.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_red.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_title_blue.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_title_green.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_title_red.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_title_white.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_title_yellow.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_white.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_edit_yellow.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_font_large.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_font_normal.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_font_size_selector_bg.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_font_small.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_font_super.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_icon_app.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_background.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_blue_down.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_blue_middle.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_blue_single.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_blue_up.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_folder.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_footer_bg.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_green_down.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_green_middle.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_green_single.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_green_up.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_red_down.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_red_middle.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_red_single.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_red_up.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_white_down.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_white_middle.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_white_single.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_white_up.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_yellow_down.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_yellow_middle.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_yellow_single.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_list_yellow_up.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_menu_delete.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_menu_move.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_new_note_normal.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_new_note_pressed.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_note_edit_color_selector_panel.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_notification.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_search_result.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_selected.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_title_alert.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_title_bar_bg.9.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_2x_blue.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_2x_green.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_2x_red.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_2x_white.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_2x_yellow.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_4x_blue.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_4x_green.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_4x_red.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_4x_white.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable-hdpi_widget_4x_yellow.png.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\drawable_new_note.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_account_dialog_title.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_add_account_text.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_datetime_picker.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_dialog_edit_text.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_folder_list_item.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_edit.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_edit_list_item.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_item.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_list.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_list_dropdown_menu.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_note_list_footer.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_settings_header.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_widget_2x.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\layout_widget_4x.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_call_note_edit.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_call_record_folder.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_note_edit.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_note_list.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_note_list_dropdown.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_note_list_options.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\menu_sub_folder.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\raw-zh-rCN_introduction.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\raw_introduction.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\values-zh-rCN_values-zh-rCN.arsc.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\values-zh-rTW_values-zh-rTW.arsc.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\values_values.arsc.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\xml_preferences.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\xml_searchable.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\xml_widget_2x_info.xml.flat E:\xiaomi\pmz_xiaomibianqianyuedu\src\Notes-master1\app\build\intermediates\res\merged\debug\xml_widget_4x_info.xml.flat
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$array.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$array.class
deleted file mode 100644
index eee541e..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$array.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class
deleted file mode 100644
index 312cdc8..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$color.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class
deleted file mode 100644
index 1e7308a..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$dimen.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class
deleted file mode 100644
index 046a632..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$drawable.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class
deleted file mode 100644
index fbfac9b..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$id.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class
deleted file mode 100644
index 0ee603a..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$layout.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class
deleted file mode 100644
index 435d64f..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$menu.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class
deleted file mode 100644
index 7ce0e76..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$plurals.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class
deleted file mode 100644
index 8d47686..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$raw.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class
deleted file mode 100644
index f8b6227..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$string.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class
deleted file mode 100644
index 4c6fbc6..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$style.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class
deleted file mode 100644
index 6c67f6d..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R$xml.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class
deleted file mode 100644
index 56fbbd6..0000000
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/R.class and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class
index 02e7f0b..854a6ad 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class
index f1053bc..4f5ece9 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class
index 34b5c02..ff3b068 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class
index 1714fc2..dec90e0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class
index 595f36d..8776146 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class
index 7ded6f4..2bd22fb 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class
new file mode 100644
index 0000000..d4769c2
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$2.class
new file mode 100644
index 0000000..9a4d6b7
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class
new file mode 100644
index 0000000..0bbb716
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangedLoginPassword.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index ff95cab..988aa09 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class
new file mode 100644
index 0000000..8581f0a
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$2.class
new file mode 100644
index 0000000..d078b74
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class
new file mode 100644
index 0000000..e7eebc6
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeleteLoginPassword.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 5012ef9..09dfc43 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class
new file mode 100644
index 0000000..a93a6aa
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class
new file mode 100644
index 0000000..c9a2f1d
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class
new file mode 100644
index 0000000..8f9d1e7
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index bce36d4..1e0a1a4 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index b490a7f..62eff6b 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index e87f997..0ae5c74 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class
new file mode 100644
index 0000000..9301bb6
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 2749d5e..2c98fc7 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index 01677aa..9e3a81f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 5cf45a6..3ab5ba0 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index 9ccd607..2a7ba29 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index 240ed9d..18be6f4 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index d6a8eea..09f53c5 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 9ec847b..8a3cc7f 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 5053337..26861a8 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index f6e1ed8..6bd3e78 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class
new file mode 100644
index 0000000..268721f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$2.class
new file mode 100644
index 0000000..45948b8
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class
new file mode 100644
index 0000000..7ceedba
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/RegisterLoginPassword.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class
index e1cf35a..950622d 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class
index e33d1c0..fdffefa 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class
index e315716..18a2c75 100644
Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index ab8d6af..b21d2ff 100644
--- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,253 +20,330 @@
20 android:versionName="0.1" >
21
22 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14"
-23-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
+23-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
24 android:targetSdkVersion="14" />
-24-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+24-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
25
26
-26-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+26-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:24:5-81
+26-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:24:22-78
27
-27-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+27-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-88
+27-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-85
28
-28-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+28-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-67
+28-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-64
29
-29-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+29-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-72
+29-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-69
30
-30-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+30-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-74
+30-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-71
31
-31-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+31-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-80
+31-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-77
32
-32-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+32-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-71
+32-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-68
33
-33-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+33-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-74
+33-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-71
34
-34-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+34-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-81
+34-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-78
35
36 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+36-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:34:5-199:19
37 android:debuggable="true"
38 android:icon="@drawable/icon_app"
-38-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
-39 android:label="@string/app_name" >
-39-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
-40 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
-41 android:name="net.micode.notes.ui.NotesListActivity"
-41-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
-42 android:configChanges="keyboardHidden|orientation|screenSize"
-42-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
-43 android:label="@string/app_name"
-43-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
-44 android:launchMode="singleTop"
-44-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
-45 android:theme="@style/NoteTheme"
-45-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
-46 android:uiOptions="splitActionBarWhenNarrow"
-46-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+38-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:35:9-42
+39 android:label="@string/app_name"
+39-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-41
+40 android:testOnly="true" >
+41 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-50:20
+42 android:name="net.micode.notes.ui.LoginActivity"
+42-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-45
+43 android:configChanges="keyboardHidden|orientation|screenSize"
+43-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+44 android:label="@string/app_name"
+44-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+45 android:launchMode="singleTop"
+45-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+46 android:theme="@style/NoteTheme"
+46-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
47 android:windowSoftInputMode="adjustPan" >
-47-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
-48
-48-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
-49
-49-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
-49-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
-50
-51
-51-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
-51-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
-52
-53
-54 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
-55 android:name="net.micode.notes.ui.NoteEditActivity"
-55-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
-56 android:configChanges="keyboardHidden|orientation|screenSize"
-56-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
-57 android:launchMode="singleTop"
-57-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
-58 android:theme="@style/NoteTheme" >
-58-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
-59
-59-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
-60
-60-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
-60-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
-61
-62
-62-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-62-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-63
-64
-64-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-64-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-65
-65-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-65-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-66
-67
-67-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
-68
-68-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
-68-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
-69
-70
-70-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-70-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-71
-72
-72-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-72-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-73
-73-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
-73-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-74
-75
-75-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
-76
-76-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
-76-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
-77
-78
-78-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
-78-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
-79
-80
-81 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
-82 android:name="android.app.searchable"
-82-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
-83 android:resource="@xml/searchable" />
-83-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
-84
-85
-86 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
-87 android:name="net.micode.notes.data.NotesProvider"
-87-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
-88 android:authorities="micode_notes"
-88-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
-89 android:multiprocess="true" />
-89-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
-90
-91 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
-92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-92-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
-93 android:label="@string/app_widget2x2" >
-93-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
-94
-94-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-95
-95-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-95-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-96
-96-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-96-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-97
-97-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-97-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
-98
-99
-100 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-101 android:name="android.appwidget.provider"
-101-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-102 android:resource="@xml/widget_2x_info" />
-102-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-103
-104 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
-105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-105-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
-106 android:label="@string/app_widget4x4" >
-106-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+47-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-52
+48
+49
+50
+50-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:46:13-49:29
+51
+51-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-69
+51-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:47:25-66
+52
+53
+53-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-77
+53-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:48:27-74
+54
+55
+56 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:52:9-59:20
+57 android:name="net.micode.notes.ui.ChangedLoginPassword"
+57-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:53:13-52
+58 android:configChanges="keyboardHidden|orientation|screenSize"
+58-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-74
+59 android:label="@string/app_name"
+59-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-45
+60 android:launchMode="singleTop"
+60-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+61 android:theme="@style/NoteTheme"
+61-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+62 android:windowSoftInputMode="adjustPan" >
+62-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:58:13-52
+63
+64 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:61:9-68:20
+65 android:name="net.micode.notes.ui.RegisterLoginPassword"
+65-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-53
+66 android:configChanges="keyboardHidden|orientation|screenSize"
+66-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-74
+67 android:label="@string/app_name"
+67-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:64:13-45
+68 android:launchMode="singleTop"
+68-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:65:13-43
+69 android:theme="@style/NoteTheme"
+69-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-45
+70 android:windowSoftInputMode="adjustPan" >
+70-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-52
+71
+72 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:70:9-77:20
+73 android:name="net.micode.notes.ui.DeleteLoginPassword"
+73-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:71:9-47
+74 android:configChanges="keyboardHidden|orientation|screenSize"
+74-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:72:9-70
+75 android:label="@string/app_name"
+75-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:73:9-41
+76 android:launchMode="singleTop"
+76-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:74:9-39
+77 android:theme="@style/NoteTheme"
+77-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:75:9-41
+78 android:windowSoftInputMode="adjustPan" >
+78-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:76:9-48
+79
+80 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:79:9-91:20
+81 android:name="net.micode.notes.ui.NotesListActivity"
+81-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:80:13-49
+82 android:configChanges="keyboardHidden|orientation|screenSize"
+82-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-74
+83 android:label="@string/app_name"
+83-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-45
+84 android:launchMode="singleTop"
+84-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-43
+85 android:theme="@style/NoteTheme"
+85-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-45
+86 android:windowSoftInputMode="adjustPan" >
+86-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-52
+87
+88
+89
+90
+91
+92
+93
+94 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:93:9-125:20
+95 android:name="net.micode.notes.ui.NoteEditActivity"
+95-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-48
+96 android:configChanges="keyboardHidden|orientation|screenSize"
+96-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:95:13-74
+97 android:launchMode="singleTop"
+97-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:96:13-43
+98 android:theme="@style/NoteTheme" >
+98-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-45
+99
+99-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:99:13-104:29
+100
+100-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:100:17-79
+100-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:100:25-76
+101
+102
+102-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:17-76
+102-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:27-73
+103
+104
+104-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-78
+104-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:23-75
+105
+105-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-78
+105-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:23-75
+106
107
-107-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
-108
-108-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
-108-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
-109
-109-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
-109-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
-110
-110-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
-110-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+107-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:106:13-109:29
+108
+108-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:107:15-69
+108-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:107:23-66
+109
+110
+110-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:17-76
+110-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:27-73
111
-112
-113 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
-114 android:name="android.appwidget.provider"
-114-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
-115 android:resource="@xml/widget_4x_info" />
-115-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
-116
-117
-117-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
-117-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
-118
-118-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
-119
-119-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
-119-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
-120
-121
-122 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
-123 android:name="net.micode.notes.ui.AlarmReceiver"
-123-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
-124 android:process=":remote" >
-124-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
-125
+112
+112-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:111:13-116:29
+113
+113-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:112:17-69
+113-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:112:25-66
+114
+115
+115-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:17-76
+115-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:27-73
+116
+117
+117-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-78
+117-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:23-75
+118
+118-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-78
+118-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:23-75
+119
+120
+121 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:119:13-121:54
+122 android:name="android.app.searchable"
+122-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:120:17-54
+123 android:resource="@xml/searchable" />
+123-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:121:17-51
+124
+125
126
-127 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
-128 android:name="net.micode.notes.ui.AlarmAlertActivity"
-128-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
-129 android:label="@string/app_name"
-129-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
-130 android:launchMode="singleInstance"
-130-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
-131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-131-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
-132
-133 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
-134 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-134-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
-135 android:label="@string/preferences_title"
-135-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
-136 android:launchMode="singleTop"
-136-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
-137 android:theme="@android:style/Theme.Holo.Light" >
-137-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
-138
-139
-140 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
-141 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-141-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
-142 android:exported="false" >
-142-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
-143
+127
+128
+129 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+130 android:name="net.micode.notes.data.NotesProvider"
+130-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-63
+131 android:authorities="micode_notes"
+131-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-47
+132 android:exported="false"
+132-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-37
+133 android:multiprocess="true" >
+133-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-40
+134
+135
+136 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-146:20
+137 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+137-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-57
+138 android:label="@string/app_widget2x2" >
+138-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-50
+139
+139-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-141:29
+140
+140-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:17-84
+140-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:25-81
+141
+141-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:17-85
+141-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:25-82
+142
+142-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:17-85
+142-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:25-82
+143
144
-145 D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
-146 android:name="android.app.default_searchable"
-146-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
-147 android:value=".ui.NoteEditActivity" />
-147-->D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
-148
-149
-150
+145 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-145:58
+146 android:name="android.appwidget.provider"
+146-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:144:17-58
+147 android:resource="@xml/widget_2x_info" />
+147-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:145:17-55
+148
+149 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:148:9-161:20
+150 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+150-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:149:13-57
+151 android:label="@string/app_widget4x4" >
+151-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:150:13-50
+152
+152-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-141:29
+153
+153-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:17-84
+153-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:25-81
+154
+154-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:17-85
+154-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:25-82
+155
+155-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:17-85
+155-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:25-82
+156
+157
+158 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-145:58
+159 android:name="android.appwidget.provider"
+159-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:144:17-58
+160 android:resource="@xml/widget_4x_info" />
+160-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:145:17-55
+161
+162
+162-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:163:9-167:20
+162-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:163:19-55
+163
+163-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:164:13-166:29
+164
+164-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:165:17-79
+164-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:165:25-76
+165
+166
+167 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:169:9-172:20
+168 android:name="net.micode.notes.ui.AlarmReceiver"
+168-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:170:13-61
+169 android:process=":remote" >
+169-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:171:13-38
+170
+171
+172 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:174:9-179:20
+173 android:name="net.micode.notes.ui.AlarmAlertActivity"
+173-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:175:13-50
+174 android:label="@string/app_name"
+174-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:176:13-45
+175 android:launchMode="singleInstance"
+175-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:177:13-48
+176 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+176-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:178:13-75
+177
+178 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:181:9-186:20
+179 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+179-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:182:13-71
+180 android:label="@string/preferences_title"
+180-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:183:13-54
+181 android:launchMode="singleTop"
+181-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:184:13-43
+182 android:theme="@android:style/Theme.Holo.Light" >
+182-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:185:13-60
+183
+184
+185 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:188:9-191:19
+186 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+186-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:189:13-74
+187 android:exported="false" >
+187-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:190:13-37
+188
+189
+190 D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:193:9-195:52
+191 android:name="android.app.default_searchable"
+191-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:194:13-58
+192 android:value=".ui.NoteEditActivity" />
+192-->D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:195:13-49
+193
+198
+199
+200
diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simfang.ttf b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simfang.ttf
new file mode 100644
index 0000000..68334e2
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simfang.ttf differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simhei.ttf b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simhei.ttf
new file mode 100644
index 0000000..5bd4687
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simhei.ttf differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simkai.ttf b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simkai.ttf
new file mode 100644
index 0000000..d7c3b90
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simkai.ttf differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsun.ttc b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsun.ttc
new file mode 100644
index 0000000..5f22ce3
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsun.ttc differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsunb.ttc b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsunb.ttc
new file mode 100644
index 0000000..5f22ce3
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_assets/debug/out/Fonts/simsunb.ttc differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index 97501ac..d425124 100644
--- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -36,28 +36,68 @@
+ android:label="@string/app_name"
+ android:testOnly="true" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -65,28 +105,33 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+ android:exported="false"
+ android:multiprocess="true" >
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index 97501ac..d425124 100644
--- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -36,28 +36,68 @@
+ android:label="@string/app_name"
+ android:testOnly="true" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -65,28 +105,33 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+ android:exported="false"
+ android:multiprocess="true" >
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output.json b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index dbd13af..0000000
--- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat
index 5bcb058..5cef720 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat
index 0cf31f7..24a28cd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat
index 5800f3b..6a37a0f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat
index bbcab67..121dfef 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat
index b7e5c7e..38f0a8a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat
index df9bb15..384f8e5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat
index d761eec..c191c6d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat
index 4e44b73..c258bcb 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat
index 65350f7..7de5152 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat
index 86166fb..1d00434 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat
index 2b20b38..3d843ac 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat
index 8b5f4bc..2606d91 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat
index 5ddae6f..34d8094 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat
index fbd2744..0188c0c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat
index cd25aba..42fcb45 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat
index fc21174..ea40051 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat
index 47aa513..b279ec8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat
index 37d2ee4..3787eaf 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat
index 9e6761c..dba98d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat
index de41ce5..dea55ee 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat
index 58d45cc..1c44993 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat
index ba19cd0..96002d7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat
index eeee9db..2f095dd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat
index 3c31906..cfe4b21 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat
index be1170c..5b7825d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat
index 6b5af3d..3417af3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat
index 77732e3..ba7fc84 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat
index 20bd530..d8bc8be 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat
index 2418b7f..0e0a616 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat
index 58a6f6f..da1888e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat
index 2ab153c..4160692 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat
index ac293b2..8ecd823 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat
index 68b9f10..dc3a3bd 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat
index c56c943..facc6e7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat
index 9fd903a..e02601c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat
index 9b7f6fe..e571470 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat
index 4cdb681..98eb0c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat
index ea0a0d3..875ae5e 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat
index 3634d91..4767ad7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat
index c7e7267..17dba35 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat
index 0f4dfcb..4dfc773 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat
index 2760bba..cbe8fe8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat
index 10627b0..0c082c3 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat
index 42f8be9..3518e88 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat
index c1c3c19..d2639c2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat
index 953761b..671a219 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat
index 6a81dcd..748077a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat
index 5247a82..bf9b889 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat
index d2975fb..4d5c02a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat
index 0ec6c2a..8e4b628 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat
index d0a3b25..52bb4f0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat
index 33525cc..65f1b73 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat
index a903101..e83a2db 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat
index b0c3874..97b7fd8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat
index 0c2d429..7885093 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat
index b27c3de..51992b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat
index aabc3db..664a2a5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat
index 93c836b..b1ef72b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat
index 792889c..81c82a4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat
index ab89286..2b18086 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat
index 075e74a..e540c19 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat
index ce87f88..fc06899 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat
index 7f38295..d9a7e2b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat
index 3536b64..fde3ab7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat
index 25cef63..1a36cc2 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat
index 704d651..dab1582 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat
index b65acec..09c9031 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat
index 3ba62d2..2939a3d 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat
index ab10b01..d980a5b 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_change_loginpassword.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_change_loginpassword.xml.flat
new file mode 100644
index 0000000..038be72
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_change_loginpassword.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_delete_loginpassword.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_delete_loginpassword.xml.flat
new file mode 100644
index 0000000..9cd24b0
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_delete_loginpassword.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat
new file mode 100644
index 0000000..ee09dbd
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_set_loginpassword.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_set_loginpassword.xml.flat
new file mode 100644
index 0000000..7d13998
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_activity_set_loginpassword.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat
index bf0094a..65dbf84 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat
index 474002e..725a020 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat
index 38d250c..4384ef8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat
index 17dc265..2aeea45 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
index 0547485..fb0a453 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat
index ee29c22..6e76d96 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat
index ec65b7d..def361f 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
index 3facbae..86a5623 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat
index f72238b..f3decc0 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat
index 1eb9074..a2932fe 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat
index bc5ebca..cbeea57 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat
index 897292e..c13afe5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat
index 53a5432..e998cb7 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat
index 9b20b78..7c9f162 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat
index 887708f..07cda6c 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat
index 1f08517..9c5759a 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat
index e2c4550..aa623a4 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat
index b10d8f1..84f7094 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat
index b5049c0..e0dd645 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat
index 8628c73..67673b1 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
index 8c74d7c..fc0f8a5 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat
index 7e48af6..50a6695 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat
index ac92b43..44f18e8 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat
index 6e9e43a..7f861c9 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat
index 6f878e7..c9908ff 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat
index 78d236d..4234860 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat
index f727417..25a1370 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat
index fdbd4c3..1d44e73 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat
index 2058f9e..f518d47 100644
Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index d0c1a41..c842f3b 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -1,65 +1,72 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2923,2696,1098,1287,1476,1685,1897,911,2104"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
},
"to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8276,8480,8691,8912,9072,9255,9440,9625,9828,10034,10217",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8475,8686,8907,9067,9250,9435,9620,9823,10029,10212,10413"
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "758,1073",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1065,1191"
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+ "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,412",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "407,527"
+ "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
- },
+ }
+ ]
+ },
+ {
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values_values.arsc.flat",
+ "map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endColumns": "56",
- "endOffsets": "782"
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
},
"to": {
- "startLines": "12",
- "startColumns": "4",
- "startOffsets": "532",
- "endColumns": "56",
- "endOffsets": "584"
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
"startLines": "19,20,21,22,18",
"startColumns": "4,4,4,4,4",
@@ -76,74 +83,67 @@
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
},
"to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,412",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "407,527"
}
- }
- ]
- },
- {
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
- "map": [
+ },
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
"from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "730",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "838"
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2314,2531,2923,2696,1098,1287,1476,1685,1897,911,2104"
},
"to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8276,8480,8691,8912,9072,9255,9440,9625,9828,10034,10217",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8475,8686,8907,9067,9250,9435,9620,9823,10029,10212,10413"
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
- "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
- "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endColumns": "56",
+ "endOffsets": "782"
},
"to": {
- "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
- "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "532",
+ "endColumns": "56",
+ "endOffsets": "584"
}
}
]
},
{
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat",
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -162,22 +162,22 @@
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
- "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
- "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+ "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
+ "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
},
"to": {
"startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
"endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
- "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
- "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
}
}
]
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index e3f6502..d7ebb76 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml",
"map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 4a57837..ff426af 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -1,10 +1,10 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml",
"map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index a4292d7..b1ad325 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -1,29 +1,46 @@
{
"logs": [
{
- "outputFile": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
+ "outputFile": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml",
"map": [
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2314,2531,2923,2696,1098,1287,1476,1685,1897,911,2104"
+ "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
+ "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
},
"to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8276,8480,8691,8912,9072,9255,9440,9625,9828,10034,10217",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8475,8686,8907,9067,9250,9435,9620,9823,10029,10212,10413"
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
+ "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "783,836,890,944,730",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "830,884,938,991,777"
+ },
+ "to": {
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "589,641,694,747,799",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "636,689,742,794,846"
+ }
+ },
+ {
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
"startLines": "19,26",
"startColumns": "4,4",
@@ -42,7 +59,26 @@
}
},
{
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2314,2531,2923,2696,1098,1287,1476,1685,1897,911,2104"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8276,8480,8691,8912,9072,9255,9440,9625,9828,10034,10217",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8475,8686,8907,9067,9250,9435,9620,9823,10029,10212,10413"
+ }
+ },
+ {
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -57,42 +93,6 @@
"endColumns": "56",
"endOffsets": "584"
}
- },
- {
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "783,836,890,944,730",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "830,884,938,991,777"
- },
- "to": {
- "startLines": "13,14,15,16,17",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "589,641,694,747,799",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "636,689,742,794,846"
- }
- },
- {
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
- "from": {
- "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
- "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
- },
- "to": {
- "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "851,1244,1340,1423,1519,1588,1631,1683,1735,1784,1847,1905,1956,2040,2134,2242,2313,2397,2480,2546,2629,2731,2792,2854,2905,2983,3036,3096,3201,3260,3362,3417,3488,3537,3595,3642,3701,3758,3829,3890,3947,3997,4049,4102,4152,4202,4262,4315,4381,4443,4506,4553,4608,4696,4754,4816,4866,4911,4954,5014,5081,5136,5191,5244,5291,5344,5400,5448,5503,5556,5640,5707,5771,5867,5941,6022,6111,6274,6418,6497,6572,6654,6713,6793,6873,6928,7050,7153,7194,7247,7304,7378,7443,7511,7597,7677,7746,7840,7899,7954,8016,8076,8186",
- "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
- "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
- "endOffsets": "1239,1335,1418,1514,1583,1626,1678,1730,1779,1842,1900,1951,2035,2129,2237,2308,2392,2475,2541,2624,2726,2787,2849,2900,2978,3031,3091,3196,3255,3357,3412,3483,3532,3590,3637,3696,3753,3824,3885,3942,3992,4044,4097,4147,4197,4257,4310,4376,4438,4501,4548,4603,4691,4749,4811,4861,4906,4949,5009,5076,5131,5186,5239,5286,5339,5395,5443,5498,5551,5635,5702,5766,5862,5936,6017,6106,6269,6413,6492,6567,6649,6708,6788,6868,6923,7045,7148,7189,7242,7299,7373,7438,7506,7592,7672,7741,7835,7894,7949,8011,8071,8181,8271"
- }
}
]
}
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
index a79e1db..2068fe0 100644
--- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -1,382 +1,398 @@
[
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_delete_loginpassword.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_delete_loginpassword.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_login.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_change_loginpassword.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_change_loginpassword.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_set_loginpassword.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\activity_set_loginpassword.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
},
{
- "merged": "D:\\Notes-master1\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat",
- "source": "D:\\Notes-master1\\Notes-master1\\app\\src\\main\\res\\raw\\introduction"
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
+ },
+ {
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
+ },
+ {
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
+ },
+ {
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
+ },
+ {
+ "merged": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat",
+ "source": "D:\\study\\fix_xiaomi\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
}
]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index 97501ac..d425124 100644
--- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -36,28 +36,68 @@
+ android:label="@string/app_name"
+ android:testOnly="true" >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -65,28 +105,33 @@
-
+
-
-
-
-
+
+
+
+
+
+
+
+ android:exported="false"
+ android:multiprocess="true" >
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index bf1dbb8..84825b4 100644
Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/206769cd1613503f4b229e820e701e4598a6a1c4d6051b2d36a9eb167e2fb98e_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/206769cd1613503f4b229e820e701e4598a6a1c4d6051b2d36a9eb167e2fb98e_1.jar
new file mode 100644
index 0000000..bc9095d
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/206769cd1613503f4b229e820e701e4598a6a1c4d6051b2d36a9eb167e2fb98e_1.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_1.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_1.jar
deleted file mode 100644
index cb28e06..0000000
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_1.jar and /dev/null differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
index c42cb9a..bf75641 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex
index e97f807..848b9eb 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
index f70f7c3..46b33c1 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
index de36034..39b463c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
index d97427c..df8c4b0 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
index 28c0868..bb5bf0e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
index 153fef1..7752429 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex
index cba7717..75bf015 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex
index b6c2fc1..04dd66f 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex
index d6f9ef3..3466fa2 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex
index 1e0da89..d93cd9e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex
index c176bdb..34a8d75 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex
index 4adc929..4ea1195 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex
index 56dd120..1353b4d 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex
index f2fd986..20dae92 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex
index 4f761f1..47f3c93 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex
index 144cf9c..277733a 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex
index ffbb9b0..79e94d4 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex
index b6a3528..27d7f34 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex
index ae6e2a4..7e707fe 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex
index 869e07c..99232b6 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex
index f67c640..05f112a 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 1de4373..b85b4a0 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex
new file mode 100644
index 0000000..fa25c97
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$2.dex
new file mode 100644
index 0000000..d071100
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword.dex
new file mode 100644
index 0000000..24c4a11
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangedLoginPassword.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index 0b49183..1fec80e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex
new file mode 100644
index 0000000..d98dc65
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$2.dex
new file mode 100644
index 0000000..9b725c1
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex
new file mode 100644
index 0000000..8880fd9
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeleteLoginPassword.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index dca62bf..b93d9d8 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex
new file mode 100644
index 0000000..5710f78
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex
new file mode 100644
index 0000000..75831ac
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex
new file mode 100644
index 0000000..dab6583
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index 4d23f7e..06aeecd 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 213abb6..ba2d939 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 91b250c..afbd217 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex
new file mode 100644
index 0000000..0870e82
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index 60573ff..c68ee30 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index c7caa5b..6b1434e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 824e394..889a181 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 68ded96..9cca6d1 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 67e1670..df027cf 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 8360e57..5d60c74 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index d511096..c3ba716 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index c225369..898390d 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 8a40d27..3c536bc 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 2aa9d47..3f3ef5f 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index e75d783..78c9e27 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 4286590..32f1299 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 0c3d635..edad767 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index 48c303e..32bb140 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index ee10b63..c09621d 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index 1a8c370..c9df430 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index c9d8d94..3cd7f69 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index 29a636f..e3da818 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index d151862..8178ad6 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index da80f06..289777c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index 1ef790d..a15f9c8 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex
new file mode 100644
index 0000000..7c71206
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$2.dex
new file mode 100644
index 0000000..ec927e9
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex
new file mode 100644
index 0000000..06727d4
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/RegisterLoginPassword.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex
index ec53a98..99e929c 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex
index 995370f..80c1f3a 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex
index 73f6100..6fdd83e 100644
Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
index 00d6e91..0d505d8 100644
--- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -74,87 +74,107 @@ int drawable widget_4x_green 0x7f04003e
int drawable widget_4x_red 0x7f04003f
int drawable widget_4x_white 0x7f040040
int drawable widget_4x_yellow 0x7f040041
-int id account_dialog_subtitle 0x7f050000
-int id account_dialog_title 0x7f050001
-int id action_select_all 0x7f050002
-int id amPm 0x7f050003
-int id btn_new_note 0x7f050004
-int id btn_set_bg_color 0x7f050005
-int id cb_edit_item 0x7f050006
-int id date 0x7f050007
-int id delete 0x7f050008
-int id et_edit_text 0x7f050009
-int id et_foler_name 0x7f05000a
-int id font_size_selector 0x7f05000b
-int id hour 0x7f05000c
-int id iv_alert_icon 0x7f05000d
-int id iv_bg_blue 0x7f05000e
-int id iv_bg_blue_select 0x7f05000f
-int id iv_bg_green 0x7f050010
-int id iv_bg_green_select 0x7f050011
-int id iv_bg_red 0x7f050012
-int id iv_bg_red_select 0x7f050013
-int id iv_bg_white 0x7f050014
-int id iv_bg_white_select 0x7f050015
-int id iv_bg_yellow 0x7f050016
-int id iv_bg_yellow_select 0x7f050017
-int id iv_large_select 0x7f050018
-int id iv_medium_select 0x7f050019
-int id iv_small_select 0x7f05001a
-int id iv_super_select 0x7f05001b
-int id ll_font_large 0x7f05001c
-int id ll_font_normal 0x7f05001d
-int id ll_font_small 0x7f05001e
-int id ll_font_super 0x7f05001f
-int id menu_alert 0x7f050020
-int id menu_delete 0x7f050021
-int id menu_delete_remind 0x7f050022
-int id menu_export_text 0x7f050023
-int id menu_font_size 0x7f050024
-int id menu_list_mode 0x7f050025
-int id menu_new_folder 0x7f050026
-int id menu_new_note 0x7f050027
-int id menu_search 0x7f050028
-int id menu_send_to_desktop 0x7f050029
-int id menu_setting 0x7f05002a
-int id menu_share 0x7f05002b
-int id menu_sync 0x7f05002c
-int id minute 0x7f05002d
-int id move 0x7f05002e
-int id navigation_bar 0x7f05002f
-int id note_bg_color_selector 0x7f050030
-int id note_edit_list 0x7f050031
-int id note_edit_view 0x7f050032
-int id note_item 0x7f050033
-int id note_title 0x7f050034
-int id notes_list 0x7f050035
-int id prefenerece_sync_status_textview 0x7f050036
-int id preference_sync_button 0x7f050037
-int id selection_menu 0x7f050038
-int id sv_note_edit 0x7f050039
-int id tv_alert_date 0x7f05003a
-int id tv_folder_name 0x7f05003b
-int id tv_modified_date 0x7f05003c
-int id tv_name 0x7f05003d
-int id tv_time 0x7f05003e
-int id tv_title 0x7f05003f
-int id tv_title_bar 0x7f050040
-int id widget_bg_image 0x7f050041
-int id widget_text 0x7f050042
+int id Bt_Acknowledged 0x7f050000
+int id account_dialog_subtitle 0x7f050001
+int id account_dialog_title 0x7f050002
+int id ack_password 0x7f050003
+int id action_select_all 0x7f050004
+int id amPm 0x7f050005
+int id btn_new_note 0x7f050006
+int id btn_set_bg_color 0x7f050007
+int id button1 0x7f050008
+int id button2 0x7f050009
+int id button3 0x7f05000a
+int id button4 0x7f05000b
+int id cb_edit_item 0x7f05000c
+int id date 0x7f05000d
+int id delete 0x7f05000e
+int id et_edit_text 0x7f05000f
+int id et_foler_name 0x7f050010
+int id font_size_selector 0x7f050011
+int id hour 0x7f050012
+int id iv_alert_icon 0x7f050013
+int id iv_bg_blue 0x7f050014
+int id iv_bg_blue_select 0x7f050015
+int id iv_bg_green 0x7f050016
+int id iv_bg_green_select 0x7f050017
+int id iv_bg_red 0x7f050018
+int id iv_bg_red_select 0x7f050019
+int id iv_bg_white 0x7f05001a
+int id iv_bg_white_select 0x7f05001b
+int id iv_bg_yellow 0x7f05001c
+int id iv_bg_yellow_select 0x7f05001d
+int id iv_large_select 0x7f05001e
+int id iv_medium_select 0x7f05001f
+int id iv_small_select 0x7f050020
+int id iv_super_select 0x7f050021
+int id lg_password 0x7f050022
+int id ll_font_large 0x7f050023
+int id ll_font_normal 0x7f050024
+int id ll_font_small 0x7f050025
+int id ll_font_super 0x7f050026
+int id login 0x7f050027
+int id menu_alert 0x7f050028
+int id menu_change_note 0x7f050029
+int id menu_delete 0x7f05002a
+int id menu_delete_remind 0x7f05002b
+int id menu_deletelogin 0x7f05002c
+int id menu_export_text 0x7f05002d
+int id menu_font_size 0x7f05002e
+int id menu_list_mode 0x7f05002f
+int id menu_login 0x7f050030
+int id menu_new_folder 0x7f050031
+int id menu_new_note 0x7f050032
+int id menu_search 0x7f050033
+int id menu_send_to_desktop 0x7f050034
+int id menu_setting 0x7f050035
+int id menu_share 0x7f050036
+int id menu_sync 0x7f050037
+int id minute 0x7f050038
+int id move 0x7f050039
+int id navigation_bar 0x7f05003a
+int id new_password 0x7f05003b
+int id note_bg_color_selector 0x7f05003c
+int id note_edit_list 0x7f05003d
+int id note_edit_view 0x7f05003e
+int id note_item 0x7f05003f
+int id note_title 0x7f050040
+int id notes_list 0x7f050041
+int id old_password 0x7f050042
+int id prefenerece_sync_status_textview 0x7f050043
+int id preference_sync_button 0x7f050044
+int id rg_password01 0x7f050045
+int id rg_password02 0x7f050046
+int id rg_registered 0x7f050047
+int id selection_menu 0x7f050048
+int id sv_note_edit 0x7f050049
+int id tv_alert_date 0x7f05004a
+int id tv_folder_name 0x7f05004b
+int id tv_modified_date 0x7f05004c
+int id tv_name 0x7f05004d
+int id tv_time 0x7f05004e
+int id tv_title 0x7f05004f
+int id tv_title_bar 0x7f050050
+int id widget_bg_image 0x7f050051
+int id widget_text 0x7f050052
int layout account_dialog_title 0x7f060000
-int layout add_account_text 0x7f060001
-int layout datetime_picker 0x7f060002
-int layout dialog_edit_text 0x7f060003
-int layout folder_list_item 0x7f060004
-int layout note_edit 0x7f060005
-int layout note_edit_list_item 0x7f060006
-int layout note_item 0x7f060007
-int layout note_list 0x7f060008
-int layout note_list_dropdown_menu 0x7f060009
-int layout note_list_footer 0x7f06000a
-int layout settings_header 0x7f06000b
-int layout widget_2x 0x7f06000c
-int layout widget_4x 0x7f06000d
+int layout activity_change_loginpassword 0x7f060001
+int layout activity_delete_loginpassword 0x7f060002
+int layout activity_login 0x7f060003
+int layout activity_set_loginpassword 0x7f060004
+int layout add_account_text 0x7f060005
+int layout datetime_picker 0x7f060006
+int layout dialog_edit_text 0x7f060007
+int layout folder_list_item 0x7f060008
+int layout note_edit 0x7f060009
+int layout note_edit_list_item 0x7f06000a
+int layout note_item 0x7f06000b
+int layout note_list 0x7f06000c
+int layout note_list_dropdown_menu 0x7f06000d
+int layout note_list_footer 0x7f06000e
+int layout settings_header 0x7f06000f
+int layout widget_2x 0x7f060010
+int layout widget_4x 0x7f060011
int menu call_note_edit 0x7f070000
int menu call_record_folder 0x7f070001
int menu note_edit 0x7f070002
diff --git a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
index bb4deaa..51f6368 100644
--- a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
+++ b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json
@@ -1 +1 @@
-{"enableV1Signing":true,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
+{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
index 65f17f8..6a1e1bb 100644
--- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -13,14 +13,12 @@ net.micode.notes:string/ticker_cancel = 0x7f0a0060
net.micode.notes:string/sync_progress_login = 0x7f0a005e
net.micode.notes:string/success_sdcard_export = 0x7f0a005b
net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/search_hint = 0x7f0a0057
net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
net.micode.notes:string/preferences_title = 0x7f0a0053
net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
@@ -48,180 +46,199 @@ net.micode.notes:string/menu_select_all = 0x7f0a0032
net.micode.notes:string/menu_list_mode = 0x7f0a002c
net.micode.notes:string/menu_font_super = 0x7f0a002b
net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
net.micode.notes:string/menu_font_large = 0x7f0a0027
net.micode.notes:string/menu_export_text = 0x7f0a0023
net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
net.micode.notes:string/hint_foler_name = 0x7f0a001d
net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:string/search_label = 0x7f0a0058
+net.micode.notes:string/format_exported_file_location = 0x7f0a001a
net.micode.notes:string/file_path = 0x7f0a0016
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
+net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
+net.micode.notes:string/error_sync_internal = 0x7f0a0012
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
net.micode.notes:string/error_sdcard_export = 0x7f0a000f
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
-net.micode.notes:layout/settings_header = 0x7f06000b
+net.micode.notes:layout/settings_header = 0x7f06000f
net.micode.notes:string/button_delete = 0x7f0a0007
-net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:id/move = 0x7f05002e
+net.micode.notes:id/move = 0x7f050039
net.micode.notes:raw/introduction = 0x7f090000
net.micode.notes:drawable/list_blue_down = 0x7f040017
-net.micode.notes:id/iv_bg_red = 0x7f050012
net.micode.notes:drawable/list_yellow_middle = 0x7f04002a
-net.micode.notes:id/widget_bg_image = 0x7f050041
+net.micode.notes:id/iv_bg_red = 0x7f050018
+net.micode.notes:id/widget_bg_image = 0x7f050051
net.micode.notes:menu/sub_folder = 0x7f070006
net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
net.micode.notes:menu/note_list_options = 0x7f070005
net.micode.notes:menu/note_list = 0x7f070003
net.micode.notes:menu/call_note_edit = 0x7f070000
net.micode.notes:string/app_name = 0x7f0a0004
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:string/error_sync_internal = 0x7f0a0012
-net.micode.notes:layout/folder_list_item = 0x7f060004
+net.micode.notes:layout/widget_4x = 0x7f060011
+net.micode.notes:layout/folder_list_item = 0x7f060008
net.micode.notes:menu/note_edit = 0x7f070002
net.micode.notes:string/menu_folder_view = 0x7f0a0026
net.micode.notes:drawable/font_super = 0x7f040014
-net.micode.notes:layout/note_list = 0x7f060008
-net.micode.notes:id/menu_share = 0x7f05002b
+net.micode.notes:layout/note_list = 0x7f06000c
+net.micode.notes:id/button4 = 0x7f05000b
+net.micode.notes:id/menu_share = 0x7f050036
net.micode.notes:string/app_widget4x4 = 0x7f0a0006
net.micode.notes:menu/call_record_folder = 0x7f070001
-net.micode.notes:id/tv_name = 0x7f05003d
-net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:id/button3 = 0x7f05000a
+net.micode.notes:id/tv_name = 0x7f05004d
+net.micode.notes:layout/note_item = 0x7f06000b
net.micode.notes:dimen/text_font_size_normal = 0x7f030002
-net.micode.notes:layout/note_edit_list_item = 0x7f060006
-net.micode.notes:layout/datetime_picker = 0x7f060002
+net.micode.notes:layout/note_edit_list_item = 0x7f06000a
+net.micode.notes:layout/datetime_picker = 0x7f060006
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+net.micode.notes:drawable/new_note_pressed = 0x7f040031
+net.micode.notes:layout/dialog_edit_text = 0x7f060007
+net.micode.notes:layout/activity_set_loginpassword = 0x7f060004
+net.micode.notes:layout/activity_login = 0x7f060003
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
net.micode.notes:layout/account_dialog_title = 0x7f060000
-net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
-net.micode.notes:drawable/list_green_up = 0x7f040020
-net.micode.notes:layout/add_account_text = 0x7f060001
-net.micode.notes:id/widget_text = 0x7f050042
net.micode.notes:menu/note_list_dropdown = 0x7f070004
-net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
-net.micode.notes:id/tv_title_bar = 0x7f050040
-net.micode.notes:id/tv_folder_name = 0x7f05003b
-net.micode.notes:id/tv_alert_date = 0x7f05003a
+net.micode.notes:id/iv_bg_blue_select = 0x7f050015
+net.micode.notes:id/tv_title_bar = 0x7f050050
+net.micode.notes:id/tv_folder_name = 0x7f05004b
+net.micode.notes:id/tv_alert_date = 0x7f05004a
net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:id/sv_note_edit = 0x7f050039
-net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
-net.micode.notes:id/note_edit_view = 0x7f050032
+net.micode.notes:id/sv_note_edit = 0x7f050049
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:id/rg_password01 = 0x7f050045
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050043
+net.micode.notes:id/old_password = 0x7f050042
+net.micode.notes:id/iv_bg_yellow_select = 0x7f05001d
+net.micode.notes:id/note_edit_view = 0x7f05003e
net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
net.micode.notes:drawable/font_small = 0x7f040013
-net.micode.notes:id/note_bg_color_selector = 0x7f050030
-net.micode.notes:id/navigation_bar = 0x7f05002f
-net.micode.notes:id/ll_font_normal = 0x7f05001d
-net.micode.notes:id/minute = 0x7f05002d
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:id/note_bg_color_selector = 0x7f05003c
+net.micode.notes:id/navigation_bar = 0x7f05003a
+net.micode.notes:id/ll_font_normal = 0x7f050024
+net.micode.notes:id/minute = 0x7f050038
+net.micode.notes:id/menu_sync = 0x7f050037
net.micode.notes:color/primary_text_dark = 0x7f020000
-net.micode.notes:id/menu_setting = 0x7f05002a
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
-net.micode.notes:id/menu_search = 0x7f050028
-net.micode.notes:id/menu_new_note = 0x7f050027
-net.micode.notes:id/menu_new_folder = 0x7f050026
-net.micode.notes:layout/note_list_footer = 0x7f06000a
-net.micode.notes:id/iv_bg_green = 0x7f050010
-net.micode.notes:id/tv_time = 0x7f05003e
-net.micode.notes:id/menu_alert = 0x7f050020
-net.micode.notes:id/et_foler_name = 0x7f05000a
-net.micode.notes:id/ll_font_small = 0x7f05001e
-net.micode.notes:id/iv_super_select = 0x7f05001b
+net.micode.notes:id/menu_setting = 0x7f050035
+net.micode.notes:id/menu_search = 0x7f050033
+net.micode.notes:id/menu_new_note = 0x7f050032
+net.micode.notes:layout/activity_change_loginpassword = 0x7f060001
+net.micode.notes:id/menu_new_folder = 0x7f050031
+net.micode.notes:string/note_link_other = 0x7f0a003d
+net.micode.notes:string/folder_exist = 0x7f0a0017
+net.micode.notes:id/menu_deletelogin = 0x7f05002c
+net.micode.notes:layout/note_list_footer = 0x7f06000e
+net.micode.notes:id/iv_bg_green = 0x7f050016
+net.micode.notes:id/tv_time = 0x7f05004e
+net.micode.notes:id/menu_alert = 0x7f050028
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
+net.micode.notes:id/login = 0x7f050027
+net.micode.notes:id/et_foler_name = 0x7f050010
+net.micode.notes:id/ll_font_small = 0x7f050025
+net.micode.notes:id/iv_super_select = 0x7f050021
net.micode.notes:drawable/widget_2x_white = 0x7f04003b
-net.micode.notes:id/iv_medium_select = 0x7f050019
-net.micode.notes:id/iv_large_select = 0x7f050018
-net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
-net.micode.notes:drawable/list_blue_middle = 0x7f040018
-net.micode.notes:drawable/font_normal = 0x7f040011
-net.micode.notes:id/et_edit_text = 0x7f050009
-net.micode.notes:id/iv_bg_yellow = 0x7f050016
-net.micode.notes:id/iv_bg_red_select = 0x7f050013
+net.micode.notes:id/iv_medium_select = 0x7f05001f
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
+net.micode.notes:id/new_password = 0x7f05003b
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000d
+net.micode.notes:id/ll_font_super = 0x7f050026
+net.micode.notes:id/iv_large_select = 0x7f05001e
+net.micode.notes:string/menu_search = 0x7f0a0031
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:id/iv_bg_white = 0x7f05001a
+net.micode.notes:id/rg_password02 = 0x7f050046
net.micode.notes:drawable/list_blue_up = 0x7f04001a
-net.micode.notes:id/date = 0x7f050007
-net.micode.notes:id/menu_delete_remind = 0x7f050022
+net.micode.notes:id/date = 0x7f05000d
+net.micode.notes:id/button1 = 0x7f050008
+net.micode.notes:id/menu_delete_remind = 0x7f05002b
net.micode.notes:string/search = 0x7f0a0056
net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:id/btn_set_bg_color = 0x7f050005
+net.micode.notes:id/font_size_selector = 0x7f050011
+net.micode.notes:id/notes_list = 0x7f050041
+net.micode.notes:id/iv_bg_red_select = 0x7f050019
+net.micode.notes:id/et_edit_text = 0x7f05000f
+net.micode.notes:id/iv_bg_yellow = 0x7f05001c
+net.micode.notes:id/btn_set_bg_color = 0x7f050007
+net.micode.notes:id/rg_registered = 0x7f050047
+net.micode.notes:id/Bt_Acknowledged = 0x7f050000
net.micode.notes:drawable/list_yellow_single = 0x7f04002b
-net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:id/amPm = 0x7f050005
net.micode.notes:string/menu_move = 0x7f0a002d
-net.micode.notes:id/action_select_all = 0x7f050002
-net.micode.notes:drawable/new_note_pressed = 0x7f040031
-net.micode.notes:layout/dialog_edit_text = 0x7f060003
+net.micode.notes:id/action_select_all = 0x7f050004
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:id/menu_export_text = 0x7f05002d
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:id/account_dialog_title = 0x7f050002
+net.micode.notes:id/ack_password = 0x7f050003
net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
net.micode.notes:drawable/widget_4x_white = 0x7f040040
-net.micode.notes:id/ll_font_large = 0x7f05001c
+net.micode.notes:id/ll_font_large = 0x7f050023
net.micode.notes:drawable/list_red_single = 0x7f040023
net.micode.notes:drawable/edit_blue = 0x7f040006
net.micode.notes:drawable/widget_4x_red = 0x7f04003f
-net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/folder_exist = 0x7f0a0017
net.micode.notes:drawable/widget_2x_green = 0x7f040039
net.micode.notes:drawable/title_alert = 0x7f040036
net.micode.notes:drawable/widget_2x_blue = 0x7f040038
net.micode.notes:drawable/widget_4x_green = 0x7f04003e
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
net.micode.notes:drawable/list_white_down = 0x7f040025
net.micode.notes:drawable/dropdown_icon = 0x7f040005
net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
net.micode.notes:drawable/new_note_normal = 0x7f040030
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
net.micode.notes:string/call_record_folder_name = 0x7f0a0008
net.micode.notes:drawable/new_note = 0x7f04002f
net.micode.notes:drawable/edit_title_white = 0x7f04000c
net.micode.notes:drawable/menu_delete = 0x7f04002d
-net.micode.notes:id/cb_edit_item = 0x7f050006
+net.micode.notes:id/cb_edit_item = 0x7f05000c
net.micode.notes:xml/widget_4x_info = 0x7f0c0003
net.micode.notes:drawable/list_yellow_up = 0x7f04002c
net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:id/note_edit_list = 0x7f050031
+net.micode.notes:id/note_edit_list = 0x7f05003d
net.micode.notes:drawable/list_yellow_down = 0x7f040029
net.micode.notes:plurals/search_results_title = 0x7f080000
net.micode.notes:drawable/selected = 0x7f040035
net.micode.notes:drawable/list_white_middle = 0x7f040026
net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
-net.micode.notes:layout/note_edit = 0x7f060005
-net.micode.notes:id/hour = 0x7f05000c
-net.micode.notes:id/iv_bg_white_select = 0x7f050015
+net.micode.notes:layout/note_edit = 0x7f060009
+net.micode.notes:id/hour = 0x7f050012
+net.micode.notes:id/iv_bg_white_select = 0x7f05001b
net.micode.notes:drawable/list_red_up = 0x7f040024
-net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:id/menu_export_text = 0x7f050023
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
net.micode.notes:drawable/list_red_down = 0x7f040021
-net.micode.notes:string/error_note_not_exist = 0x7f0a000e
-net.micode.notes:array/menu_share_ways = 0x7f010001
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
-net.micode.notes:id/menu_font_size = 0x7f050024
-net.micode.notes:id/iv_bg_blue = 0x7f05000e
+net.micode.notes:id/menu_font_size = 0x7f05002e
+net.micode.notes:id/iv_bg_blue = 0x7f050014
net.micode.notes:drawable/list_green_middle = 0x7f04001e
net.micode.notes:drawable/list_footer_bg = 0x7f04001c
+net.micode.notes:string/sync_progress_syncing = 0x7f0a005f
+net.micode.notes:drawable/font_normal = 0x7f040011
+net.micode.notes:drawable/list_blue_middle = 0x7f040018
+net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:id/button2 = 0x7f050009
net.micode.notes:drawable/list_white_single = 0x7f040027
net.micode.notes:drawable/list_white_up = 0x7f040028
net.micode.notes:string/menu_remove_remind = 0x7f0a0030
net.micode.notes:drawable/list_green_down = 0x7f04001d
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
-net.micode.notes:id/account_dialog_title = 0x7f050001
-net.micode.notes:layout/widget_2x = 0x7f06000c
-net.micode.notes:id/note_item = 0x7f050033
+net.micode.notes:id/preference_sync_button = 0x7f050044
+net.micode.notes:layout/widget_2x = 0x7f060010
+net.micode.notes:id/note_item = 0x7f05003f
net.micode.notes:dimen/text_font_size_super = 0x7f030004
net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
net.micode.notes:string/menu_folder_delete = 0x7f0a0025
net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:id/menu_delete = 0x7f05002a
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
+net.micode.notes:layout/add_account_text = 0x7f060005
+net.micode.notes:drawable/list_green_up = 0x7f040020
net.micode.notes:drawable/icon_app = 0x7f040015
net.micode.notes:drawable/edit_yellow = 0x7f04000f
net.micode.notes:drawable/list_blue_single = 0x7f040019
@@ -230,54 +247,57 @@ net.micode.notes:string/menu_normal_mode = 0x7f0a002f
net.micode.notes:drawable/edit_title_blue = 0x7f040009
net.micode.notes:string/menu_delete = 0x7f0a0021
net.micode.notes:drawable/list_background = 0x7f040016
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
+net.micode.notes:id/menu_send_to_desktop = 0x7f050034
net.micode.notes:drawable/title_bar_bg = 0x7f040037
-net.micode.notes:id/delete = 0x7f050008
+net.micode.notes:id/delete = 0x7f05000e
net.micode.notes:drawable/search_result = 0x7f040034
net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
-net.micode.notes:id/tv_modified_date = 0x7f05003c
+net.micode.notes:id/tv_modified_date = 0x7f05004c
net.micode.notes:string/menu_font_small = 0x7f0a002a
net.micode.notes:drawable/font_large = 0x7f040010
-net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:id/iv_alert_icon = 0x7f050013
+net.micode.notes:id/lg_password = 0x7f050022
net.micode.notes:drawable/list_green_single = 0x7f04001f
net.micode.notes:xml/widget_2x_info = 0x7f0c0002
net.micode.notes:drawable/edit_white = 0x7f04000e
-net.micode.notes:string/search_label = 0x7f0a0058
-net.micode.notes:string/format_exported_file_location = 0x7f0a001a
net.micode.notes:drawable/menu_move = 0x7f04002e
-net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:id/btn_new_note = 0x7f050006
net.micode.notes:drawable/edit_title_red = 0x7f04000b
net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
net.micode.notes:string/search_setting_description = 0x7f0a0059
-net.micode.notes:id/menu_list_mode = 0x7f050025
+net.micode.notes:id/menu_list_mode = 0x7f05002f
net.micode.notes:dimen/text_font_size_medium = 0x7f030001
net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032
net.micode.notes:drawable/list_folder = 0x7f04001b
-net.micode.notes:id/iv_small_select = 0x7f05001a
+net.micode.notes:id/iv_small_select = 0x7f050020
net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
net.micode.notes:color/user_query_highlight = 0x7f020002
net.micode.notes:drawable/edit_red = 0x7f040008
+net.micode.notes:id/widget_text = 0x7f050052
net.micode.notes:drawable/edit_green = 0x7f040007
net.micode.notes:string/app_widget2x2 = 0x7f0a0005
-net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:id/menu_login = 0x7f050030
+net.micode.notes:id/tv_title = 0x7f05004f
net.micode.notes:drawable/delete = 0x7f040004
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
-net.micode.notes:string/error_sync_network = 0x7f0a0013
net.micode.notes:drawable/edit_title_green = 0x7f04000a
net.micode.notes:drawable/widget_4x_blue = 0x7f04003d
+net.micode.notes:id/iv_bg_green_select = 0x7f050017
+net.micode.notes:string/error_note_not_exist = 0x7f0a000e
+net.micode.notes:array/menu_share_ways = 0x7f010001
net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
+net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:id/menu_change_note = 0x7f050029
net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:layout/activity_delete_loginpassword = 0x7f060002
net.micode.notes:dimen/text_font_size_small = 0x7f030003
-net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/selection_menu = 0x7f050048
+net.micode.notes:id/account_dialog_subtitle = 0x7f050001
net.micode.notes:drawable/call_record = 0x7f040002
net.micode.notes:drawable/notification = 0x7f040033
net.micode.notes:color/secondary_text_dark = 0x7f020001
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/note_title = 0x7f050034
+net.micode.notes:id/note_title = 0x7f050040
net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
net.micode.notes:array/format_for_exported_note = 0x7f010000
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk
index e1142a1..37671f0 100644
Binary files a/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master1/app/build/outputs/apk/debug/output.json b/src/Notes-master1/app/build/outputs/apk/debug/output.json
deleted file mode 100644
index ce4aabf..0000000
--- a/src/Notes-master1/app/build/outputs/apk/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-debug.apk","properties":{"packageId":"net.micode.notes","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
index 2831405..9a3e232 100644
--- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,235 +1,291 @@
-- Merging decision tree log ---
manifest
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-200:12
package
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
xmlns:android
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
- android:targetSdkVersion
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- android:minSdkVersion
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
- INJECTED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:24:5-81
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:24:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-88
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-85
uses-permission#android.permission.INTERNET
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-67
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-72
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-74
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-80
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-71
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-74
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-81
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-78
application
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:34:5-199:19
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-41
android:icon
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:35:9-42
+activity#net.micode.notes.ui.LoginActivity
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-50:20
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
android:launchMode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
android:windowSoftInputMode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
- android:uiOptions
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-52
android:configChanges
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
android:theme
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-45
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:46:13-49:29
action#android.intent.action.MAIN
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-69
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:47:25-66
category#android.intent.category.LAUNCHER
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-77
+ android:name
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:48:27-74
+activity#net.micode.notes.ui.ChangedLoginPassword
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:52:9-59:20
+ android:label
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-45
+ android:launchMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+ android:windowSoftInputMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:58:13-52
+ android:configChanges
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-74
+ android:theme
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+ android:name
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:53:13-52
+activity#net.micode.notes.ui.RegisterLoginPassword
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:61:9-68:20
+ android:label
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:64:13-45
+ android:launchMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:65:13-43
+ android:windowSoftInputMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-52
+ android:configChanges
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-74
+ android:theme
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-45
+ android:name
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-53
+activity#net.micode.notes.ui.DeleteLoginPassword
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:70:9-77:20
+ android:label
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:73:9-41
+ android:launchMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:74:9-39
+ android:windowSoftInputMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:76:9-48
+ android:configChanges
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:72:9-70
+ android:theme
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:75:9-41
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:71:9-47
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:79:9-91:20
+ android:label
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-45
+ android:launchMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-43
+ android:windowSoftInputMode
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-52
+ android:configChanges
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-74
+ android:theme
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-45
+ android:name
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:80:13-49
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:93:9-125:20
android:launchMode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:96:13-43
android:configChanges
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:95:13-74
android:theme
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-45
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
-action#android.intent.action.VIEW
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-48
+intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:99:13-104:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:100:17-79
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:100:25-76
category#android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:17-76
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:101:27-73
data
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:17-78
android:mimeType
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
- android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:102:23-75
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:106:13-109:29
action#android.intent.action.SEARCH
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:107:15-69
+ android:name
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:107:23-66
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:111:13-116:29
+action#android.intent.action.VIEW
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:112:17-69
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:112:25-66
meta-data#android.app.searchable
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:119:13-121:54
android:resource
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:121:17-51
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:120:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
android:authorities
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-47
android:multiprocess
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-40
+ android:exported
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-37
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-146:20
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-50
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-57
intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-141:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:17-84
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:138:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:17-85
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:139:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:17-85
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:140:25-82
meta-data#android.appwidget.provider
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-145:58
android:resource
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:145:17-55
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:144:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:148:9-161:20
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:150:13-50
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:149:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:163:9-167:20
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:163:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:164:13-166:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:165:17-79
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:165:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:169:9-172:20
android:process
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:171:13-38
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:170:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:174:9-179:20
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:176:13-45
android:launchMode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:177:13-48
android:theme
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:178:13-75
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:175:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:181:9-186:20
android:label
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:183:13-54
android:launchMode
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:184:13-43
android:theme
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:185:13-60
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:182:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:188:9-191:19
android:exported
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:190:13-37
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:189:13-74
meta-data#android.app.default_searchable
-ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:193:9-195:52
android:value
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:195:13-49
android:name
- ADDED from D:\Notes-master1\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml:194:13-58
+uses-sdk
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ android:targetSdkVersion
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ ADDED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
+ INJECTED from D:\study\fix_xiaomi\src\Notes-master1\app\src\main\AndroidManifest.xml
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
index a206f5a..4b9b042 100644
--- a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
+++ b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt
@@ -7,15 +7,15 @@ net/micode/notes/model/WorkingNote.java
net.micode.notes.model.WorkingNote$NoteSettingChangedListener
net/micode/notes/gtask/data/Task.java
net.micode.notes.gtask.data.Task
-net/micode/notes/data/NotesProvider.java
- net.micode.notes.data.NotesProvider
+net/micode/notes/ui/AlarmAlertActivity.java
+ net.micode.notes.ui.AlarmAlertActivity
net/micode/notes/tool/BackupUtils.java
net.micode.notes.tool.BackupUtils
net.micode.notes.tool.BackupUtils$TextExport
net/micode/notes/gtask/data/MetaData.java
net.micode.notes.gtask.data.MetaData
-net/micode/notes/gtask/data/SqlData.java
- net.micode.notes.gtask.data.SqlData
+net/micode/notes/widget/NoteWidgetProvider.java
+ net.micode.notes.widget.NoteWidgetProvider
net/micode/notes/ui/DateTimePickerDialog.java
net.micode.notes.ui.DateTimePickerDialog
net.micode.notes.ui.DateTimePickerDialog$1
@@ -33,8 +33,8 @@ net/micode/notes/data/Notes.java
net.micode.notes.data.Notes$TextNote
net/micode/notes/gtask/data/TaskList.java
net.micode.notes.gtask.data.TaskList
-net/micode/notes/tool/GTaskStringUtils.java
- net.micode.notes.tool.GTaskStringUtils
+net/micode/notes/ui/AlarmReceiver.java
+ net.micode.notes.ui.AlarmReceiver
net/micode/notes/model/Note.java
net.micode.notes.model.Note
net.micode.notes.model.Note$NoteData
@@ -64,6 +64,10 @@ net/micode/notes/ui/AlarmInitReceiver.java
net/micode/notes/ui/FoldersListAdapter.java
net.micode.notes.ui.FoldersListAdapter
net.micode.notes.ui.FoldersListAdapter$FolderListItem
+net/micode/notes/ui/ChangedLoginPassword.java
+ net.micode.notes.ui.ChangedLoginPassword
+ net.micode.notes.ui.ChangedLoginPassword$1
+ net.micode.notes.ui.ChangedLoginPassword$2
net/micode/notes/ui/NotesListItem.java
net.micode.notes.ui.NotesListItem
net/micode/notes/ui/NoteEditText.java
@@ -73,6 +77,10 @@ net/micode/notes/ui/NoteEditText.java
net/micode/notes/data/NotesDatabaseHelper.java
net.micode.notes.data.NotesDatabaseHelper
net.micode.notes.data.NotesDatabaseHelper$TABLE
+net/micode/notes/ui/RegisterLoginPassword.java
+ net.micode.notes.ui.RegisterLoginPassword
+ net.micode.notes.ui.RegisterLoginPassword$1
+ net.micode.notes.ui.RegisterLoginPassword$2
net/micode/notes/tool/DataUtils.java
net.micode.notes.tool.DataUtils
net/micode/notes/gtask/data/SqlNote.java
@@ -92,25 +100,6 @@ net/micode/notes/ui/NotesListAdapter.java
net.micode.notes.ui.NotesListAdapter$AppWidgetAttribute
net/micode/notes/gtask/data/Node.java
net.micode.notes.gtask.data.Node
-net/micode/notes/data/Contact.java
- net.micode.notes.data.Contact
-net/micode/notes/ui/DateTimePicker.java
- net.micode.notes.ui.DateTimePicker
- net.micode.notes.ui.DateTimePicker$1
- net.micode.notes.ui.DateTimePicker$2
- net.micode.notes.ui.DateTimePicker$3
- net.micode.notes.ui.DateTimePicker$4
- net.micode.notes.ui.DateTimePicker$OnDateTimeChangedListener
-net/micode/notes/gtask/exception/ActionFailureException.java
- net.micode.notes.gtask.exception.ActionFailureException
-net/micode/notes/ui/AlarmReceiver.java
- net.micode.notes.ui.AlarmReceiver
-net/micode/notes/ui/AlarmAlertActivity.java
- net.micode.notes.ui.AlarmAlertActivity
-net/micode/notes/ui/NoteItemData.java
- net.micode.notes.ui.NoteItemData
-net/micode/notes/widget/NoteWidgetProvider.java
- net.micode.notes.widget.NoteWidgetProvider
net/micode/notes/ui/NotesListActivity.java
net.micode.notes.ui.NotesListActivity
net.micode.notes.ui.NotesListActivity$1
@@ -129,9 +118,37 @@ net/micode/notes/ui/NotesListActivity.java
net.micode.notes.ui.NotesListActivity$ModeCallback$2
net.micode.notes.ui.NotesListActivity$NewNoteOnTouchListener
net.micode.notes.ui.NotesListActivity$OnListItemClickListener
+net/micode/notes/ui/LoginActivity.java
+ net.micode.notes.ui.LoginActivity
+ net.micode.notes.ui.LoginActivity$1
+ net.micode.notes.ui.LoginActivity$2
+net/micode/notes/ui/NoteItemData.java
+ net.micode.notes.ui.NoteItemData
+net/micode/notes/gtask/exception/ActionFailureException.java
+ net.micode.notes.gtask.exception.ActionFailureException
+net/micode/notes/data/Contact.java
+ net.micode.notes.data.Contact
net/micode/notes/ui/NoteEditActivity.java
net.micode.notes.ui.NoteEditActivity
net.micode.notes.ui.NoteEditActivity$1
net.micode.notes.ui.NoteEditActivity$2
net.micode.notes.ui.NoteEditActivity$3
+ net.micode.notes.ui.NoteEditActivity$4
net.micode.notes.ui.NoteEditActivity$HeadViewHolder
+net/micode/notes/gtask/data/SqlData.java
+ net.micode.notes.gtask.data.SqlData
+net/micode/notes/ui/DeleteLoginPassword.java
+ net.micode.notes.ui.DeleteLoginPassword
+ net.micode.notes.ui.DeleteLoginPassword$1
+ net.micode.notes.ui.DeleteLoginPassword$2
+net/micode/notes/ui/DateTimePicker.java
+ net.micode.notes.ui.DateTimePicker
+ net.micode.notes.ui.DateTimePicker$1
+ net.micode.notes.ui.DateTimePicker$2
+ net.micode.notes.ui.DateTimePicker$3
+ net.micode.notes.ui.DateTimePicker$4
+ net.micode.notes.ui.DateTimePicker$OnDateTimeChangedListener
+net/micode/notes/data/NotesProvider.java
+ net.micode.notes.data.NotesProvider
+net/micode/notes/tool/GTaskStringUtils.java
+ net.micode.notes.tool.GTaskStringUtils
diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/Notes-master1/app/src/main/AndroidManifest.xml
index e5c7d47..dd1580a 100644
--- a/src/Notes-master1/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master1/app/src/main/AndroidManifest.xml
@@ -20,7 +20,6 @@
android:versionCode="1"
android:versionName="0.1" >
-
@@ -35,21 +34,62 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+ android:exported="false"
+ android:multiprocess="true">
+
+
@@ -146,5 +193,8 @@
+
diff --git a/src/Notes-master1/app/src/main/Assets/Fonts/simfang.ttf b/src/Notes-master1/app/src/main/Assets/Fonts/simfang.ttf
new file mode 100644
index 0000000..68334e2
Binary files /dev/null and b/src/Notes-master1/app/src/main/Assets/Fonts/simfang.ttf differ
diff --git a/src/Notes-master1/app/src/main/Assets/Fonts/simhei.ttf b/src/Notes-master1/app/src/main/Assets/Fonts/simhei.ttf
new file mode 100644
index 0000000..5bd4687
Binary files /dev/null and b/src/Notes-master1/app/src/main/Assets/Fonts/simhei.ttf differ
diff --git a/src/Notes-master1/app/src/main/Assets/Fonts/simkai.ttf b/src/Notes-master1/app/src/main/Assets/Fonts/simkai.ttf
new file mode 100644
index 0000000..d7c3b90
Binary files /dev/null and b/src/Notes-master1/app/src/main/Assets/Fonts/simkai.ttf differ
diff --git a/src/Notes-master1/app/src/main/Assets/Fonts/simsun.ttc b/src/Notes-master1/app/src/main/Assets/Fonts/simsun.ttc
new file mode 100644
index 0000000..5f22ce3
Binary files /dev/null and b/src/Notes-master1/app/src/main/Assets/Fonts/simsun.ttc differ
diff --git a/src/Notes-master1/app/src/main/Assets/Fonts/simsunb.ttc b/src/Notes-master1/app/src/main/Assets/Fonts/simsunb.ttc
new file mode 100644
index 0000000..5f22ce3
Binary files /dev/null and b/src/Notes-master1/app/src/main/Assets/Fonts/simsunb.ttc differ
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java
index 9bfec2c..d97ac5d 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java
@@ -26,9 +26,6 @@ import android.util.Log;
import java.util.HashMap;
public class Contact {
- private Contact(){
- throw new IllegalArgumentException("Contact class");
- }
private static HashMap sContactCache;
private static final String TAG = "Contact";
@@ -41,7 +38,7 @@ public class Contact {
public static String getContact(Context context, String phoneNumber) {
if(sContactCache == null) {
- sContactCache = new HashMap<>();
+ sContactCache = new HashMap();
}
if(sContactCache.containsKey(phoneNumber)) {
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java
index 8158ff0..f240604 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java
@@ -18,9 +18,6 @@ package net.micode.notes.data;
import android.net.Uri;
public class Notes {
- private Notes(){
- throw new IllegalArgumentException("Notes class");
- }
public static final String AUTHORITY = "micode_notes";
public static final String TAG = "Notes";
public static final int TYPE_NOTE = 0;
@@ -48,11 +45,8 @@ public class Notes {
public static final int TYPE_WIDGET_INVALIDE = -1;
public static final int TYPE_WIDGET_2X = 0;
public static final int TYPE_WIDGET_4X = 1;
- private static final String CONTENT = "content://";
+
public static class DataConstants {
- private DataConstants() {
- throw new IllegalStateException("DataConstants class");
- }
public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
}
@@ -60,17 +54,14 @@ public class Notes {
/**
* Uri to query all notes and folders
*/
- public static final Uri CONTENT_NOTE_URI = Uri.parse(CONTENT + AUTHORITY + "/note");
+ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
/**
* Uri to query data
*/
- public static final Uri CONTENT_DATA_URI = Uri.parse(CONTENT + AUTHORITY + "/data");
+ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
- public final class NoteColumns {
- private NoteColumns() {
- throw new IllegalStateException("NoteColumns class");
- }
+ public interface NoteColumns {
/**
* The unique ID for a row
*
Type: INTEGER (long)
@@ -251,9 +242,6 @@ public class Notes {
}
public static final class TextNote implements DataColumns {
- private TextNote() {
- throw new IllegalStateException("TextNote class");
- }
/**
* Mode to indicate the text in check list mode or not
*
Type: Integer 1:check list mode 0: normal mode
@@ -266,13 +254,10 @@ public class Notes {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note";
- public static final Uri CONTENT_URI = Uri.parse(CONTENT + AUTHORITY + "/text_note");
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note");
}
public static final class CallNote implements DataColumns {
- private CallNote() {
- throw new IllegalStateException("CallNote class");
- }
/**
* Call date for this record
*
Type: INTEGER (long)
@@ -289,6 +274,6 @@ public class Notes {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";
- public static final Uri CONTENT_URI = Uri.parse(CONTENT + AUTHORITY + "/call_note");
+ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
}
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
index 90ed3fd..ffe5d57 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
@@ -39,46 +39,42 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
}
private static final String TAG = "NotesDatabaseHelper";
- private static final String INTEGER0 = " INTEGER NOT NULL DEFAULT 0,";
- private static final String INTEGER1000 = " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000),";
- private static final String INTEGER = " TEXT NOT NULL DEFAULT '',";
private static NotesDatabaseHelper mInstance;
private static final String CREATE_NOTE_TABLE_SQL =
"CREATE TABLE " + TABLE.NOTE + "(" +
NoteColumns.ID + " INTEGER PRIMARY KEY," +
- NoteColumns.PARENT_ID + INTEGER0 +
- NoteColumns.ALERTED_DATE + INTEGER0 +
- NoteColumns.BG_COLOR_ID + INTEGER0 +
- NoteColumns.CREATED_DATE + INTEGER1000 +
- NoteColumns.HAS_ATTACHMENT + INTEGER0 +
- NoteColumns.MODIFIED_DATE + INTEGER1000 +
- NoteColumns.NOTES_COUNT + INTEGER0 +
- NoteColumns.SNIPPET + INTEGER +
- NoteColumns.TYPE + INTEGER0 +
- NoteColumns.WIDGET_ID + INTEGER0 +
+ NoteColumns.PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ALERTED_DATE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.BG_COLOR_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.HAS_ATTACHMENT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.NOTES_COUNT + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.SNIPPET + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.TYPE + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.WIDGET_ID + " INTEGER NOT NULL DEFAULT 0," +
NoteColumns.WIDGET_TYPE + " INTEGER NOT NULL DEFAULT -1," +
- NoteColumns.SYNC_ID + INTEGER0 +
- NoteColumns.LOCAL_MODIFIED + INTEGER0 +
- NoteColumns.ORIGIN_PARENT_ID + INTEGER0 +
- NoteColumns.GTASK_ID + INTEGER +
- NoteColumns.VERSION + INTEGER0 +
+ NoteColumns.SYNC_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.LOCAL_MODIFIED + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," +
+ NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" +
")";
-
private static final String CREATE_DATA_TABLE_SQL =
"CREATE TABLE " + TABLE.DATA + "(" +
DataColumns.ID + " INTEGER PRIMARY KEY," +
DataColumns.MIME_TYPE + " TEXT NOT NULL," +
- DataColumns.NOTE_ID + INTEGER0 +
- NoteColumns.CREATED_DATE + INTEGER1000 +
- NoteColumns.MODIFIED_DATE + INTEGER1000 +
- DataColumns.CONTENT + INTEGER +
+ DataColumns.NOTE_ID + " INTEGER NOT NULL DEFAULT 0," +
+ NoteColumns.CREATED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ NoteColumns.MODIFIED_DATE + " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," +
+ DataColumns.CONTENT + " TEXT NOT NULL DEFAULT ''," +
DataColumns.DATA1 + " INTEGER," +
DataColumns.DATA2 + " INTEGER," +
- DataColumns.DATA3 + INTEGER +
- DataColumns.DATA4 + INTEGER +
+ DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," +
+ DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," +
DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" +
")";
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
index 096c421..edb0a60 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java
@@ -73,7 +73,7 @@ public class NotesProvider extends ContentProvider {
+ "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + ","
+ "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
- private static String notesSnippetSearchQuery = "SELECT " + NOTES_SEARCH_PROJECTION
+ private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION
+ " FROM " + TABLE.NOTE
+ " WHERE " + NoteColumns.SNIPPET + " LIKE ?"
+ " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER
@@ -132,7 +132,7 @@ public class NotesProvider extends ContentProvider {
try {
searchString = String.format("%%%s%%", searchString);
- c = db.rawQuery(notesSnippetSearchQuery,
+ c = db.rawQuery(NOTES_SNIPPET_SEARCH_QUERY,
new String[] { searchString });
} catch (IllegalStateException ex) {
Log.e(TAG, "got exception: " + ex.toString());
@@ -150,9 +150,7 @@ public class NotesProvider extends ContentProvider {
@Override
public Uri insert(Uri uri, ContentValues values) {
SQLiteDatabase db = mHelper.getWritableDatabase();
- long dataId = 0;
- long noteId = 0;
- long insertedId = 0;
+ long dataId = 0, noteId = 0, insertedId = 0;
switch (mMatcher.match(uri)) {
case URI_NOTE:
insertedId = noteId = db.insert(TABLE.NOTE, null, values);
@@ -200,7 +198,7 @@ public class NotesProvider extends ContentProvider {
* ID that smaller than 0 is system folder which is not allowed to
* trash
*/
- long noteId = Long.parseLong(id);
+ long noteId = Long.valueOf(id);
if (noteId <= 0) {
break;
}
@@ -285,7 +283,7 @@ public class NotesProvider extends ContentProvider {
sql.append(" WHERE ");
}
if (id > 0) {
- sql.append(NoteColumns.ID + "=" + id);
+ sql.append(NoteColumns.ID + "=" + String.valueOf(id));
}
if (!TextUtils.isEmpty(selection)) {
String selectString = id > 0 ? parseSelection(selection) : selection;
@@ -299,8 +297,8 @@ public class NotesProvider extends ContentProvider {
}
@Override
- //This function should be finished by the following programmers.
- public String getType(Uri uri){
+ public String getType(Uri uri) {
+ // TODO Auto-generated method stub
return null;
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
index 8e7d3d4..3a2050b 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@@ -26,7 +26,7 @@ import org.json.JSONObject;
public class MetaData extends Task {
- private static final String TAG = MetaData.class.getSimpleName();
+ private final static String TAG = MetaData.class.getSimpleName();
private String mRelatedGid = null;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java
index 31854ec..63950e0 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java
@@ -47,7 +47,7 @@ public abstract class Node {
private boolean mDeleted;
- protected Node() {
+ public Node() {
mGid = null;
mName = "";
mLastModified = 0;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
index 65f67e1..d3ec3be 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@@ -40,7 +40,7 @@ public class SqlData {
private static final int INVALID_ID = -99999;
- protected static final String[] PROJECTION_DATA = new String[] {
+ public static final String[] PROJECTION_DATA = new String[] {
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3
};
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
index 66ebb81..79a4095 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
@@ -140,7 +140,7 @@ public class SqlNote {
mOriginParent = 0;
mVersion = 0;
mDiffNoteValues = new ContentValues();
- mDataList = new ArrayList<>();
+ mDataList = new ArrayList();
}
public SqlNote(Context context, Cursor c) {
@@ -148,7 +148,7 @@ public class SqlNote {
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(c);
- mDataList = new ArrayList<>();
+ mDataList = new ArrayList();
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues = new ContentValues();
@@ -159,7 +159,7 @@ public class SqlNote {
mContentResolver = context.getContentResolver();
mIsCreate = false;
loadFromCursor(id);
- mDataList = new ArrayList<>();
+ mDataList = new ArrayList();
if (mType == Notes.TYPE_NOTE)
loadDataContent();
mDiffNoteValues = new ContentValues();
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java
index 4c824b9..6a19454 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java
@@ -176,33 +176,28 @@ public class Task extends Node {
}
public void setContentByLocalJSON(JSONObject js) {
-
- boolean jsNull = true;
- if (js != null)
- jsNull = false;
- if ( jsNull || !js.has(GTaskStringUtils.META_HEAD_NOTE)
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
}
try {
- if(!jsNull) {
- JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
- JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
+ JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+ JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
- if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
- Log.e(TAG, "invalid type");
- return;
- }
+ if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) {
+ Log.e(TAG, "invalid type");
+ return;
+ }
- for (int i = 0; i < dataArray.length(); i++) {
- JSONObject data = dataArray.getJSONObject(i);
- if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
- setName(data.getString(DataColumns.CONTENT));
- break;
- }
+ for (int i = 0; i < dataArray.length(); i++) {
+ JSONObject data = dataArray.getJSONObject(i);
+ if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
+ setName(data.getString(DataColumns.CONTENT));
+ break;
}
}
+
} catch (JSONException e) {
Log.e(TAG, e.toString());
e.printStackTrace();
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
index 4be474b..4ea21c5 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
@@ -28,7 +28,6 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
-import java.util.List;
public class TaskList extends Node {
@@ -40,7 +39,7 @@ public class TaskList extends Node {
public TaskList() {
super();
- mChildren = new ArrayList<>();
+ mChildren = new ArrayList();
mIndex = 1;
}
@@ -131,31 +130,26 @@ public class TaskList extends Node {
}
public void setContentByLocalJSON(JSONObject js) {
- boolean jsnull = true;
- if (js != null)
- jsnull = false;
- if (jsnull || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
+ if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
}
try {
- if(!jsnull){
- JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
-
- if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
- String name = folder.getString(NoteColumns.SNIPPET);
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
- } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
- if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
- else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
- setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
- + GTaskStringUtils.FOLDER_CALL_NOTE);
- else
- Log.e(TAG, "invalid system folder");
- } else {
- Log.e(TAG, "error type");
- }
+ JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
+
+ if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) {
+ String name = folder.getString(NoteColumns.SNIPPET);
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name);
+ } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
+ if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT);
+ else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER)
+ setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX
+ + GTaskStringUtils.FOLDER_CALL_NOTE);
+ else
+ Log.e(TAG, "invalid system folder");
+ } else {
+ Log.e(TAG, "error type");
}
} catch (JSONException e) {
Log.e(TAG, e.toString());
@@ -206,7 +200,13 @@ public class TaskList extends Node {
Log.e(TAG, "gtask id doesn't match");
return SYNC_ACTION_ERROR;
}
- return SYNC_ACTION_UPDATE_CONFLICT;
+ if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
+ // local modification only
+ return SYNC_ACTION_UPDATE_REMOTE;
+ } else {
+ // for folder conflicts, just apply local modification
+ return SYNC_ACTION_UPDATE_REMOTE;
+ }
}
} catch (Exception e) {
Log.e(TAG, e.toString());
@@ -329,7 +329,7 @@ public class TaskList extends Node {
return null;
}
- public List getChildTaskList() {
+ public ArrayList getChildTaskList() {
return this.mChildren;
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index 8be4c03..4942bcf 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -2,6 +2,7 @@
/*
* Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
*
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -30,7 +31,7 @@ import net.micode.notes.ui.NotesPreferenceActivity;
public class GTaskASyncTask extends AsyncTask {
- private static int GtaskSyncNotificationId = 5234235;
+ private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;
public interface OnCompleteListener {
void onComplete();
@@ -57,7 +58,9 @@ public class GTaskASyncTask extends AsyncTask {
}
public void publishProgess(String message) {
- publishProgress(message);
+ publishProgress(new String[] {
+ message
+ });
}
private void showNotification(int tickerId, String content) {
@@ -74,7 +77,9 @@ public class GTaskASyncTask extends AsyncTask {
pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
NotesListActivity.class), 0);
}
- mNotifiManager.notify(GtaskSyncNotificationId, notification);
+ //notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+ //pendingIntent);
+ mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
}
@Override
@@ -108,6 +113,7 @@ public class GTaskASyncTask extends AsyncTask {
}
if (mOnCompleteListener != null) {
new Thread(new Runnable() {
+
public void run() {
mOnCompleteListener.onComplete();
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
index 33735c9..c67dfdf 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
@@ -112,7 +112,7 @@ public class GTaskClient {
public boolean login(Activity activity) {
// we suppose that the cookie would expire after 5 minutes
// then we need to re-login
- final long interval = (1000 * 60 * 5);
+ final long interval = 1000 * 60 * 5;
if (mLastLoginTime + interval < System.currentTimeMillis()) {
mLoggedin = false;
}
@@ -318,10 +318,8 @@ public class GTaskClient {
}
sb = sb.append(buff);
}
- }catch (Exception e) {
- Log.e(TAG, e.toString());
- e.printStackTrace();
- throw new ActionFailureException("error occurs when posting request");
+ } finally {
+ input.close();
}
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
index 5f62bc0..d2b4082 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
@@ -90,13 +90,13 @@ public class GTaskManager {
private GTaskManager() {
mSyncing = false;
mCancelled = false;
- mGTaskListHashMap = new HashMap<>();
- mGTaskHashMap = new HashMap<>();
- mMetaHashMap = new HashMap<>();
+ mGTaskListHashMap = new HashMap();
+ mGTaskHashMap = new HashMap();
+ mMetaHashMap = new HashMap();
mMetaList = null;
- mLocalDeleteIdMap = new HashSet<>();
- mGidToNid = new HashMap<>();
- mNidToGid = new HashMap<>();
+ mLocalDeleteIdMap = new HashSet();
+ mGidToNid = new HashMap();
+ mNidToGid = new HashMap();
}
public static synchronized GTaskManager getInstance() {
@@ -132,13 +132,10 @@ public class GTaskManager {
client.resetUpdateArray();
// login google task
- /*if (!mCancelled) {
+ if (!mCancelled) {
if (!client.login(mActivity)) {
throw new NetworkFailureException("login google task failed");
}
- }*/
- if (!client.login(mActivity)) {
- throw new NetworkFailureException("login google task failed");
}
// get the task list from google
@@ -193,7 +190,7 @@ public class GTaskManager {
// load meta data
JSONArray jsMetas = client.getTaskList(gid);
for (int j = 0; j < jsMetas.length(); j++) {
- object = jsMetas.getJSONObject(j);
+ object = (JSONObject) jsMetas.getJSONObject(j);
MetaData metaData = new MetaData();
metaData.setContentByRemoteJSON(object);
if (metaData.isWorthSaving()) {
@@ -490,7 +487,7 @@ public class GTaskManager {
addLocalNode(node);
break;
case Node.SYNC_ACTION_ADD_REMOTE:
- addRemoteNode(c);
+ addRemoteNode(node, c);
break;
case Node.SYNC_ACTION_DEL_LOCAL:
meta = mMetaHashMap.get(c.getString(SqlNote.GTASK_ID_COLUMN));
@@ -521,8 +518,7 @@ public class GTaskManager {
break;
case Node.SYNC_ACTION_ERROR:
default:
- ActionFailureException e = new ActionFailureException("unkown sync action type");
- throw e;
+ throw new ActionFailureException("unkown sync action type");
}
}
@@ -623,7 +619,7 @@ public class GTaskManager {
updateRemoteMeta(node.getGid(), sqlNote);
}
- private void addRemoteNode(Cursor c) throws NetworkFailureException {
+ private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException {
if (mCancelled) {
return;
}
@@ -644,7 +640,7 @@ public class GTaskManager {
mGTaskListHashMap.get(parentGid).addChildTask(task);
GTaskClient.getInstance().createTask(task);
- n = task;
+ n = (Node) task;
// add meta
updateRemoteMeta(task.getGid(), sqlNote);
@@ -682,7 +678,7 @@ public class GTaskManager {
GTaskClient.getInstance().createTaskList(tasklist);
mGTaskListHashMap.put(tasklist.getGid(), tasklist);
}
- n = tasklist;
+ n = (Node) tasklist;
}
// update local note
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
index d69fe08..cca36f7 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
@@ -24,19 +24,19 @@ import android.os.Bundle;
import android.os.IBinder;
public class GTaskSyncService extends Service {
- public static final String ACTION_STRING_NAME = "sync_action_type";
+ public final static String ACTION_STRING_NAME = "sync_action_type";
- public static final int ACTION_START_SYNC = 0;
+ public final static int ACTION_START_SYNC = 0;
- public static final int ACTION_CANCEL_SYNC = 1;
+ public final static int ACTION_CANCEL_SYNC = 1;
- public static final int ACTION_INVALID = 2;
+ public final static int ACTION_INVALID = 2;
- public static final String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
+ public final static String GTASK_SERVICE_BROADCAST_NAME = "net.micode.notes.gtask.remote.gtask_sync_service";
- public static final String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
+ public final static String GTASK_SERVICE_BROADCAST_IS_SYNCING = "isSyncing";
- public static final String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
+ public final static String GTASK_SERVICE_BROADCAST_PROGRESS_MSG = "progressMsg";
private static GTaskASyncTask mSyncTask = null;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
index b52d52d..6706cf6 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java
@@ -186,7 +186,7 @@ public class Note {
throw new IllegalArgumentException("Wrong note id:" + noteId);
}
- ArrayList operationList = new ArrayList<>();
+ ArrayList operationList = new ArrayList();
ContentProviderOperation.Builder builder = null;
if(mTextDataValues.size() > 0) {
@@ -233,7 +233,7 @@ public class Note {
mCallDataValues.clear();
}
- if (operationList.size() != 0) {
+ if (operationList.size() > 0) {
try {
ContentProviderResult[] results = context.getContentResolver().applyBatch(
Notes.AUTHORITY, operationList);
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
index 7471b32..be081e4 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java
@@ -217,12 +217,12 @@ public class WorkingNote {
}
private boolean isWorthSaving() {
- boolean flag = true;
if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent))
|| (existInDatabase() && !mNote.isLocalModified())) {
- flag = false;
+ return false;
+ } else {
+ return true;
}
- return flag;
}
public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) {
@@ -294,7 +294,9 @@ public class WorkingNote {
mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER));
}
- public boolean hasClockAlert() { return (mAlertDate > 0); }
+ public boolean hasClockAlert() {
+ return (mAlertDate > 0 ? true : false);
+ }
public String getContent() {
return mContent;
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java
index f567c5f..39f6ec4 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java
@@ -69,6 +69,10 @@ public class BackupUtils {
mTextExport = new TextExport(context);
}
+ private static boolean externalStorageAvailable() {
+ return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
+ }
+
public int exportToText() {
return mTextExport.exportToText();
}
@@ -121,10 +125,6 @@ public class BackupUtils {
private String mFileName;
private String mFileDirectory;
- private static boolean externalStorageAvailable() {
- return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
- }
-
public TextExport(Context context) {
TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note);
mContext = context;
@@ -307,43 +307,38 @@ public class BackupUtils {
}
return ps;
}
-
- private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
- StringBuilder sb = new StringBuilder();
- sb.append(Environment.getExternalStorageDirectory());
- sb.append(context.getString(filePathResId));
- File filedir = new File(sb.toString());
- sb.append(context.getString(
- fileNameFormatResId,
- DateFormat.format(context.getString(R.string.format_date_ymd),
- System.currentTimeMillis())));
- File file = new File(sb.toString());
-
- try {
- if (!filedir.exists()) {
- filedir.mkdir();
- }
- if (!file.exists()) {
- file.createNewFile();
- if (!file.createNewFile()){
- Log.e(TAG, "createNewFile failed");
- }
- }
- return file;
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
- }
}
/**
* Generate the text file to store imported data
*/
+ private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(Environment.getExternalStorageDirectory());
+ sb.append(context.getString(filePathResId));
+ File filedir = new File(sb.toString());
+ sb.append(context.getString(
+ fileNameFormatResId,
+ DateFormat.format(context.getString(R.string.format_date_ymd),
+ System.currentTimeMillis())));
+ File file = new File(sb.toString());
+
+ try {
+ if (!filedir.exists()) {
+ filedir.mkdir();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
+ return file;
+ } catch (SecurityException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java
index ab075f5..2a14982 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java
@@ -35,10 +35,7 @@ import java.util.ArrayList;
import java.util.HashSet;
-public class DataUtils {
- private DataUtils() {
- throw new IllegalStateException("DataUtils class");
- }
+public class DataUtils {
public static final String TAG = "DataUtils";
public static boolean batchDeleteNotes(ContentResolver resolver, HashSet ids) {
if (ids == null) {
@@ -50,7 +47,7 @@ public class DataUtils {
return true;
}
- ArrayList operationList = new ArrayList<>();
+ ArrayList operationList = new ArrayList();
for (long id : ids) {
if(id == Notes.ID_ROOT_FOLDER) {
Log.e(TAG, "Don't delete system folder root");
@@ -90,7 +87,7 @@ public class DataUtils {
return true;
}
- ArrayList operationList = new ArrayList<>();
+ ArrayList operationList = new ArrayList();
for (long id : ids) {
ContentProviderOperation.Builder builder = ContentProviderOperation
.newUpdate(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id));
@@ -210,7 +207,7 @@ public class DataUtils {
HashSet set = null;
if (c != null) {
if (c.moveToFirst()) {
- set = new HashSet<>();
+ set = new HashSet();
do {
try {
AppWidgetAttribute widget = new AppWidgetAttribute();
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
index 52a947f..666b729 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
@@ -17,100 +17,97 @@
package net.micode.notes.tool;
public class GTaskStringUtils {
- private GTaskStringUtils() {
- throw new IllegalStateException("GTaskStringUtils class");
- }
- public static final String GTASK_JSON_ACTION_ID = "action_id";
+ public final static String GTASK_JSON_ACTION_ID = "action_id";
- public static final String GTASK_JSON_ACTION_LIST = "action_list";
+ public final static String GTASK_JSON_ACTION_LIST = "action_list";
- public static final String GTASK_JSON_ACTION_TYPE = "action_type";
+ public final static String GTASK_JSON_ACTION_TYPE = "action_type";
- public static final String GTASK_JSON_ACTION_TYPE_CREATE = "create";
+ public final static String GTASK_JSON_ACTION_TYPE_CREATE = "create";
- public static final String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
+ public final static String GTASK_JSON_ACTION_TYPE_GETALL = "get_all";
- public static final String GTASK_JSON_ACTION_TYPE_MOVE = "move";
+ public final static String GTASK_JSON_ACTION_TYPE_MOVE = "move";
- public static final String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
+ public final static String GTASK_JSON_ACTION_TYPE_UPDATE = "update";
- public static final String GTASK_JSON_CREATOR_ID = "creator_id";
+ public final static String GTASK_JSON_CREATOR_ID = "creator_id";
- public static final String GTASK_JSON_CHILD_ENTITY = "child_entity";
+ public final static String GTASK_JSON_CHILD_ENTITY = "child_entity";
- public static final String GTASK_JSON_CLIENT_VERSION = "client_version";
+ public final static String GTASK_JSON_CLIENT_VERSION = "client_version";
- public static final String GTASK_JSON_COMPLETED = "completed";
+ public final static String GTASK_JSON_COMPLETED = "completed";
- public static final String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
+ public final static String GTASK_JSON_CURRENT_LIST_ID = "current_list_id";
- public static final String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
+ public final static String GTASK_JSON_DEFAULT_LIST_ID = "default_list_id";
- public static final String GTASK_JSON_DELETED = "deleted";
+ public final static String GTASK_JSON_DELETED = "deleted";
- public static final String GTASK_JSON_DEST_LIST = "dest_list";
+ public final static String GTASK_JSON_DEST_LIST = "dest_list";
- public static final String GTASK_JSON_DEST_PARENT = "dest_parent";
+ public final static String GTASK_JSON_DEST_PARENT = "dest_parent";
- public static final String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
+ public final static String GTASK_JSON_DEST_PARENT_TYPE = "dest_parent_type";
- public static final String GTASK_JSON_ENTITY_DELTA = "entity_delta";
+ public final static String GTASK_JSON_ENTITY_DELTA = "entity_delta";
- public static final String GTASK_JSON_ENTITY_TYPE = "entity_type";
+ public final static String GTASK_JSON_ENTITY_TYPE = "entity_type";
- public static final String GTASK_JSON_GET_DELETED = "get_deleted";
+ public final static String GTASK_JSON_GET_DELETED = "get_deleted";
- public static final String GTASK_JSON_ID = "id";
+ public final static String GTASK_JSON_ID = "id";
- public static final String GTASK_JSON_INDEX = "index";
+ public final static String GTASK_JSON_INDEX = "index";
- public static final String GTASK_JSON_LAST_MODIFIED = "last_modified";
+ public final static String GTASK_JSON_LAST_MODIFIED = "last_modified";
- public static final String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
+ public final static String GTASK_JSON_LATEST_SYNC_POINT = "latest_sync_point";
- public static final String GTASK_JSON_LIST_ID = "list_id";
+ public final static String GTASK_JSON_LIST_ID = "list_id";
- public static final String GTASK_JSON_LISTS = "lists";
+ public final static String GTASK_JSON_LISTS = "lists";
- public static final String GTASK_JSON_NAME = "name";
+ public final static String GTASK_JSON_NAME = "name";
- public static final String GTASK_JSON_NEW_ID = "new_id";
+ public final static String GTASK_JSON_NEW_ID = "new_id";
- public static final String GTASK_JSON_NOTES = "notes";
+ public final static String GTASK_JSON_NOTES = "notes";
- public static final String GTASK_JSON_PARENT_ID = "parent_id";
+ public final static String GTASK_JSON_PARENT_ID = "parent_id";
- public static final String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
+ public final static String GTASK_JSON_PRIOR_SIBLING_ID = "prior_sibling_id";
- public static final String GTASK_JSON_RESULTS = "results";
+ public final static String GTASK_JSON_RESULTS = "results";
- public static final String GTASK_JSON_SOURCE_LIST = "source_list";
+ public final static String GTASK_JSON_SOURCE_LIST = "source_list";
- public static final String GTASK_JSON_TASKS = "tasks";
+ public final static String GTASK_JSON_TASKS = "tasks";
- public static final String GTASK_JSON_TYPE = "type";
+ public final static String GTASK_JSON_TYPE = "type";
- public static final String GTASK_JSON_TYPE_GROUP = "GROUP";
+ public final static String GTASK_JSON_TYPE_GROUP = "GROUP";
- public static final String GTASK_JSON_TYPE_TASK = "TASK";
+ public final static String GTASK_JSON_TYPE_TASK = "TASK";
- public static final String GTASK_JSON_USER = "user";
+ public final static String GTASK_JSON_USER = "user";
- public static final String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
+ public final static String MIUI_FOLDER_PREFFIX = "[MIUI_Notes]";
- public static final String FOLDER_DEFAULT = "Default";
+ public final static String FOLDER_DEFAULT = "Default";
- public static final String FOLDER_CALL_NOTE = "Call_Note";
+ public final static String FOLDER_CALL_NOTE = "Call_Note";
- public static final String FOLDER_META = "METADATA";
+ public final static String FOLDER_META = "METADATA";
- public static final String META_HEAD_GTASK_ID = "meta_gid";
+ public final static String META_HEAD_GTASK_ID = "meta_gid";
- public static final String META_HEAD_NOTE = "meta_note";
+ public final static String META_HEAD_NOTE = "meta_note";
- public static final String META_HEAD_DATA = "meta_data";
+ public final static String META_HEAD_DATA = "meta_data";
- public static final String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
+ public final static String META_NOTE_NAME = "[META INFO] DON'T UPDATE AND DELETE";
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java
index 8718f02..1ad3ad6 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -23,9 +23,6 @@ import net.micode.notes.R;
import net.micode.notes.ui.NotesPreferenceActivity;
public class ResourceParser {
- private ResourceParser() {
- throw new IllegalStateException("ResourceParser class");
- }
public static final int YELLOW = 0;
public static final int BLUE = 1;
@@ -43,9 +40,6 @@ public class ResourceParser {
public static final int BG_DEFAULT_FONT_SIZE = TEXT_MEDIUM;
public static class NoteBgResources {
- private NoteBgResources() {
- throw new IllegalStateException("NoteBgResources class");
- }
private final static int [] BG_EDIT_RESOURCES = new int [] {
R.drawable.edit_yellow,
R.drawable.edit_blue,
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 3bd6f96..85723be 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -105,12 +105,16 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
mPlayer.setLooping(true);
mPlayer.start();
} catch (IllegalArgumentException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
} catch (SecurityException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalStateException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
+ // TODO Auto-generated catch block
e.printStackTrace();
}
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java
new file mode 100644
index 0000000..51d860a
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java
@@ -0,0 +1,78 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class ChangedLoginPassword extends Activity{
+ EditText OldPassword;
+ EditText NewPassword;
+ EditText AckPassword;
+ Button Acknowledged;
+ Button GoBack;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_change_loginpassword);
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+ OldPassword=(EditText) findViewById(R.id.old_password);
+ NewPassword=(EditText) findViewById(R.id.new_password);
+ AckPassword=(EditText) findViewById(R.id.ack_password);
+ Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged);
+ GoBack=(Button)findViewById(R.id.button2);
+ GoBack.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(ChangedLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+ Acknowledged.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String old_password = OldPassword.getText().toString();
+ String new_password = NewPassword.getText().toString();
+ String ack_password = AckPassword.getText().toString();
+ SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+ String login_password=pref.getString("password","");
+ if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) {
+ Toast.makeText(ChangedLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
+ }else if (new_password.equals(ack_password) == false) {
+ Toast.makeText(ChangedLoginPassword.this, "新建密码与重复密码不匹配,请重新输入密码", Toast.LENGTH_SHORT).show();
+ AckPassword.setText("");
+ }else if(old_password.equals(login_password) == false){
+ Toast.makeText(ChangedLoginPassword.this, "原有密码错误,请重新输入密码", Toast.LENGTH_SHORT).show();
+ OldPassword.setText("");
+ }
+ else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){
+ SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit();
+ editor.putString("password",new_password);
+ editor.apply();
+ Toast.makeText(ChangedLoginPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show();
+ Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onBackPressed() {
+ Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index fde6666..2c47ba4 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -77,7 +77,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
DateUtils.FORMAT_SHOW_YEAR |
DateUtils.FORMAT_SHOW_DATE |
DateUtils.FORMAT_SHOW_TIME;
- flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_12HOUR;
+ flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java
new file mode 100644
index 0000000..5d7952b
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java
@@ -0,0 +1,72 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+public class DeleteLoginPassword extends Activity{
+ EditText password01;
+ Button Acknowledged;
+ Button GoBack;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_delete_loginpassword);
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+ password01=(EditText) findViewById(R.id.old_password);
+ Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged);
+ GoBack=(Button)findViewById(R.id.button3);
+ GoBack.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(DeleteLoginPassword.this, NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+ Acknowledged.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String text02 = password01.getText().toString();
+ if(text02.equals("")==true)
+ Toast.makeText(DeleteLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show();
+ SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+ String password = pref.getString("password","");
+ if(password.equals("")==false&&password.equals(text02)==true){
+ SharedPreferences.Editor editor=getSharedPreferences("user management",
+ MODE_PRIVATE).edit();
+ editor.putBoolean("user",false);//false表示已经设置登录密码
+ editor.putString("password","");
+ editor.apply();
+
+ Toast.makeText(DeleteLoginPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show();
+ Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ else{
+ Toast.makeText(DeleteLoginPassword.this, "密码错误", Toast.LENGTH_SHORT).show();
+ password01.setText("");//把密码框内输入过的错误密码清空
+ }
+ }
+ });
+ }
+
+ @Override
+ public void onBackPressed() {
+ Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java
new file mode 100644
index 0000000..83e8577
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/LoginActivity.java
@@ -0,0 +1,69 @@
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+/**
+ * Created by XT on 2021/11/4.
+ */
+
+public class LoginActivity extends Activity{
+ EditText lg_password;
+ Button lg_login;
+ Button Goback;
+ public Button getLg_login() {
+ return lg_login;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState){
+ super.onCreate(savedInstanceState);
+ SharedPreferences pref = getSharedPreferences("user management",MODE_PRIVATE);
+ boolean User_boolean = pref.getBoolean("user",false);
+ if(!User_boolean){
+ Intent intent = new Intent(LoginActivity.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+
+ setContentView(R.layout.activity_login);
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+ | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ );
+ lg_password = (EditText)findViewById(R.id.lg_password);
+ lg_login=(Button)findViewById(R.id.login);
+ Goback = (Button)findViewById(R.id.button1);
+ Goback.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ LoginActivity.super.onBackPressed();
+ }
+ });
+ lg_login.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ SharedPreferences pref = getSharedPreferences("user management",MODE_PRIVATE);
+ String password = pref.getString("password","");
+ if(password.equals("") == false && password.equals(lg_password.getText().toString())==true){
+ Intent intent = new Intent(LoginActivity.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ else{
+ Toast.makeText(LoginActivity.this,"密码错误",Toast.LENGTH_SHORT).show();
+ lg_password.setText("");
+ }
+ }
+ });
+ }
+}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 8e38577..9d82a83 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -28,6 +28,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Paint;
+import android.graphics.Typeface;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.Spannable;
@@ -74,17 +75,17 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
- private static class HeadViewHolder {
- private TextView tvModified;
+ private class HeadViewHolder {
+ public TextView tvModified;
- private ImageView ivAlertIcon;
+ public ImageView ivAlertIcon;
- private TextView tvAlertDate;
+ public TextView tvAlertDate;
- private ImageView ibSetBgColor;
+ public ImageView ibSetBgColor;
}
- private static final Map sBgSelectorBtnsMap = new HashMap<>();
+ private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
@@ -93,7 +94,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
}
- private static final Map sBgSelectorSelectionMap = new HashMap<>();
+ private static final Map sBgSelectorSelectionMap = new HashMap();
static {
sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
@@ -102,7 +103,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
}
- private static final Map sFontSizeBtnsMap = new HashMap<>();
+ private static final Map sFontSizeBtnsMap = new HashMap();
static {
sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
@@ -110,7 +111,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
}
- private static final Map sFontSelectorSelectionMap = new HashMap<>();
+ private static final Map sFontSelectorSelectionMap = new HashMap();
static {
sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
@@ -287,6 +288,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
| DateUtils.FORMAT_SHOW_YEAR));
+
+ /**
+ * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
+ * is not ready
+ */
showAlertHeader();
}
@@ -304,7 +310,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
} else {
mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
- }
+ };
}
@Override
@@ -425,7 +431,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (id == R.id.btn_set_bg_color) {
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
- View.VISIBLE);
+ - View.VISIBLE);
} else if (sBgSelectorBtnsMap.containsKey(id)) {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
@@ -499,13 +505,46 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
return true;
}
-
+ public void showFontChange() {
+ final String[] items = {"仿宋", "黑体","楷体","宋体","新宋体"};
+ final AlertDialog.Builder fontChange = new AlertDialog.Builder(this);
+ fontChange.setTitle("中文字体选择");
+ fontChange.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int i) {
+ switch (i) {
+ case 0:
+ Typeface typeface0 = Typeface.createFromAsset(getAssets(), "Fonts/simfang.ttf");
+ mNoteEditor.setTypeface(typeface0);
+ break;
+ case 1:
+ Typeface typeface1 = Typeface.createFromAsset(getAssets(), "Fonts/simhei.ttf");
+ mNoteEditor.setTypeface(typeface1);
+ break;
+ case 2:
+ Typeface typeface2 = Typeface.createFromAsset(getAssets(), "Fonts/simkai.ttf");
+ mNoteEditor.setTypeface(typeface2);
+ break;
+ case 3:
+ Typeface typeface3 = Typeface.createFromAsset(getAssets(), "Fonts/simsunb.ttc");
+ mNoteEditor.setTypeface(typeface3);
+ break;
+ case 4:
+ Typeface typeface4 = Typeface.createFromAsset(getAssets(), "Fonts/simsun.ttc");
+ mNoteEditor.setTypeface(typeface4);
+ break;
+ }
+ }
+ }).show();
+ }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_new_note:
createNewNote();
break;
+ case R.id.menu_change_note:
+ showFontChange();
+ break;
case R.id.menu_delete:
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.alert_title_delete));
@@ -583,7 +622,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private void deleteCurrentNote() {
if (mWorkingNote.existInDatabase()) {
- HashSet ids = new HashSet<>();
+ HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index 417ef6a..a7df122 100644
--- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -135,6 +135,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private final static int REQUEST_CODE_OPEN_NODE = 102;
private final static int REQUEST_CODE_NEW_NODE = 103;
+ int login_mode = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -163,14 +164,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
StringBuilder sb = new StringBuilder();
InputStream in = null;
try {
- in = getResources().openRawResource(R.raw.introduction);
-
- InputStreamReader isr = new InputStreamReader(in);
- BufferedReader br = new BufferedReader(isr);
- char [] buf = new char[1024];
- int len = 0;
- while ((len = br.read(buf)) > 0) {
- sb.append(buf, 0, len);
+ in = getResources().openRawResource(R.raw.introduction);
+ if (in != null) {
+ InputStreamReader isr = new InputStreamReader(in);
+ BufferedReader br = new BufferedReader(isr);
+ char [] buf = new char[1024];
+ int len = 0;
+ while ((len = br.read(buf)) > 0) {
+ sb.append(buf, 0, len);
+ }
+ } else {
+ Log.e(TAG, "Read introduction file error");
+ return;
}
} catch (IOException e) {
e.printStackTrace();
@@ -808,12 +813,47 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
case R.id.menu_search:
onSearchRequested();
break;
+
+ case R.id.menu_login:{
+ SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE);
+ String login_password=pref.getString("password","");
+ if (login_password.equals("")==true) {
+ set_login_password();
+ } else {
+ change_login_password();
+ }
+ break;
+ }
+
+
+ case R.id.menu_deletelogin:{
+ delete_login_password();
+ break;
+ }
default:
break;
}
return true;
}
+ private void delete_login_password() {
+ Intent intent = new Intent(NotesListActivity.this,DeleteLoginPassword.class);
+ startActivity(intent);
+ finish();
+ }
+
+ private void change_login_password() {
+ Intent intent = new Intent(NotesListActivity.this,ChangedLoginPassword.class);
+ startActivity(intent);
+ finish();
+ }
+
+ private void set_login_password() {
+ Intent intent = new Intent(NotesListActivity.this,RegisterLoginPassword.class);
+ startActivity(intent);
+ finish();
+ }
+
@Override
public boolean onSearchRequested() {
startSearch(null, false, null /* appData */, false);
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java
new file mode 100644
index 0000000..1b360c0
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java
@@ -0,0 +1,82 @@
+package net.micode.notes.ui;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+
+
+/**
+ * Created by XT on 2021/11/4.
+ */
+
+public class RegisterLoginPassword extends Activity{
+ EditText password01;
+ EditText password02;
+ Button registered;
+ Button GoBack;
+ public Button getRegistered() {
+ return registered;
+ }
+ @TargetApi(Build.VERSION_CODES.CUPCAKE)
+ protected void onCreate(Bundle saveInstanceState){
+ super.onCreate(saveInstanceState);
+ setContentView(R.layout.activity_set_loginpassword);
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+ );
+ password01=(EditText)findViewById(R.id.rg_password01);
+ password02=(EditText)findViewById(R.id.rg_password02);
+ registered=(Button)findViewById(R.id.rg_registered);
+ GoBack=(Button)findViewById(R.id.button4);
+ GoBack.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(RegisterLoginPassword.this, NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ });
+ registered.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String text02 = password01.getText().toString();
+ String text03 = password02.getText().toString();
+ if(text02.equals("")==true){
+ Toast.makeText(RegisterLoginPassword.this,"密码不能为空",Toast.LENGTH_SHORT).show();
+ }else if (text02.equals(text03) == false){
+ Toast.makeText(RegisterLoginPassword.this,"密码不匹配,请重新登录",Toast.LENGTH_SHORT).show();
+ password02.setText("");
+ }else if(text02.equals(text03) == true){
+ SharedPreferences.Editor editor = getSharedPreferences("user management",MODE_PRIVATE).edit();
+ editor.putBoolean("user",true);
+ editor.putString("password",text02);
+ editor.apply();
+ Log.d("RegisterLoginPassword","password is" +text02);
+ Toast.makeText(RegisterLoginPassword.this,"设置成功",Toast.LENGTH_SHORT).show();
+ Intent intent = new Intent(RegisterLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+ }
+ });
+ }
+ @Override
+ public void onBackPressed(){
+ Intent intent = new Intent(RegisterLoginPassword.this,NotesListActivity.class);
+ startActivity(intent);
+ finish();
+ }
+}
+
diff --git a/src/Notes-master1/app/src/main/res/layout/activity_change_loginpassword.xml b/src/Notes-master1/app/src/main/res/layout/activity_change_loginpassword.xml
new file mode 100644
index 0000000..e607f1f
--- /dev/null
+++ b/src/Notes-master1/app/src/main/res/layout/activity_change_loginpassword.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/layout/activity_delete_loginpassword.xml b/src/Notes-master1/app/src/main/res/layout/activity_delete_loginpassword.xml
new file mode 100644
index 0000000..42892f7
--- /dev/null
+++ b/src/Notes-master1/app/src/main/res/layout/activity_delete_loginpassword.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/layout/activity_login.xml b/src/Notes-master1/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..7ca9c6e
--- /dev/null
+++ b/src/Notes-master1/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/layout/activity_set_loginpassword.xml b/src/Notes-master1/app/src/main/res/layout/activity_set_loginpassword.xml
new file mode 100644
index 0000000..72639dc
--- /dev/null
+++ b/src/Notes-master1/app/src/main/res/layout/activity_set_loginpassword.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/src/main/res/layout/note_list.xml b/src/Notes-master1/app/src/main/res/layout/note_list.xml
index 6b25d38..a59a441 100644
--- a/src/Notes-master1/app/src/main/res/layout/note_list.xml
+++ b/src/Notes-master1/app/src/main/res/layout/note_list.xml
@@ -36,6 +36,7 @@
android:singleLine="true"
android:textColor="#FFEAD1AE"
android:textSize="@dimen/text_font_size_medium" />
+
+ android:fadingEdge="@null"
+ android:listSelector="@android:color/transparent" />
+
diff --git a/src/Notes-master1/app/src/main/res/menu/note_edit.xml b/src/Notes-master1/app/src/main/res/menu/note_edit.xml
index 35cacd1..21a03e1 100644
--- a/src/Notes-master1/app/src/main/res/menu/note_edit.xml
+++ b/src/Notes-master1/app/src/main/res/menu/note_edit.xml
@@ -18,6 +18,10 @@