diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c37e15d --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 b/.idea/sonarlint/issuestore/5/f/5f83713b5ba6c8eafb7d0cc26095948d26ee8028 similarity index 100% rename from src/Notes-master/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 rename to .idea/sonarlint/issuestore/5/f/5f83713b5ba6c8eafb7d0cc26095948d26ee8028 diff --git a/src/Notes-master/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d similarity index 100% rename from src/Notes-master/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 rename to .idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..b786c69 --- /dev/null +++ b/.idea/sonarlint/issuestore/index.pb @@ -0,0 +1,5 @@ + +9 + README.md,8\e\8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d +Q +!src/Notes-master/app/build.gradle,5\f\5f83713b5ba6c8eafb7d0cc26095948d26ee8028 \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/xiaomi_Note.iml b/.idea/xiaomi_Note.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/xiaomi_Note.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin index edd6431..86be70f 100644 Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin and b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock index b8fc0e2..54ee088 100644 Binary files a/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock and b/src/Notes-master/.gradle/6.1.1/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin index c330174..d299381 100644 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin and b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock index bc11162..aa6c10e 100644 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock and b/src/Notes-master/.gradle/6.1.1/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin b/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin index 64884b4..b202cbb 100644 Binary files a/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin and b/src/Notes-master/.gradle/6.1.1/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin index d2fcd32..b732882 100644 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/classAnalysis.bin differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin index 819cc62..e962b37 100644 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/jarAnalysis.bin differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock b/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock index 8084aa8..ffd34e1 100644 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock and b/src/Notes-master/.gradle/6.1.1/javaCompile/javaCompile.lock differ diff --git a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin b/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin index 4ee13b4..fd5bda3 100644 Binary files a/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin and b/src/Notes-master/.gradle/6.1.1/javaCompile/taskHistory.bin differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a3b6211..2be0cb7 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin index 7f3e4ca..a55e997 100644 Binary files a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master/.gradle/checksums/checksums.lock b/src/Notes-master/.gradle/checksums/checksums.lock index 3c7fc70..d614fff 100644 Binary files a/src/Notes-master/.gradle/checksums/checksums.lock and b/src/Notes-master/.gradle/checksums/checksums.lock differ diff --git a/src/Notes-master/.gradle/checksums/md5-checksums.bin b/src/Notes-master/.gradle/checksums/md5-checksums.bin index d9b0c64..54ceb25 100644 Binary files a/src/Notes-master/.gradle/checksums/md5-checksums.bin and b/src/Notes-master/.gradle/checksums/md5-checksums.bin differ diff --git a/src/Notes-master/.gradle/checksums/sha1-checksums.bin b/src/Notes-master/.gradle/checksums/sha1-checksums.bin index c4c52f7..ef35af9 100644 Binary files a/src/Notes-master/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master/.gradle/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master/.idea/compiler.xml b/src/Notes-master/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/src/Notes-master/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/gradle.xml b/src/Notes-master/.idea/gradle.xml index 5cd135a..66ff961 100644 --- a/src/Notes-master/.idea/gradle.xml +++ b/src/Notes-master/.idea/gradle.xml @@ -4,16 +4,16 @@ diff --git a/src/Notes-master/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml b/src/Notes-master/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml deleted file mode 100644 index 1bde125..0000000 --- a/src/Notes-master/.idea/libraries/Gradle__org_apache_http_legacy_android_29.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml index 37a7509..b72d126 100644 --- a/src/Notes-master/.idea/misc.xml +++ b/src/Notes-master/.idea/misc.xml @@ -1,6 +1,31 @@ - + + + + diff --git a/src/Notes-master/.idea/modules.xml b/src/Notes-master/.idea/modules.xml index 2fbe7db..ccc29d4 100644 --- a/src/Notes-master/.idea/modules.xml +++ b/src/Notes-master/.idea/modules.xml @@ -2,8 +2,11 @@ - - + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/modules/Notes-master.iml b/src/Notes-master/.idea/modules/Notes-master.iml index 5fde211..396d84f 100644 --- a/src/Notes-master/.idea/modules/Notes-master.iml +++ b/src/Notes-master/.idea/modules/Notes-master.iml @@ -3,15 +3,15 @@ - - + + diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml new file mode 100644 index 0000000..063fbe2 --- /dev/null +++ b/src/Notes-master/.idea/modules/app/Notes-master.app.androidTest.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.iml new file mode 100644 index 0000000..c2c2954 --- /dev/null +++ b/src/Notes-master/.idea/modules/app/Notes-master.app.iml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml new file mode 100644 index 0000000..40f0989 --- /dev/null +++ b/src/Notes-master/.idea/modules/app/Notes-master.app.main.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml b/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml new file mode 100644 index 0000000..ba5ddb8 --- /dev/null +++ b/src/Notes-master/.idea/modules/app/Notes-master.app.unitTest.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master/.idea/modules/app/app.iml b/src/Notes-master/.idea/modules/app/app.iml deleted file mode 100644 index e4aa478..0000000 --- a/src/Notes-master/.idea/modules/app/app.iml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master/.idea/runConfigurations.xml b/src/Notes-master/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/src/Notes-master/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c b/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c index 71710b2..b02d57c 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +++ b/src/Notes-master/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c @@ -1,40 +1,53 @@ -c java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -r -java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( -t -java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").( -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ -r -java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න -C -java:S1172"-Remove this unused method parameter "dialog".( -8 -java:S1116"Remove this empty statement.( -8 -java:S1116"Remove this empty statement.( -= -java:S1172"&Remove these unused method parameters.( -X -java:S1126"AReplace this if-then-else statement by a single return statement.( -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 t java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(ӏ +t +java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").( +t +java:S2293i"YReplace the type specification in this constructor call with the diamond operator ("<>").( o java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").( -K -java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ -n -java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 q java:S1104N"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ +r +java:S1104P"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න +r +java:S1104R"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( s java:S1104T"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( -t -java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").( -H -java:S1172"1Remove this unused method parameter "buttonView".(ܛ +V +java:S3516"9Refactor this method to not always return the same value.(l80 +n +java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( +n +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ +V +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.((80 +K +java:S2864"4Iterate over the "entrySet" instead of the "keySet".(ԇ +N +java:S1135"2Complete the task associated to this TODO comment.( +8 +java:S1116"Remove this empty statement.( +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +8 +java:S1116"Remove this empty statement.( +W +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(80 +a +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(80 +\ +java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(80 N -java:S1135"2Complete the task associated to this TODO comment.( \ No newline at end of file +java:S1874"0Remove this use of "getColor"; it is deprecated.(80 +k +java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".(80 +[ +java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð80 +Y +java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.(80 +b +java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ80 \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 b/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 new file mode 100644 index 0000000..cc88819 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/8/7/876016634c6642b35109680ccac740dc8271b236 @@ -0,0 +1,11 @@ + +F +java:S1066"/Merge this if statement with the enclosing one.( +3 +java:S2386A"Make this member "protected".( +8 +java:S2386K"Make this member "protected".(㳎 +X +java:S1126"AReplace this if-then-else statement by a single return statement.( +? +java:S1125"(Remove the unnecessary boolean literals.( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f b/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f deleted file mode 100644 index 5d35762..0000000 --- a/src/Notes-master/.idea/sonarlint/issuestore/9/a/9a3a19793537958b8b1b03a81985999e22705a2f +++ /dev/null @@ -1,5 +0,0 @@ - -P -java:S1118":Add a private constructor to hide the implicit public one.( -t -java:S2293)"YReplace the type specification in this constructor call with the diamond operator ("<>").( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb b/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb new file mode 100644 index 0000000..5405687 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb @@ -0,0 +1,15 @@ + +u +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(л +j +java:S1192?"ODefine a constant instead of duplicating this literal "Wrong note id:" 3 times.( +O +java:S2589"8Remove this expression which always evaluates to "false"( +\ +java:S1126}"AReplace this if-then-else statement by a single return statement.(Ʒ +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 23 to the 15 allowed.( +U +java:S1155">Use isEmpty() to check whether the collection is empty or not.( +\ +java:S2147"ECombine this catch with the one at line 242, which has the same body.(暩 \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb index a900cdc..44c516a 100644 --- a/src/Notes-master/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb @@ -3,10 +3,6 @@ b 2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 j :app/src/main/java/net/micode/notes/data/NotesProvider.java,6\a\6a65e747031f27aef20597b4181148a9fbf963d5 -@ -app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 -d -4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f p @app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java,1\e\1eb2363b523dbcae43d3c6e4790c64436af61b13 s @@ -15,7 +11,9 @@ Capp/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java,0\2\023468 local.properties,0\7\0712df971a99ac4d2fccb8e0fb19f377f3374cca X (gradle/wrapper/gradle-wrapper.properties,f\b\fbe448ebfc3eb2d4e308f6b8b043666f5b57235e +i +9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 k ;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c -< - build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 \ No newline at end of file +b +2app/src/main/java/net/micode/notes/model/Note.java,d\d\dd970bd8ce083850fca1d4d159647ccd110e57cb \ No newline at end of file diff --git a/src/Notes-master/.idea/workspace.xml b/src/Notes-master/.idea/workspace.xml index fe1e0b9..16ef62c 100644 --- a/src/Notes-master/.idea/workspace.xml +++ b/src/Notes-master/.idea/workspace.xml @@ -5,14 +5,292 @@ + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -33,24 +311,53 @@ + + + + + + + + + + + - + + + + + + - + + + + + + + + + - + + @@ -124,58 +438,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/src/Notes-master/app/build.gradle b/src/Notes-master/app/build.gradle index 484e256..171253f 100644 --- a/src/Notes-master/app/build.gradle +++ b/src/Notes-master/app/build.gradle @@ -8,6 +8,7 @@ android { applicationId "net.micode.notes" useLibrary'org.apache.http.legacy' targetSdkVersion 14 + minSdkVersion 11 } buildTypes { diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json index 675d86d..f2e515d 100644 --- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json +++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/debug.json @@ -1,103 +1,60 @@ { "logs": [ { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "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": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", - "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": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" - } - }, - { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "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" }, "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "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" } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } } ] }, { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\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", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "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": "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", @@ -109,14 +66,14 @@ } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -130,44 +87,97 @@ ] }, { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\values_values.arsc.flat", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { - "startLines": "2", + "startLines": "12", "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startOffsets": "532", + "endColumns": "56", + "endOffsets": "584" } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\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", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startLines": "131,118,72,75,74,73,19,20,21,121,122,130,129,119,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,123,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,128,126,125,127,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,4,4", + "startOffsets": "8254,7624,3970,4234,4137,4067,846,890,943,7742,7792,8195,8143,7679,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7856,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,8101,7972,7914,8026,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "135,118,72,75,74,73,19,20,21,121,122,130,129,119,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,123,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,128,126,125,127,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,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": "8662,7673,4061,4312,4228,4131,884,937,990,7786,7850,8248,8189,7734,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7906,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,8137,8020,7966,8095,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" }, "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": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "851,1244,1298,1394,1477,1573,1642,1685,1737,1789,1838,1901,1959,2010,2070,2154,2248,2356,2427,2511,2594,2660,2743,2845,2906,2968,3019,3097,3150,3210,3315,3374,3476,3531,3602,3651,3709,3756,3815,3872,3943,4004,4061,4111,4163,4216,4266,4316,4376,4429,4495,4557,4620,4667,4722,4810,4868,4930,4980,5025,5068,5128,5195,5250,5305,5358,5405,5458,5514,5562,5617,5670,5754,5821,5885,5981,6055,6136,6225,6388,6532,6611,6686,6768,6827,6907,6987,7042,7164,7267,7308,7361,7418,7492,7557,7625,7711,7791,7860,7954,8013,8068,8130,8190,8300", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", + "endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,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,1293,1389,1472,1568,1637,1680,1732,1784,1833,1896,1954,2005,2065,2149,2243,2351,2422,2506,2589,2655,2738,2840,2901,2963,3014,3092,3145,3205,3310,3369,3471,3526,3597,3646,3704,3751,3810,3867,3938,3999,4056,4106,4158,4211,4261,4311,4371,4424,4490,4552,4615,4662,4717,4805,4863,4925,4975,5020,5063,5123,5190,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295,8385" + } + }, + { + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\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": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,412", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "407,527" + } + }, + { + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\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,2918,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "127,131,135,139,142,146,150,154,158,162,166", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8390,8594,8805,9021,9181,9364,9549,9734,9937,10143,10326", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8589,8800,9016,9176,9359,9544,9729,9932,10138,10321,10522" } } ] diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json index 8d1b322..0295366 100644 --- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json +++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json @@ -1,17 +1,17 @@ { "logs": [ { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rCN\\values-zh-rCN.xml", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\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", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "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": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "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": "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", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json index aedd371..e1e61ba 100644 --- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json +++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json @@ -1,36 +1,17 @@ { "logs": [ { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values-zh-rTW\\values-zh-rTW.xml", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\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", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "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": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "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", @@ -40,6 +21,25 @@ "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" } + }, + { + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json index 2bfa6ba..f9440ad 100644 --- a/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json +++ b/src/Notes-master/app/build/intermediates/blame/res/debug/multi-v2/values.json @@ -1,87 +1,97 @@ { "logs": [ { - "outputFile": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", + "outputFile": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\incremental\\mergeDebugResources\\merged.dir\\values\\values.xml", "map": [ { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" }, "to": { "startLines": "12", "startColumns": "4", - "startOffsets": "420", + "startOffsets": "532", "endColumns": "56", - "endOffsets": "472" + "endOffsets": "584" } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2851,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "131,118,72,75,74,73,19,20,21,121,122,130,129,119,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,123,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,128,126,125,127,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,4,4", + "startOffsets": "8254,7624,3970,4234,4137,4067,846,890,943,7742,7792,8195,8143,7679,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7856,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,8101,7972,7914,8026,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "135,118,72,75,74,73,19,20,21,121,122,130,129,119,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,123,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,128,126,125,127,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,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": "8662,7673,4061,4312,4228,4131,884,937,990,7786,7850,8248,8189,7734,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7906,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,8137,8020,7966,8095,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": "8124,8328,8539,8755,8915,9098,9283,9468,9671,9877,10060", - "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": "8323,8534,8750,8910,9093,9278,9463,9666,9872,10055,10256" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "851,1244,1298,1394,1477,1573,1642,1685,1737,1789,1838,1901,1959,2010,2070,2154,2248,2356,2427,2511,2594,2660,2743,2845,2906,2968,3019,3097,3150,3210,3315,3374,3476,3531,3602,3651,3709,3756,3815,3872,3943,4004,4061,4111,4163,4216,4266,4316,4376,4429,4495,4557,4620,4667,4722,4810,4868,4930,4980,5025,5068,5128,5195,5250,5305,5358,5405,5458,5514,5562,5617,5670,5754,5821,5885,5981,6055,6136,6225,6388,6532,6611,6686,6768,6827,6907,6987,7042,7164,7267,7308,7361,7418,7492,7557,7625,7711,7791,7860,7954,8013,8068,8130,8190,8300", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126", + "endColumns": "14,53,95,82,95,68,42,51,51,48,62,57,50,59,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,1293,1389,1472,1568,1637,1680,1732,1784,1833,1896,1954,2005,2065,2149,2243,2351,2422,2506,2589,2655,2738,2840,2901,2963,3014,3092,3145,3205,3310,3369,3471,3526,3597,3646,3704,3751,3810,3867,3938,3999,4056,4106,4158,4211,4261,4311,4371,4424,4490,4552,4615,4662,4717,4805,4863,4925,4975,5020,5063,5123,5190,5245,5300,5353,5400,5453,5509,5557,5612,5665,5749,5816,5880,5976,6050,6131,6220,6383,6527,6606,6681,6763,6822,6902,6982,7037,7159,7262,7303,7356,7413,7487,7552,7620,7706,7786,7855,7949,8008,8063,8125,8185,8295,8385" } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "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": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "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:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "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": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "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": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,412", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "407,527" } }, { - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "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,2918,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "127,131,135,139,142,146,150,154,158,162,166", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8390,8594,8805,9021,9181,9364,9549,9734,9937,10143,10326", + "endLines": "130,134,138,141,145,149,153,157,161,165,169", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8589,8800,9016,9176,9359,9544,9729,9932,10138,10321,10522" } } ] diff --git a/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json b/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json index b8a2f91..d9dce3f 100644 --- a/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json +++ b/src/Notes-master/app/build/intermediates/blame/res/debug/single/debug.json @@ -1,382 +1,398 @@ [ { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_change_password.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_change_password.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\raw\\introduction" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\raw\\introduction" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_delete_password.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_delete_password.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_set_loginpassword.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_set_loginpassword.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_login.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml" }, { - "merged": "D:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "D:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml" + }, + { + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png" + }, + { + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png" + }, + { + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml" + }, + { + "merged": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat", + "source": "F:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" } ] \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml index 09a65f0..564b421 100644 --- a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="0.1" > @@ -36,27 +36,78 @@ + android:label="@string/app_name" + android:testOnly="true" > + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -64,28 +115,33 @@ - + - - - - + + + + + + + + android:exported="false" + android:multiprocess="true" > + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json index a5a8b69..2790139 100644 --- a/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json +++ b/src/Notes-master/app/build/intermediates/bundle_manifest/debug/bundle-manifest/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "11" } } ] diff --git a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 017706b..bbcec7d 100644 Binary files a/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 80d90c5..0b75cc8 100644 Binary files a/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index d319874..91d6bbd 100644 Binary files a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state index 5620955..b6e32f5 100644 Binary files a/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state and b/src/Notes-master/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state differ diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 3934b8d..901637b 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 7022067..087a0cf 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 84cfcfd..1db543d 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,100 @@ -#Mon Aug 29 17:42:20 CST 2022 -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\add_account_text.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\datetime_picker.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_item.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\widget_4x.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_footer.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_edit.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\folder_list_item.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\account_dialog_title.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\widget_2x.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\layout\\settings_header.xml=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\Android\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat +#Fri Oct 21 01:14:55 CST 2022 +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_edit.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_edit.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\selected.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_selected.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_green.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_item.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_item.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_up.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_background.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_change_password.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_change_password.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\clock.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_clock.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_single.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\settings_header.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_settings_header.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\widget_2x.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_2x.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\account_dialog_title.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_account_dialog_title.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_pressed.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_red.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_title_alert.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_single.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_white.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_edit_list_item.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit_list_item.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_normal.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_folder.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_up.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\raw-zh-rCN\\introduction=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_dropdown_menu.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\preferences.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_preferences.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_white.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_white.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_green.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_super.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_delete_password.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_delete_password.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\call_note_edit.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_note_edit.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_small.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_edit.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_edit.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list_options.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_options.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_green.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\widget_2x_info.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_2x_info.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_move.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\color\\secondary_text_dark.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_secondary_text_dark.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_note_list_dropdown.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_white.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_font_large.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\widget_4x.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_widget_4x.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_single.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\note_list_footer.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_note_list_footer.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\dialog_edit_text.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_dialog_edit_text.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_green.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\notification.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_notification.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\widget_4x_info.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_widget_4x_info.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_menu_delete.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_up.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_middle.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\add_account_text.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_add_account_text.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_icon_app.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\call_record_folder.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_call_record_folder.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_blue.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_red.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_red.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_down.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\delete.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_delete.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_4x_blue.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_red.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_red_middle.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_middle.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_down.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_single.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable\\new_note.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable_new_note.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_blue_down.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_new_note_normal.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_set_loginpassword.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_set_loginpassword.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\raw\\introduction=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\raw_introduction.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\datetime_picker.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_datetime_picker.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\activity_login.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_login.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\color\\primary_text_dark.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\color_primary_text_dark.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\layout\\folder_list_item.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\layout_folder_list_item.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_edit_yellow.9.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\menu\\sub_folder.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\menu_sub_folder.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_call_record.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_widget_2x_blue.png.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\xml\\searchable.xml=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\xml_searchable.xml.flat +F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_white_up.9.png.flat diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml index 5e87c93..fc0e9a4 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml @@ -1,10 +1,10 @@ - -%s - --%s - --%s - --%s + -%s + --%s + --%s + --%s Messaging @@ -18,9 +18,10 @@ 33sp %1$s result for \"%2$s\" - + %1$s results for \"%2$s\" + LoginSetting Confirm to delete folder and its notes? Confirm to delete this note? Confirm to delete the selected %d notes? @@ -32,6 +33,7 @@ Call notes cancel set + delete password Delete reminder successfully Sorry, can not set clock on empty note Sorry, can not send and empty note to home diff --git a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 023500a..aca5326 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #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 randomLoginSettingdelete passwordDeleteCall 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-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index f6c83bd..5241e1e 100644 --- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master/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-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 1acf4f5..9965270 100644 --- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sun Sep 04 21:26:07 CST 2022 -base.0=D\:\\Android\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -path.0=classes.dex +#Fri Oct 21 01:20:30 CST 2022 +base.0=F\:\\project2\\xiaomi_Note\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex +path.0=classes.dex diff --git a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 665d34e..e3d9eaf 100644 Binary files a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml index 4f936e0..294710e 100644 --- a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml @@ -21,7 +21,7 @@ android:versionName="0.1" > @@ -37,27 +37,78 @@ + android:label="@string/app_name" + android:testOnly="true" > + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -65,28 +116,33 @@ - + - - - - + + + + + + + + android:exported="false" + android:multiprocess="true" > + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json index e981797..23d0a75 100644 --- a/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json +++ b/src/Notes-master/app/build/intermediates/instant_app_manifest/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "11" } } ] diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 7f4f3ef..7aa39fb 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 8558246..778f5b0 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index 2fbe949..db4da28 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index 455f7ce..0ce0c21 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class index 17f2c8a..75f9665 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index 2004066..db139de 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 7fd93af..9f95faf 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 5fcd656..79d1289 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class index 3ca8821..3e27d98 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index 03b143b..a151a9c 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class index 4797112..ed251ec 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index dd25511..2f274a8 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index b91202f..78219ea 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 52cdd89..a0aa8f2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 47b930b..54648f6 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 750d9c6..fdca487 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index 7441e70..6094405 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 95fa8a5..ec96b19 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class index d5771d0..afa4935 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword$1.class new file mode 100644 index 0000000..3c34fc7 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class new file mode 100644 index 0000000..d0765f0 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/ChangingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class index 6359086..de8b2ea 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index 54c442c..b9f9edb 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 8c369b7..33d8fa3 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 3da8eb1..fa14442 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword$1.class new file mode 100644 index 0000000..3687fbb Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class new file mode 100644 index 0000000..6531d5d Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DeletingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index c166e99..e7f7abf 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 51e6b34..4c23de5 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class new file mode 100644 index 0000000..4e8476b Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class new file mode 100644 index 0000000..c5dce7f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/LoginActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index d41f333..c512d36 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 6102411..eea8d13 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index e14b454..027b579 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index d7d0fc9..1b2a67b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 7e01406..5113e9b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 6ffb6ee..6f39d9d 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 664dcbb..1af61a8 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 39ffb21..149cd90 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 6e98dbb..8527ae7 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index a9bdef5..477e304 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 0930bf9..91b5a1b 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 8d35c85..2f309e1 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index de885be..ce2d254 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index c677232..277298a 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index c161d09..34648c9 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index d361bc6..f9fcbbd 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index f6c7814..09303bd 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 9a8fb0c..dc524c2 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index fc41031..10089d0 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword$1.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword$1.class new file mode 100644 index 0000000..bbf9e26 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword$1.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class new file mode 100644 index 0000000..aef8caa Binary files /dev/null and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SettingPassword.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index 5aea3c1..14e13ca 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 29097c7..e8f2b50 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index a445e4e..99ba736 100644 Binary files a/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 2506d8b..51daf22 100644 --- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,251 +20,340 @@ 20 android:versionName="0.1" > 21 22 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml +23 android:minSdkVersion="11" +23-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml 24 android:targetSdkVersion="14" /> -24-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml +24-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml 25 26 -26-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +26-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 +26-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 27 -27-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +27-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 +27-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 28 -28-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +28-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 +28-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 29 -29-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +29-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 +29-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 30 -30-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +30-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 +30-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 31 -31-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +31-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 +31-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 32 -32-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +32-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 +32-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 33 -33-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +33-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 +33-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 34 -34-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +34-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 +34-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 35 36 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:35:5-151:19 +36-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" > -39-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 -40 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:38:9-50:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 -43 android:label="@string/app_name" -43-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 -44 android:launchMode="singleTop" -44-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 -45 android:theme="@style/NoteTheme" -45-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 -46 android:windowSoftInputMode="adjustPan" > -46-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:44:13-52 -47 -47-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:46:13-49:29 -48 -48-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:47:17-69 -48-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:47:25-66 -49 -50 -50-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:48:17-77 -50-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:48:27-74 -51 -52 -53 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:52:9-81:20 -54 android:name="net.micode.notes.ui.NoteEditActivity" -54-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:53:13-48 -55 android:configChanges="keyboardHidden|orientation|screenSize" -55-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:54:13-74 -56 android:launchMode="singleTop" -56-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:55:13-43 -57 android:theme="@style/NoteTheme" > -57-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:56:13-45 -58 -58-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:58:13-64:29 -58-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:58:28-49 -59 -59-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -59-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 -60 -61 -61-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -61-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -62 -63 -63-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -63-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -64 -64-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -64-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -65 -66 -66-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 -67 -67-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -67-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 -68 -69 -69-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -69-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -70 -71 -71-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -71-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -72 -72-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -72-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -73 -74 -74-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 -75 -75-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -75-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 -76 -77 -77-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -77-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -78 -79 -80 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 -81 android:name="android.app.searchable" -81-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 -82 android:resource="@xml/searchable" /> -82-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 -83 -84 -85 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 -86 android:name="net.micode.notes.data.NotesProvider" -86-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 -87 android:authorities="micode_notes" -87-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 -88 android:multiprocess="true" /> -88-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 +38-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 +39 android:label="@string/app_name" +39-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 +40 android:testOnly="true" > +41 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 +42 android:name="net.micode.notes.ui.LoginActivity" +42-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-45 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 +44 android:label="@string/app_name" +44-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 +45 android:launchMode="singleTop" +45-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 +46 android:theme="@style/NoteTheme" +46-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 +47 android:windowSoftInputMode="adjustPan" > +47-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 +48 +49 +50 +50-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 +51 +51-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 +51-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 +52 +53 +53-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 +53-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 +54 +55 +56 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20 +57 android:name="net.micode.notes.ui.ChangingPassword" +57-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 +59 android:label="@string/app_name" +59-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 +60 android:launchMode="singleTop" +60-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 +61 android:theme="@style/NoteTheme" +61-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 +62 android:windowSoftInputMode="adjustPan" > +62-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52 +63 +64 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20 +65 android:name="net.micode.notes.ui.SettingPassword" +65-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47 +66 android:configChanges="keyboardHidden|orientation|screenSize" +66-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74 +67 android:label="@string/app_name" +67-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45 +68 android:launchMode="singleTop" +68-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43 +69 android:theme="@style/NoteTheme" +69-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45 +70 android:windowSoftInputMode="adjustPan" > +70-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52 +71 +72 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20 +73 android:name="net.micode.notes.ui.DeletingPassword" +73-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48 +74 android:configChanges="keyboardHidden|orientation|screenSize" +74-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74 +75 android:label="@string/app_name" +75-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45 +76 android:launchMode="singleTop" +76-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43 +77 android:theme="@style/NoteTheme" +77-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45 +78 android:windowSoftInputMode="adjustPan" > +78-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 89 -90 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 -91 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -91-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 -92 android:label="@string/app_widget2x2" > -92-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 -93 -93-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -94 -94-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -94-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -95 -95-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -95-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -96 -96-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -96-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -97 -98 -99 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -100 android:name="android.appwidget.provider" -100-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -101 android:resource="@xml/widget_2x_info" /> -101-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -102 -103 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 -104 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -104-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 -105 android:label="@string/app_widget4x4" > -105-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 -106 -106-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -107 -107-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -107-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -108 -108-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -108-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -109 -109-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -109-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -110 +90 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20 +91 android:name="net.micode.notes.ui.NotesListActivity" +91-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49 +92 android:configChanges="keyboardHidden|orientation|screenSize" +92-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74 +93 android:label="@string/app_name" +93-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45 +94 android:launchMode="singleTop" +94-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43 +95 android:theme="@style/NoteTheme" +95-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45 +96 android:windowSoftInputMode="adjustPan" > +96-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52 +97 +98 +99 +100 +101 +102 +103 +104 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20 +105 android:name="net.micode.notes.ui.NoteEditActivity" +105-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105:13-48 +106 android:configChanges="keyboardHidden|orientation|screenSize" +106-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74 +107 android:launchMode="singleTop" +107-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43 +108 android:theme="@style/NoteTheme" > +108-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45 +109 +109-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29 +110 +110-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79 +110-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76 111 -112 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -113 android:name="android.appwidget.provider" -113-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -114 android:resource="@xml/widget_4x_info" /> -114-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -115 -116 -116-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -116-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 +112 +112-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +112-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +113 +114 +114-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +114-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +115 +115-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +115-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +116 117 -117-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 -118 -118-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -118-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 -119 -120 -121 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 -122 android:name="net.micode.notes.ui.AlarmReceiver" -122-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 -123 android:process=":remote" > -123-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 -124 -125 -126 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:127:9-133:20 -127 android:name="net.micode.notes.ui.AlarmAlertActivity" -127-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 -128 android:label="@string/app_name" -128-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 -129 android:launchMode="singleInstance" -129-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 -130 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -130-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 -131 -132 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:135:9-141:20 -133 android:name="net.micode.notes.ui.NotesPreferenceActivity" -133-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:136:13-71 -134 android:label="@string/preferences_title" -134-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:137:13-54 -135 android:launchMode="singleTop" -135-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:138:13-43 -136 android:theme="@android:style/Theme.Holo.Light" > -136-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:139:13-60 +117-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29 +118 +118-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71 +118-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68 +119 +120 +120-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +120-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +121 +122 +122-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29 +123 +123-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69 +123-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66 +124 +125 +125-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 +125-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 +126 +127 +127-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +127-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +128 +128-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 +128-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 +129 +130 +131 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54 +132 android:name="android.app.searchable" +132-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54 +133 android:resource="@xml/searchable" /> +133-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51 +134 +135 +136 137 138 -139 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:143:9-146:19 -140 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -140-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:144:13-74 -141 android:exported="false" > -141-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:145:13-37 -142 -143 -144 D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:148:9-150:52 -145 android:name="android.app.default_searchable" -145-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:149:13-58 -146 android:value=".ui.NoteEditActivity" /> -146-->D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:150:13-49 -147 -148 -149 +139 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20 +140 android:name="net.micode.notes.data.NotesProvider" +140-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63 +141 android:authorities="micode_notes" +141-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47 +142 android:exported="false" +142-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 +143 android:multiprocess="true" > +143-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40 +144 +145 +146 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20 +147 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +147-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-57 +148 android:label="@string/app_widget2x2" > +148-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50 +149 +149-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 +150 +150-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 +150-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 +151 +151-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 +151-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 +152 +152-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 +152-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 +153 +154 +155 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 +156 android:name="android.appwidget.provider" +156-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 +157 android:resource="@xml/widget_2x_info" /> +157-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 +158 +159 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20 +160 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +160-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57 +161 android:label="@string/app_widget4x4" > +161-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50 +162 +162-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 +163 +163-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 +163-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 +164 +164-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 +164-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 +165 +165-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 +165-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 +166 +167 +168 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 +169 android:name="android.appwidget.provider" +169-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 +170 android:resource="@xml/widget_4x_info" /> +170-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 +171 +172 +172-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20 +172-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55 +173 +173-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29 +174 +174-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79 +174-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76 +175 +176 +177 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20 +178 android:name="net.micode.notes.ui.AlarmReceiver" +178-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61 +179 android:process=":remote" > +179-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38 +180 +181 +182 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20 +183 android:name="net.micode.notes.ui.AlarmAlertActivity" +183-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50 +184 android:label="@string/app_name" +184-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45 +185 android:launchMode="singleInstance" +185-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48 +186 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +186-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75 +187 +188 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20 +189 android:name="net.micode.notes.ui.NotesPreferenceActivity" +189-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71 +190 android:label="@string/preferences_title" +190-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54 +191 android:launchMode="singleTop" +191-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43 +192 android:theme="@android:style/Theme.Holo.Light" > +192-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60 +193 +194 +195 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19 +196 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +196-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74 +197 android:exported="false" > +197-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37 +198 +199 +200 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52 +201 android:name="android.app.default_searchable" +201-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58 +202 android:value=".ui.NoteEditActivity" /> +202-->F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49 +203 +208 +209 +210 diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 09a65f0..564b421 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -20,7 +20,7 @@ android:versionName="0.1" > @@ -36,27 +36,78 @@ + android:label="@string/app_name" + android:testOnly="true" > + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -64,28 +115,33 @@ - + - - - - + + + + + + + + android:exported="false" + android:multiprocess="true" > + + \ No newline at end of file diff --git a/src/Notes-master/app/build/intermediates/merged_manifests/debug/output.json b/src/Notes-master/app/build/intermediates/merged_manifests/debug/output.json index b781455..6576ddf 100644 --- a/src/Notes-master/app/build/intermediates/merged_manifests/debug/output.json +++ b/src/Notes-master/app/build/intermediates/merged_manifests/debug/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "11" } } ] diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/output.json b/src/Notes-master/app/build/intermediates/processed_res/debug/out/output.json index 8c58a0e..9600fd9 100644 --- a/src/Notes-master/app/build/intermediates/processed_res/debug/out/output.json +++ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/output.json @@ -21,7 +21,7 @@ "properties": { "packageId": "net.micode.notes", "split": "", - "minSdkVersion": "1" + "minSdkVersion": "11" } } ] diff --git a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 37c0979..d64e6d6 100644 Binary files a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_0.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_0.jar new file mode 100644 index 0000000..264868d Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_0.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_1.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_1.jar new file mode 100644 index 0000000..ddbe197 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_1.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_2.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_2.jar new file mode 100644 index 0000000..57b23d8 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_2.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_4.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_4.jar new file mode 100644 index 0000000..defd97a Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_4.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_5.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_5.jar new file mode 100644 index 0000000..fae6fa2 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_5.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_6.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_6.jar new file mode 100644 index 0000000..87ab98c Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_6.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_7.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_7.jar new file mode 100644 index 0000000..9433d5f Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/060d92f3d567c392a1feb1a1ad00d0a303944c6550cf44ffaba5ee43019b2aca_7.jar differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar deleted file mode 100644 index 3d17d9a..0000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_0.jar and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar deleted file mode 100644 index bac49f6..0000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_1.jar and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar deleted file mode 100644 index 41358d2..0000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_2.jar and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar deleted file mode 100644 index 01039ee..0000000 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/ddb88bfb83247526ad206bd6c23362086669110a80eeecb006db8d8dd65926ca_3.jar and /dev/null differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 75ec813..8f155bb 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 82de025..98865bb 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index 7d774da..1652703 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index 9a14b9f..2a58e7c 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index cba5c9d..b4bba57 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 70eda56..3a8d246 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 8be20b6..c8442e0 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index ccf4acb..e963a72 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex index 0ea4add..0f9281b 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 71e70e2..5a77015 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex index 77970d4..7cc4b4f 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index d60c5ed..0039c14 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 9a05ca7..e1bd1d6 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 41183c4..93a4587 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 62df3b2..cdd8762 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 2929c7d..9ed39f6 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 913da50..7b23fda 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 9cc7bf3..06084ad 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index b6452ff..e75fa11 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex new file mode 100644 index 0000000..4c92c03 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex new file mode 100644 index 0000000..692c32e Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/ChangingPassword.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index b4d1662..276f150 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index b07a56b..6f129fd 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index c6ccf82..6875018 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index b6eef18..5f3e8f2 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex new file mode 100644 index 0000000..118cac3 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex new file mode 100644 index 0000000..ece5dc8 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DeletingPassword.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 6cadfc6..f4b7db5 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index 0bee083..1d1ffc8 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex new file mode 100644 index 0000000..3da7fcc Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex new file mode 100644 index 0000000..77c02ec Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/LoginActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 7058dc0..e7d5d61 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 06e8c97..c053709 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex index 2223e8a..5b7ec54 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 0fb154d..818f7f8 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 852fe6d..2fb34f6 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 620f991..6a8ecec 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 4c7b295..96627bb 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e074074..27791d1 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index b4e2052..b898050 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index a1c8325..bbc5adf 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 75652b4..8f37362 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 179b08c..a37891a 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index dbbce38..50508e7 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index b64c7e8..94296f1 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index e134e00..ffbf4ba 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 4f7249c..c6a8596 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 650c055..44d92cb 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 48423c9..051cf41 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index e5e6a69..26b5ff5 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex new file mode 100644 index 0000000..45b5777 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword$1.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex new file mode 100644 index 0000000..95dc213 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SettingPassword.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 96b992c..f0d7e18 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index 52a0936..fe86a10 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index b39ce4f..a6099d9 100644 Binary files a/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat index 81a148f..3770877 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/color_primary_text_dark.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat index f525e40..89641bb 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/color_secondary_text_dark.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat index fdf4200..609c686 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat index 932c0e0..5a15335 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat index 84c8942..6899495 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_call_record.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat index 01a4e73..3a31c6f 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_clock.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat index 978f30a..6f394f0 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_delete.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat index a9fa03b..99aa9d7 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat index 4852e43..6b173d0 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat index 973883c..8e80634 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat index 44b3549..3626b1f 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat index 01ff54d..6b42763 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat index ea9104c..de020cd 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat index e592fca..3fb1602 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat index e1142fa..d92f1aa 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat index 0bf0548..c890632 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat index e52cd95..fbd8643 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat index f42c084..ce4f468 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat index 80fbfef..270ca73 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_large.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat index 9eb21eb..b647efe 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat index 0aa9af6..648fc96 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat index 853820f..01c2103 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_small.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat index 009305e..8b418bb 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_font_super.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat index bb1916d..3b66654 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat index d4c8f66..079940c 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_background.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat index d6dadaa..430eab2 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat index 95a9f26..d90557d 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat index 4ddfb8c..6eec140 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat index 852021c..e4f159d 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat index 95a82e1..3416674 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat index 223c002..00b7c21 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat index 0af538a..dcbcea6 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat index 9303ac7..d4d551b 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat index 6d2cd46..9b4fd9a 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat index 1f09e5d..d87fa28 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat index 8bfa8ba..f8566a9 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat index 9423e4b..bc36a2c 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat index de27ddc..dccee47 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat index 789da47..3879163 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat index a2f0115..69914c5 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat index 96dddaf..c0246f6 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat index e872180..213bfec 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat index 7b328ad..46aea47 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat index 31826e7..3062079 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat index aa07bfd..fca8602 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat index df9d894..0e82f9c 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat index b2670dc..2580646 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat index 30e33df..b9563aa 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat index 137b8a9..ce44b72 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat index 4874f58..f55b152 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat index be53e55..3a7ac6a 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat index c85e5ca..69d81fe 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat index c76725e..3099d00 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_notification.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat index 812cf66..cd1c759 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_search_result.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat index 1bbd9aa..fb09762 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_selected.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat index 57a92c2..3af932e 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat index dc54d5e..4eea9d0 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat index ade1d59..25013ac 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat index 79cb428..f1f5d59 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat index 94a9c80..9361a87 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat index 92bd213..d6c16eb 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat index 4f88367..1396a10 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat index c0d366d..92b7b71 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat index 63a1926..bc7a23d 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat index 3acd66d..c9eadcf 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat index 878a014..9a9d155 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat index 443d67d..d63a3dc 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat index 5cf485b..b637b6f 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/drawable_new_note.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat index 5ac4fa2..101c48d 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_account_dialog_title.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_change_password.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_change_password.xml.flat new file mode 100644 index 0000000..ac9a687 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_change_password.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_delete_password.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_delete_password.xml.flat new file mode 100644 index 0000000..75239bd Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_delete_password.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat new file mode 100644 index 0000000..03fbadb Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_login.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_set_loginpassword.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_set_loginpassword.xml.flat new file mode 100644 index 0000000..9ff7539 Binary files /dev/null and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_activity_set_loginpassword.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat index c32933e..7efb677 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_add_account_text.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat index 84f8621..8797a81 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_datetime_picker.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat index 9aabc18..f42b210 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_dialog_edit_text.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat index 2b4afc5..d40cdaf 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_folder_list_item.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat index b28443b..d21ff89 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat index 9d5c24a..6184c9d 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_edit_list_item.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat index 4377c67..fbd1bc1 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_item.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat index 0c817af..0d5e6fe 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat index 9a3483a..44ef871 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat index 60d317d..6c5635c 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_note_list_footer.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat index 9b41ed5..a9f7067 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_settings_header.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat index ca19982..6baf2d3 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_2x.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat index 46966ff..90a8478 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/layout_widget_4x.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat index c1c00fc..e2d16e7 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_note_edit.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat index b365d22..c565750 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_call_record_folder.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat index 265f1af..e47e85b 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat index c76e741..f557b58 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat index 5037837..c44c458 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_dropdown.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat index 52027f8..89e5dd7 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_note_list_options.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat index 3d4b6f7..cf452c8 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/menu_sub_folder.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat index 3e32ae3..559a92b 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat index fa030bb..8eafe62 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/raw_introduction.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 7f7ba81..ccde3ea 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat index a4632a5..ba92904 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat index baa7015..01e5ff8 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/values_values.arsc.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat index af571a1..420d852 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_preferences.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat index 29ebaba..8c9106b 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_searchable.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat index e4eb3b3..f6efc9f 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_2x_info.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat index 512a5bb..669f52e 100644 Binary files a/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat and b/src/Notes-master/app/build/intermediates/res/merged/debug/xml_widget_4x_info.xml.flat differ diff --git a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..c0e1782 100644 --- a/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes-master/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -74,87 +74,104 @@ 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 Acknowledged 0x7f050000 +int id Dt_Acknowledged 0x7f050001 +int id LoginSetting 0x7f050002 +int id account_dialog_subtitle 0x7f050003 +int id account_dialog_title 0x7f050004 +int id ack_password 0x7f050005 +int id acknowledge 0x7f050006 +int id action_select_all 0x7f050007 +int id amPm 0x7f050008 +int id btn_new_note 0x7f050009 +int id btn_set_bg_color 0x7f05000a +int id cb_edit_item 0x7f05000b +int id date 0x7f05000c +int id delete 0x7f05000d +int id delete_password 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_delete 0x7f050029 +int id menu_delete_remind 0x7f05002a +int id menu_export_text 0x7f05002b +int id menu_font_size 0x7f05002c +int id menu_list_mode 0x7f05002d +int id menu_new_folder 0x7f05002e +int id menu_new_note 0x7f05002f +int id menu_search 0x7f050030 +int id menu_send_to_desktop 0x7f050031 +int id menu_setting 0x7f050032 +int id menu_share 0x7f050033 +int id menu_sync 0x7f050034 +int id minute 0x7f050035 +int id move 0x7f050036 +int id navigation_bar 0x7f050037 +int id new_password 0x7f050038 +int id note_bg_color_selector 0x7f050039 +int id note_edit_list 0x7f05003a +int id note_edit_view 0x7f05003b +int id note_item 0x7f05003c +int id note_title 0x7f05003d +int id notes_list 0x7f05003e +int id old_password 0x7f05003f +int id password 0x7f050040 +int id password_ack 0x7f050041 +int id prefenerece_sync_status_textview 0x7f050042 +int id preference_sync_button 0x7f050043 +int id selection_menu 0x7f050044 +int id sv_note_edit 0x7f050045 +int id thepassword 0x7f050046 +int id tv_alert_date 0x7f050047 +int id tv_folder_name 0x7f050048 +int id tv_modified_date 0x7f050049 +int id tv_name 0x7f05004a +int id tv_time 0x7f05004b +int id tv_title 0x7f05004c +int id tv_title_bar 0x7f05004d +int id widget_bg_image 0x7f05004e +int id widget_text 0x7f05004f 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_password 0x7f060001 +int layout activity_delete_password 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 @@ -164,108 +181,110 @@ int menu note_list_options 0x7f070005 int menu sub_folder 0x7f070006 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 -int string alert_message_delete_folder 0x7f0a0000 -int string alert_message_delete_note 0x7f0a0001 -int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 +int string LoginSetting 0x7f0a0000 +int string alert_message_delete_folder 0x7f0a0001 +int string alert_message_delete_note 0x7f0a0002 +int string alert_message_delete_notes 0x7f0a0003 +int string alert_title_delete 0x7f0a0004 +int string app_name 0x7f0a0005 +int string app_widget2x2 0x7f0a0006 +int string app_widget4x4 0x7f0a0007 +int string button_delete 0x7f0a0008 +int string call_record_folder_name 0x7f0a0009 +int string datetime_dialog_cancel 0x7f0a000a +int string datetime_dialog_ok 0x7f0a000b +int string delete_password 0x7f0a000c +int string delete_remind_time_message 0x7f0a000d +int string error_note_empty_for_clock 0x7f0a000e +int string error_note_empty_for_send_to_desktop 0x7f0a000f +int string error_note_not_exist 0x7f0a0010 +int string error_sdcard_export 0x7f0a0011 +int string error_sdcard_unmounted 0x7f0a0012 +int string error_sync_cancelled 0x7f0a0013 +int string error_sync_internal 0x7f0a0014 +int string error_sync_network 0x7f0a0015 +int string failed_sdcard_export 0x7f0a0016 +int string file_name_txt_format 0x7f0a0017 +int string file_path 0x7f0a0018 +int string folder_exist 0x7f0a0019 +int string format_date_ymd 0x7f0a001a +int string format_datetime_mdhm 0x7f0a001b +int string format_exported_file_location 0x7f0a001c +int string format_folder_files_count 0x7f0a001d +int string format_move_notes_to_folder 0x7f0a001e +int string hint_foler_name 0x7f0a001f +int string info_note_enter_desktop 0x7f0a0020 +int string menu_alert 0x7f0a0021 +int string menu_create_folder 0x7f0a0022 +int string menu_delete 0x7f0a0023 +int string menu_deselect_all 0x7f0a0024 +int string menu_export_text 0x7f0a0025 +int string menu_folder_change_name 0x7f0a0026 +int string menu_folder_delete 0x7f0a0027 +int string menu_folder_view 0x7f0a0028 +int string menu_font_large 0x7f0a0029 +int string menu_font_normal 0x7f0a002a +int string menu_font_size 0x7f0a002b +int string menu_font_small 0x7f0a002c +int string menu_font_super 0x7f0a002d +int string menu_list_mode 0x7f0a002e +int string menu_move 0x7f0a002f +int string menu_move_parent_folder 0x7f0a0030 +int string menu_normal_mode 0x7f0a0031 +int string menu_remove_remind 0x7f0a0032 +int string menu_search 0x7f0a0033 +int string menu_select_all 0x7f0a0034 +int string menu_select_none 0x7f0a0035 +int string menu_select_title 0x7f0a0036 +int string menu_send_to_desktop 0x7f0a0037 +int string menu_setting 0x7f0a0038 +int string menu_share 0x7f0a0039 +int string menu_sync 0x7f0a003a +int string menu_sync_cancel 0x7f0a003b +int string menu_title_select_folder 0x7f0a003c +int string note_alert_expired 0x7f0a003d +int string note_link_email 0x7f0a003e +int string note_link_other 0x7f0a003f +int string note_link_tel 0x7f0a0040 +int string note_link_web 0x7f0a0041 +int string notealert_enter 0x7f0a0042 +int string notealert_ok 0x7f0a0043 +int string notelist_menu_new 0x7f0a0044 +int string notelist_string_info 0x7f0a0045 +int string preferences_account_summary 0x7f0a0046 +int string preferences_account_title 0x7f0a0047 +int string preferences_add_account 0x7f0a0048 +int string preferences_bg_random_appear_title 0x7f0a0049 +int string preferences_button_sync_cancel 0x7f0a004a +int string preferences_button_sync_immediately 0x7f0a004b +int string preferences_dialog_change_account_title 0x7f0a004c +int string preferences_dialog_change_account_warn_msg 0x7f0a004d +int string preferences_dialog_select_account_tips 0x7f0a004e +int string preferences_dialog_select_account_title 0x7f0a004f +int string preferences_last_sync_time 0x7f0a0050 +int string preferences_last_sync_time_format 0x7f0a0051 +int string preferences_menu_cancel 0x7f0a0052 +int string preferences_menu_change_account 0x7f0a0053 +int string preferences_menu_remove_account 0x7f0a0054 +int string preferences_title 0x7f0a0055 +int string preferences_toast_cannot_change_account 0x7f0a0056 +int string preferences_toast_success_set_accout 0x7f0a0057 +int string search 0x7f0a0058 +int string search_hint 0x7f0a0059 +int string search_label 0x7f0a005a +int string search_setting_description 0x7f0a005b +int string set_remind_time_message 0x7f0a005c +int string success_sdcard_export 0x7f0a005d +int string success_sync_account 0x7f0a005e +int string sync_progress_init_list 0x7f0a005f +int string sync_progress_login 0x7f0a0060 +int string sync_progress_syncing 0x7f0a0061 +int string ticker_cancel 0x7f0a0062 +int string ticker_fail 0x7f0a0063 +int string ticker_success 0x7f0a0064 +int string ticker_syncing 0x7f0a0065 +int string widget_havenot_content 0x7f0a0066 +int string widget_under_visit_mode 0x7f0a0067 int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 diff --git a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk index b275f06..b9fbea9 100644 Binary files a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt index 434368e..7e392ad 100644 --- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,243 +1,291 @@ -- Merging decision tree log --- manifest -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:1-152:12 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-211:12 package - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - xmlns:tools - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:5-81 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:24:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-88 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-67 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-72 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-74 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-80 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-71 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-74 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-81 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-78 application -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:35:5-151:19 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:34:5-210:19 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-41 android:icon - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:38:9-50:20 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:35:9-42 +activity#net.micode.notes.ui.LoginActivity +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:44:13-52 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52 android:configChanges - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\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:\Android\Notes-master1\app\src\main\AndroidManifest.xml:46:13-49:29 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29 action#android.intent.action.MAIN -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:47:17-69 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:47:25-66 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:48:17-77 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77 + android:name + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74 +activity#net.micode.notes.ui.ChangingPassword +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-59:20 + android:label + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-45 + android:launchMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 + android:windowSoftInputMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-52 + android:configChanges + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74 + android:theme + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 + android:name + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48 +activity#net.micode.notes.ui.SettingPassword +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:61:9-68:20 + android:label + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:64:13-45 + android:launchMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-43 + android:windowSoftInputMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:67:13-52 + android:configChanges + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:63:13-74 + android:theme + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:66:13-45 + android:name + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:62:13-47 +activity#net.micode.notes.ui.DeletingPassword +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:70:9-77:20 + android:label + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:73:13-45 + android:launchMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:74:13-43 + android:windowSoftInputMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:76:13-52 + android:configChanges + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-74 + android:theme + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:75:13-45 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:48:27-74 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:71:13-48 +activity#net.micode.notes.ui.NotesListActivity +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:90:9-102:20 + android:label + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:93:13-45 + android:launchMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:94:13-43 + android:windowSoftInputMode + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-52 + android:configChanges + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:92:13-74 + android:theme + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:95:13-45 + android:name + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:91:13-49 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:52:9-81:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:104:9-136:20 android:launchMode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:55:13-43 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:107:13-43 android:configChanges - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:54:13-74 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:106:13-74 android:theme - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:56:13-45 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:108:13-45 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:53: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:\Android\Notes-master1\app\src\main\AndroidManifest.xml:58:13-64:29 - android:scheme - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:58:28-49 - tools:ignore - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:59:17-47 -action#android.intent.action.VIEW -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:105: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 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:110:13-115:29 +action#android.intent.action.INSERT_OR_EDIT +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:17-79 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:111:25-76 category#android.intent.category.DEFAULT -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:17-76 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:112:27-73 data -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:17-78 android:mimeType - ADDED from D:\Android\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:\Android\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 - android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:113:23-75 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:117:13-120:29 action#android.intent.action.SEARCH -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:17-71 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:118:25-68 +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 F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-127:29 +action#android.intent.action.VIEW +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:17-69 + android:name + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:123:25-66 meta-data#android.app.searchable -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-132:54 android:resource - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:132:17-51 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:131:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:138:9-143:20 android:authorities - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:140:13-47 android:multiprocess - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-40 + android:exported + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-37 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:139:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-157:20 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-50 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:146: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:\Android\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:148:13-152:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:17-84 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:149:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:17-85 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:150:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:17-85 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:151:25-82 meta-data#android.appwidget.provider -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:154:13-156:58 android:resource - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:156:17-55 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:155:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:159:9-172:20 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:161:13-50 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:160:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:9-178:20 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:174:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:175:13-177:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:17-79 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:176:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:180:9-183:20 android:process - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:182:13-38 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:181:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:127:9-133:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:185:9-190:20 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:187:13-45 android:launchMode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 - tools:targetApi - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:132:13-40 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:188:13-48 android:theme - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:189:13-75 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:186:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:135:9-141:20 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:192:9-197:20 android:label - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:137:13-54 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:194:13-54 android:launchMode - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:138:13-43 - tools:targetApi - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:140:13-40 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:195:13-43 android:theme - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:139:13-60 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:196:13-60 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:136:13-71 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:193:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:143:9-146:19 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:199:9-202:19 android:exported - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:145:13-37 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:201:13-37 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:144:13-74 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:200:13-74 meta-data#android.app.default_searchable -ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:148:9-150:52 +ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:204:9-206:52 android:value - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:150:13-49 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:206:13-49 android:name - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml:149:13-58 + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml:205:13-58 uses-sdk -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml -INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml +INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + ADDED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml + INJECTED from F:\project2\xiaomi_Note\src\Notes-master\app\src\main\AndroidManifest.xml diff --git a/src/Notes-master/app/src/main/AndroidManifest.xml b/src/Notes-master/app/src/main/AndroidManifest.xml index 03ad84e..f618830 100644 --- a/src/Notes-master/app/src/main/AndroidManifest.xml +++ b/src/Notes-master/app/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ --> @@ -35,55 +34,113 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - + + + + + + + + android:exported="false" + android:multiprocess="true"> + + @@ -128,16 +186,14 @@ android:name=".ui.AlarmAlertActivity" android:label="@string/app_name" android:launchMode="singleInstance" - android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" - tools:targetApi="honeycomb"> + android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + android:theme="@android:style/Theme.Holo.Light" > + diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/ChangingPassword.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/ChangingPassword.java new file mode 100644 index 0000000..d32712e --- /dev/null +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/ChangingPassword.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; + +public class ChangingPassword extends Activity { + EditText OldPassword; + EditText NewPassword; + EditText AckPassword; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_change_password); + 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.Acknowledged); + 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(ChangingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (new_password.equals(ack_password) == false) { + Toast.makeText(ChangingPassword.this, "新建密码与重复密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + AckPassword.setText(""); + }else if(old_password.equals(login_password) == false){ + Toast.makeText(ChangingPassword.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(ChangingPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(ChangingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} + diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DeletingPassword.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DeletingPassword.java new file mode 100644 index 0000000..0e4dfe2 --- /dev/null +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DeletingPassword.java @@ -0,0 +1,63 @@ +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; + +public class DeletingPassword extends Activity { + EditText Dt_password; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delete_password); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + Dt_password=(EditText) findViewById(R.id.thepassword); + Acknowledged=(Button)findViewById(R.id.Dt_Acknowledged); + Acknowledged.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = Dt_password.getText().toString(); + if(text02.equals("")==true) + Toast.makeText(DeletingPassword.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(DeletingPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + else{ + Toast.makeText(DeletingPassword.this, "密码错误", Toast.LENGTH_SHORT).show(); + Dt_password.setText("");//把密码框内输入过的错误密码清空 + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(DeletingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} + diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java new file mode 100644 index 0000000..99bcb19 --- /dev/null +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/LoginActivity.java @@ -0,0 +1,57 @@ +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; + +public class LoginActivity extends Activity { + + EditText lg_password; + Button 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) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面 + { + 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); + 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("");//把密码框内输入过的错误密码清空 + } + } + } + ); + + } +} \ No newline at end of file diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aec..a271ea1 100644 --- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -809,21 +809,48 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt createNewNote(); break; } - case R.id.menu_search: + case R.id.menu_search: { /*搜索按钮的响应*/ onSearchRequested(); break; + } + case R.id.LoginSetting: { //设置登录密码功能 + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password=pref.getString("password",""); + if(password.equals(""))//没有设置密码 + set_the_password(); + else if(!password.equals(""))//已经设置密码 + change_the_password(); + break; + } + case R.id.delete_password:{ + delete_the_password(); + break; + } default: break; } return true; } - + private void set_the_password() { + Intent intent=new Intent(NotesListActivity.this,SettingPassword.class); + startActivity(intent); + finish(); + } + private void change_the_password() { + Intent intent=new Intent(NotesListActivity.this,ChangingPassword.class); + startActivity(intent); + finish(); + } + private void delete_the_password() { + Intent intent=new Intent(NotesListActivity.this,DeletingPassword.class); + startActivity(intent); + finish(); + } @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); return true; } - private void exportNoteToText() { final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this); new AsyncTask() { diff --git a/src/Notes-master/app/src/main/java/net/micode/notes/ui/SettingPassword.java b/src/Notes-master/app/src/main/java/net/micode/notes/ui/SettingPassword.java new file mode 100644 index 0000000..60f934d --- /dev/null +++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/SettingPassword.java @@ -0,0 +1,67 @@ +package net.micode.notes.ui; + +import static android.content.Context.MODE_PRIVATE; + +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 SettingPassword extends Activity { + EditText password; + EditText password_ack; + Button acknowledge; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_set_loginpassword); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + password=(EditText) findViewById(R.id.password); + password_ack=(EditText) findViewById(R.id.password_ack); + acknowledge=(Button)findViewById(R.id.acknowledge); + acknowledge.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = password.getText().toString(); + String text03 = password_ack.getText().toString(); + if(text02.equals("")==true) { + Toast.makeText(SettingPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (text02.equals(text03) == false) { + Toast.makeText(SettingPassword.this, "密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + password_ack.setText(""); + }else if (text02.equals(text03) == true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", + MODE_PRIVATE).edit(); + editor.putBoolean("user",true);//true表示已经设置登录密码 + editor.putString("password",text02); + editor.apply(); + Log.d("RegisterLoginPassword","password is "+text02); + Toast.makeText(SettingPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(SettingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(SettingPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + +} diff --git a/src/Notes-master/app/src/main/res/layout/activity_change_password.xml b/src/Notes-master/app/src/main/res/layout/activity_change_password.xml new file mode 100644 index 0000000..05eda7e --- /dev/null +++ b/src/Notes-master/app/src/main/res/layout/activity_change_password.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + +