diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin index 742cc4f7..f6607863 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock index c629be0d..5c523e34 100644 Binary files a/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.2/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin index 5e7ef9a1..7d322091 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock index 1210316a..88151c0f 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.2/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin index efdee15e..80eeb738 100644 Binary files a/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.2/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4a748d81..125621fc 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index c0a9b6ac..21bcd76d 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/checksums/checksums.lock b/src/Notes-master1/.gradle/checksums/checksums.lock index 4b70c24a..46e5e1d0 100644 Binary files a/src/Notes-master1/.gradle/checksums/checksums.lock and b/src/Notes-master1/.gradle/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/checksums/md5-checksums.bin index f67b5476..4c81b7f5 100644 Binary files a/src/Notes-master1/.gradle/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin index e632471a..4e64ae4a 100644 Binary files a/src/Notes-master1/.gradle/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.idea/dbnavigator.xml b/src/Notes-master1/.idea/dbnavigator.xml index 8567fda3..fb44a9fb 100644 --- a/src/Notes-master1/.idea/dbnavigator.xml +++ b/src/Notes-master1/.idea/dbnavigator.xml @@ -36,9 +36,7 @@ - - - + diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index 3437a2ba..d80fb203 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -23,6 +23,7 @@ + diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b b/src/Notes-master1/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b new file mode 100644 index 00000000..e69de29b diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 index 54bd0128..41edf84d 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 @@ -34,6 +34,6 @@ java:S1319 T java:S1155-">Use isEmpty() to check whether the collection is empty or not.( S -java:S2589>"8Remove this expression which always evaluates to "false"(Ύ +java:S2589f"8Remove this expression which always evaluates to "false"(Ύ S -java:S2589f"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file +java:S2589>"8Remove this expression which always evaluates to "false"(Ύ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 b/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 deleted file mode 100644 index e52aeadf..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 +++ /dev/null @@ -1,3 +0,0 @@ - -> -java:S1604)"(Make this anonymous inner class a lambda(ʩ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b b/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b deleted file mode 100644 index 3cdeafe7..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b +++ /dev/null @@ -1,13 +0,0 @@ - -U -java:S11181":Add a private constructor to hide the implicit public one.(͓ -^ -java:S1214@"CMove constants defined in this interfaces to another class or enum.(⸫ -Z -java:S1214"CMove constants defined in this interfaces to another class or enum.( -V -java:S1118":Add a private constructor to hide the implicit public one.( -Q -java:S1118":Add a private constructor to hide the implicit public one.(߀ -f -java:S11929"KDefine a constant instead of duplicating this literal "content://" 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 index 381fee83..461af098 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6 @@ -7,6 +7,6 @@ O java:S1874K"9Remove this use of "setTextAppearance"; it is deprecated.( O java:S1874U"9Remove this use of "setTextAppearance"; it is deprecated.( -m java:S117s"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8/ -m java:S117x"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔8›/ -m java:S117y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ8/ \ No newline at end of file +f java:S117s"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +f java:S117x"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(㷔 +f java:S117y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Õ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd b/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd deleted file mode 100644 index 53f6aa9c..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd +++ /dev/null @@ -1,11 +0,0 @@ - -3 -java:S2386I"Make this member "protected".( -8 -java:S2386S"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.( -F -java:S1066"/Merge this if statement with the enclosing one.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c index a4843ed2..c3923a25 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c +++ b/src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c @@ -1,39 +1,41 @@ 7 -java:S1116,"Remove this empty statement.( +java:S1116-"Remove this empty statement.( K -java:S1874/"5Remove this use of "CursorAdapter"; it is deprecated.( +java:S18740"5Remove this use of "CursorAdapter"; it is deprecated.( J -java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864_"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125_"'Remove the unnecessary boolean literal.(ɯ +java:S1125`"'Remove the unnecessary boolean literal.(ɯ J -java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(਷ B -java:S1125o"'Remove the unnecessary boolean literal.(ɯ -A -java:S1168|"+Return an empty collection instead of null.( -C -java:S1125"'Remove the unnecessary boolean literal.( +java:S1125p"'Remove the unnecessary boolean literal.(ɯ +H +java:S1168~"+Return an empty collection instead of null.(8ͭ/ +J +java:S1125"'Remove the unnecessary boolean literal.(8ͭ/ t -java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə o -java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +java:S2293^"YReplace the type specification in this constructor call with the diamond operator ("<>").( o -java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +java:S2293n"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ J -java:S1066U"/Merge this if statement with the enclosing one.(ڧ +java:S1066V"/Merge this if statement with the enclosing one.(ڧ  -java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java:S1319]"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".(  -java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +java:S1319m"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( j java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ q java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +y +java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.(8/ E -java:S5411_"*Use the primitive boolean expression here.(ɯ +java:S5411`"*Use the primitive boolean expression here.(ɯ E -java:S5411o"*Use the primitive boolean expression here.(ɯ -F -java:S5411"*Use the primitive boolean expression here.( \ No newline at end of file +java:S5411p"*Use the primitive boolean expression here.(ɯ +M +java:S5411"*Use the primitive boolean expression here.(8ͭ/ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 b/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 deleted file mode 100644 index 59add793..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6 +++ /dev/null @@ -1,84 +0,0 @@ - -n -java:S1450"WRemove the "editText" field and declare it as a local variable in the relevant methods.( -n -java:S1450"WRemove the "mPattern" field and declare it as a local variable in the relevant methods.( -{ -java:S1149"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(᯲ -i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 26 to the 15 allowed.(ݨ -W -java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ѯ -\ -java:S1874"@Remove this use of "SOFT_INPUT_ADJUST_RESIZE"; it is deprecated.(ң -O -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.(( -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.( -P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.( -Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.( -U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( -G -java:S1874"0Remove this use of "getColor"; it is deprecated.( -d -java:S3252"MUse static access with "android.text.Spanned" for "SPAN_INCLUSIVE_EXCLUSIVE".( -U -java:S1874"9Remove this use of "setTextAppearance"; it is deprecated.( -T -java:S1874"=Remove this use of "EXTRA_SHORTCUT_INTENT"; it is deprecated.(ð -R -java:S1874";Remove this use of "EXTRA_SHORTCUT_NAME"; it is deprecated.( -[ -java:S1874"DRemove this use of "EXTRA_SHORTCUT_ICON_RESOURCE"; it is deprecated.(Ǿ -i java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S100"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ְ8Ԯ/ -J -java:S1068",Remove this unused "editText" private field.(8/ -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 ("<>").( -t -java:S2293r"YReplace the type specification in this constructor call with the diamond operator ("<>").( -o -java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").( -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 -l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ӏ -? -java:S1604"(Make this anonymous inner class a lambda(ά -? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(ߒ -? -java:S1604"(Make this anonymous inner class a lambda( -K -java:S1604"(Make this anonymous inner class a lambda(8/ -F -java:S1604"(Make this anonymous inner class a lambda(ά8ᮼ/ -q -java:S1104U"VMake tvModified a static final constant or non-public and provide accessors if needed.(ԣ -r -java:S1104W"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(න -r -java:S1104Y"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.( -s -java:S1104["XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.( -h -java:S1104]"RMake ivLock a static final constant or non-public and provide accessors if needed.(ؕ -O -java:S3516"9Refactor this method to not always return the same value.(l \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 index 439ace7c..4952694d 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 +++ b/src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477 @@ -1,4 +1,5 @@ +n java:S116S"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( i java:S3008_"SRename this field "VIEW_WAY" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( 7 @@ -8,99 +9,99 @@ java:S1124 [ java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk n -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ 2 -java:S3626"Remove this redundant jump.(݅ +java:S3626"Remove this redundant jump.(݅ P -java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­ Z -java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­ N -java:S1135"2Complete the task associated to this TODO comment.(̐ +java:S1135"2Complete the task associated to this TODO comment.(̐ F -java:S2093"*Change this "try" to a try-with-resources.( +java:S2093"*Change this "try" to a try-with-resources.( o -java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( n -java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( +java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".( N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( N -java:S1135"2Complete the task associated to this TODO comment.( +java:S1135"2Complete the task associated to this TODO comment.( U -java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ +java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ M -java:S1874"1Remove this use of "getHeight"; it is deprecated.( +java:S1874"1Remove this use of "getHeight"; it is deprecated.( 8 -java:S1116"Remove this empty statement.( +java:S1116"Remove this empty statement.( i -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 29 to the 15 allowed.( -F -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(? -? java:S108")Either remove or fill this block of code.(ʥ -a -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ -K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 -h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(# -N -java:S1135"2Complete the task associated to this TODO comment.( -^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 -N -java:S1135"2Complete the task associated to this TODO comment.( -M -java:S2696"6Make the enclosing method "static" or remove this set.( +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 32 to the 15 allowed.( M -java:S2696"6Make the enclosing method "static" or remove this set.( -M -java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч -f -java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች -K -java:S1874"/Remove this use of "execute"; it is deprecated.(嫏 +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(?8/ +F java:S108")Either remove or fill this block of code.(ʥ8/ h -java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b -g java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ -K -java:S3398"/Move this method into "BackgroundQueryHandler".( +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(Ϳ8/ +R +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏8/ +o +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(#8/ +U +java:S1135"2Complete the task associated to this TODO comment.(8/ +e +java:S1126"BReplace this if-then-else statement by a single method invocation.(玒8/ +U +java:S1135"2Complete the task associated to this TODO comment.(8/ +T +java:S2696"6Make the enclosing method "static" or remove this set.(8/ +T +java:S2696"6Make the enclosing method "static" or remove this set.(8/ +T +java:S1874"1Remove this use of "AsyncTask"; it is deprecated.(Ч8/ +m +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች8/ +R +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏8/ +o +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8/ +n java:S128"LEnd this switch case with an unconditional break, return or throw statement.(δ8¼/ +N +java:S3398"0Move this method into "OnListItemClickListener".(8ȼ/ +H +java:S3398"%Move this method into "ModeCallback".(8ȼ/ < -java:S3398"%Move this method into "ModeCallback".( -A -java:S3398"%Move this method into "ModeCallback".( -G -java:S3398"0Move this method into "OnListItemClickListener".( -p -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +java:S3398"%Move this method into "ModeCallback".( +K +java:S3398"/Move this method into "BackgroundQueryHandler".( +w +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥8ʼ/ b java:S1192"FDefine a constant instead of duplicating this literal " AND " 5 times.( ] -java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( -g java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( +java:S1192"FDefine a constant instead of duplicating this literal " DESC" 4 times.( +n java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(8Ӽ/ > -java:S1604"(Make this anonymous inner class a lambda(̺V -? -java:S1604"(Make this anonymous inner class a lambda(ά -? -java:S1604"(Make this anonymous inner class a lambda(ܴ +java:S1604"(Make this anonymous inner class a lambda(̺V ? -java:S1604"(Make this anonymous inner class a lambda( -D -java:S1604"(Make this anonymous inner class a lambda( -D -java:S1604"(Make this anonymous inner class a lambda( +java:S1604"(Make this anonymous inner class a lambda(ά ? -java:S1604"(Make this anonymous inner class a lambda( -? -java:S1604"(Make this anonymous inner class a lambda(۱ -? -java:S1604"(Make this anonymous inner class a lambda(ά -g -java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד +java:S1604"(Make this anonymous inner class a lambda(ܴ +F +java:S1604"(Make this anonymous inner class a lambda(8ּ/ +K +java:S1604"(Make this anonymous inner class a lambda(8ּ/ +K +java:S1604"(Make this anonymous inner class a lambda(8ּ/ +F +java:S1604"(Make this anonymous inner class a lambda(8׼/ +F +java:S1604"(Make this anonymous inner class a lambda(۱8׼/ +F +java:S1604"(Make this anonymous inner class a lambda(ά8׼/ +n +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד8ؼ/ Z -java:S2583"CChange this condition so that it does not always evaluate to "true"( \ No newline at end of file +java:S2583"CChange this condition so that it does not always evaluate to "true"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd b/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd deleted file mode 100644 index aff35b7e..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd +++ /dev/null @@ -1,7 +0,0 @@ - -3 -java:S2386!"Make this member "protected".(Ꙗ -K -java:S1874*"5Remove this use of "CursorAdapter"; it is deprecated.(ж -M -java:S1135+"2Complete the task associated to this TODO comment.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 b/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 deleted file mode 100644 index 776619b3..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7 +++ /dev/null @@ -1,33 +0,0 @@ - -Y -java:S1214#"CMove constants defined in this interfaces to another class or enum.( -v -java:S11927"[Define a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''," 5 times.(޿ -c -java:S1192_"HDefine a constant instead of duplicating this literal " BEGIN " 4 times.( -a -java:S1192n"FDefine a constant instead of duplicating this literal "=old." 6 times.( -c -java:S1192"GDefine a constant instead of duplicating this literal " BEGIN" 6 times.( -t -java:S11920"^Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0," 14 times.( -_ -java:S1192b"IDefine a constant instead of duplicating this literal " WHERE " 8 times.(랰 -s -java:S1192"\Define a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT 0" 3 times.( -\ -java:S1192b"FDefine a constant instead of duplicating this literal "=new." 6 times.(랰 -i -java:S1192"MDefine a constant instead of duplicating this literal " ADD COLUMN " 6 times.( -h -java:S1192"RDefine a constant instead of duplicating this literal " AFTER DELETE ON " 3 times.(B -i -java:S1192"MDefine a constant instead of duplicating this literal "ALTER TABLE " 6 times.( -c -java:S1192a"HDefine a constant instead of duplicating this literal " SET " 8 times.(˓ -` -java:S1192`"JDefine a constant instead of duplicating this literal " UPDATE " 8 times.( -o -java:S1192C"ZDefine a constant instead of duplicating this literal " TEXT NOT NULL DEFAULT ''" 4 times.(] - -java:S11923"yDefine a constant instead of duplicating this literal " INTEGER NOT NULL DEFAULT (strftime('%s','now') * 1000)," 4 times.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff index 7516209c..ffb60b3d 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff +++ b/src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff @@ -1,11 +1,12 @@ s -java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 197.( +java:S4144"\Update this method so that its implementation is not identical to "getParentId" on line 203.( > -java:S1125]"(Remove the unnecessary boolean literals.( +java:S1125^"(Remove the unnecessary boolean literals.( m -java:S3776|"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.( +java:S3776}"RRefactor this method to reduce its Cognitive Complexity from 22 to the 15 allowed.( C -java:S1125}"(Remove the unnecessary boolean literals.( +java:S1125~"(Remove the unnecessary boolean literals.( > -java:S1125~"(Remove the unnecessary boolean literals.( \ No newline at end of file +java:S1125"(Remove the unnecessary boolean literals.( +s java:S117"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ٮ8/ \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 b/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 deleted file mode 100644 index e2674039..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 +++ /dev/null @@ -1,15 +0,0 @@ - -\ -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.( -\ -java:S2147"ECombine this catch with the one at line 243, which has the same body.(暩 -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.( -U -java:S1155">Use isEmpty() to check whether the collection is empty or not.( -O -java:S2589"8Remove this expression which always evaluates to "false"( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f b/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f deleted file mode 100644 index cf1a80f0..00000000 --- a/src/Notes-master1/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f +++ /dev/null @@ -1,14 +0,0 @@ - -M -java:S1135c"2Complete the task associated to this TODO comment.( -< java:S131h""Add a default case to this switch.( -^ -java:S1126"BReplace this if-then-else statement by a single method invocation.(忥 -P -java:S2864"4Iterate over the "entrySet" instead of the "keySet".(Κ -o -java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").( -D -java:S1604"(Make this anonymous inner class a lambda( -f -java:S1301h"KReplace this "switch" statement by "if" statements to increase readability.( \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb index b3bcaba6..5fc59a54 100644 --- a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -90,28 +90,14 @@ h < build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 c -3src/main/java/net/micode/notes/ui/DropdownMenu.java,1\e\1e8670b74afc171cd1cff4b54f19c5c5e2b275e2 +3src/main/java/net/micode/notes/ui/NoteItemData.java,d\9\d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff +d +4src/main/java/net/micode/notes/ui/NotesListItem.java,4\6\4623bd3eb8366c31819ef25a6dc50fee4400c6d6 +L +src/main/AndroidManifest.xml,0\6\066a3db98a4a279fde40d6ddf92c417b5c93198b b 2src/main/java/net/micode/notes/tool/DataUtils.java,0\e\0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6 -^ -.src/main/java/net/micode/notes/model/Note.java,f\b\fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645 -l - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -98,7 +592,7 @@ - + @@ -215,12 +709,12 @@ file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 1075 + 1086 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 918 + 929 @@ -235,12 +729,12 @@ file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 655 + 666 file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java - 718 + 729 diff --git a/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java new file mode 100644 index 00000000..ea133b80 --- /dev/null +++ b/src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogDeleteSenoteBinding.java @@ -0,0 +1,58 @@ +// Generated by view binder compiler. Do not edit! +package net.micode.notes.databinding; + +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.viewbinding.ViewBinding; +import android.widget.EditText; +import java.lang.NullPointerException; +import java.lang.Override; +import net.micode.notes.R; + +public final class DialogDeleteSenoteBinding implements ViewBinding { + @NonNull + private final EditText rootView; + + @NonNull + public final EditText etDeleteSenote; + + private DialogDeleteSenoteBinding(@NonNull EditText rootView, @NonNull EditText etDeleteSenote) { + this.rootView = rootView; + this.etDeleteSenote = etDeleteSenote; + } + + @Override + @NonNull + public EditText getRoot() { + return rootView; + } + + @NonNull + public static DialogDeleteSenoteBinding inflate(@NonNull LayoutInflater inflater) { + return inflate(inflater, null, false); + } + + @NonNull + public static DialogDeleteSenoteBinding inflate(@NonNull LayoutInflater inflater, + @Nullable ViewGroup parent, boolean attachToParent) { + View root = inflater.inflate(R.layout.dialog_delete_senote, parent, false); + if (attachToParent) { + parent.addView(root); + } + return bind(root); + } + + @NonNull + public static DialogDeleteSenoteBinding bind(@NonNull View rootView) { + if (rootView == null) { + throw new NullPointerException("rootView"); + } + + EditText etDeleteSenote = (EditText) rootView; + + return new DialogDeleteSenoteBinding((EditText) rootView, etDeleteSenote); + } +} diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 195d6079..832f0b4f 100644 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json index 0e5fcf9f..6aea6b69 100644 Binary files a/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json and b/src/Notes-master1/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json differ diff --git a/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml new file mode 100644 index 00000000..62441548 --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/dialog_delete_senote-layout.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 6b9f8a81..864c97f5 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 1c181bc9..0aabafff 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index ba77cbeb..f806f6fa 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 2113f81f..9c600f34 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 601f245f..27949810 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 9cd66ec5..83079bd3 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin deleted file mode 100644 index 601f245f..00000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index ce5af522..41f794f4 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 5b370b5a..66022339 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out index bf0d87ab..62f94575 100644 --- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -1 +1 @@ -4 \ No newline at end of file +6 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json index 1751054b..73756f7e 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json and b/src/Notes-master1/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 070ed54e..ea13d802 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= deleted file mode 100644 index 2b56acdb..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3mkuZFl0xfTQaqF8UhzkJthSBPQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3mkuZFl0xfTQaqF8UhzkJthSBPQ= deleted file mode 100644 index 04e716ab..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3mkuZFl0xfTQaqF8UhzkJthSBPQ= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= deleted file mode 100644 index a19a2a51..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= deleted file mode 100644 index e7159a9a..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= deleted file mode 100644 index e27d24ae..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9sjo_tbZmPFzeOCOMDzirmMDyYw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9sjo_tbZmPFzeOCOMDzirmMDyYw= deleted file mode 100644 index 30d4fc41..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9sjo_tbZmPFzeOCOMDzirmMDyYw= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= deleted file mode 100644 index e9e76081..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= deleted file mode 100644 index 6bb2c493..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= deleted file mode 100644 index 06e914d8..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= deleted file mode 100644 index 865488d1..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= new file mode 100644 index 00000000..644b6d1c Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/LzDmrJnMR82iNgSgDfMICEtrs5E= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= deleted file mode 100644 index 2dae2f9b..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= deleted file mode 100644 index f61d7629..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UlGo9s1RQR+XiXq4PEgsiM5H58g= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UlGo9s1RQR+XiXq4PEgsiM5H58g= deleted file mode 100644 index fc84c6a3..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UlGo9s1RQR+XiXq4PEgsiM5H58g= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= deleted file mode 100644 index 371b4414..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= deleted file mode 100644 index 25547cc9..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= deleted file mode 100644 index feebff2e..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= deleted file mode 100644 index 1423435f..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= deleted file mode 100644 index 27924dd4..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= deleted file mode 100644 index 87586a52..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= deleted file mode 100644 index e49acf79..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= deleted file mode 100644 index 2365cb90..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= deleted file mode 100644 index d0dcd9ca..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= deleted file mode 100644 index 32d47c06..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= deleted file mode 100644 index 3c086f36..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= deleted file mode 100644 index a69b1ec0..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= deleted file mode 100644 index b12b2871..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= new file mode 100644 index 00000000..45e8d00a Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lh5eUEU7i_s4uVNaCLBHiy+bVT4= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= deleted file mode 100644 index 483b42ca..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= deleted file mode 100644 index 8d3e7638..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= deleted file mode 100644 index 083d96b0..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= deleted file mode 100644 index 1c79806c..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= new file mode 100644 index 00000000..69b5bbb9 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qnOO+n11i0CYfZGNnhQgvni__Ak= differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= deleted file mode 100644 index b6ac9fe4..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= deleted file mode 100644 index 0fb7130e..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= deleted file mode 100644 index c063f2b9..00000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY= and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index f79d0b52..d86314b8 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index c6ae0a39..40de823c 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 0583946d..73b3eadd 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,103 +1,103 @@ -#Mon Nov 08 23:54:26 CST 2021 -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\activity_splash.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\splash.gif=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_splash.gif.flat -D\:\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -D\:\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +#Tue Nov 09 08:54:37 CST 2021 +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\preferences.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\sub_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_input_passwd.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_input_passwd.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_dropdown.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\color\\primary_text_dark.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\datetime_picker.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\p1.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_p1.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw-zh-rCN\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\notification.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\call_record.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list_options.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\trash_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_trash_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit_text.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_small.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\trash_background.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_trash_background.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\lock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable\\new_note.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_list.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\raw\\introduction=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_delete_senote.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_delete_senote.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_add_secret.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_add_secret.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_dropdown_menu.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\font_large.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\note_edit.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\xml\\searchable.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\menu\\call_record_folder.xml=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 2feaadbb..00000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,3501 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - false - true - @android:color/black - #7fa87f - @android:color/black - @android:color/black - @color/material_deep_teal_200 - @color/material_deep_teal_500 - @color/material_grey_800 - @android:color/white - @color/material_grey_850 - @color/material_grey_50 - #66000000 - #80ffffff - #80000000 - @color/bright_foreground_material_light - @color/bright_foreground_material_dark - @android:color/white - @android:color/black - #ff5a595b - #ffd6d7d7 - #80bebebe - #80323232 - #ffbebebe - #ff323232 - #ff7043 - #ff5722 - @android:color/white - @android:color/black - #6680cbc4 - #66009688 - #FF039BE5 - #FF01579B - #FF40C4FF - #FF00B0FF - #ff37474f - #ff263238 - #ff21272b - #ff80cbc4 - #ff009688 - #fff5f5f5 - #ffe0e0e0 - #fffafafa - #ff757575 - #ff424242 - #ff303030 - #ff212121 - #ffffffff - #ff9e9e9e - @android:color/black - @color/material_grey_600 - @color/material_grey_900 - @color/material_grey_100 - #ffffffff - #de000000 - #4Dffffff - #39000000 - #33ffffff - #1f000000 - #b3ffffff - #8a000000 - #36ffffff - #24000000 - #ff616161 - #ffbdbdbd - #ffbdbdbd - #fff1f1f1 - #e6616161 - #e6FFFFFF - #335b5b5b - 16dp - 72dp - 56dp - 0dp - 0dp - 4dp - 16dp - 10dp - 6dp - 48dp - 180dp - 5dp - -3dp - 48dp - 48dp - 36dp - 48dp - 48dp - @dimen/abc_control_inset_material - 6dp - 8dp - @dimen/abc_control_padding_material - 720dp - 320dp - 2dp - 4dp - 4dp - 2dp - 80% - 100% - 320dp - 320dp - 8dp - 8dp - 65% - 95% - 24dp - 18dp - 8dp - 0.30 - 0.26 - 32dip - 8dip - 8dip - 7dp - 4dp - 10dp - 16dp - @dimen/abc_action_bar_content_inset_material - 296dp - 4dp - 48dip - 320dip - 2dp - 2dp - 20dp - 3dp - 14sp - 14sp - 14sp - 12sp - 34sp - 45sp - 56sp - 112sp - 24sp - 22sp - 18sp - 14sp - 16sp - 14sp - 16sp - 16dp - 20sp - 20dp - 4dp - 6dp - 8dp - 4dp - 2dp - 320dp - 320dp - 0.30 - 0.26 - 0.26 - 0.20 - 0.12 - 0.50 - 0.38 - 0.70 - 0.54 - 32dp - 13sp - 12dp - 8dp - 64dp - 64dp - 10dp - @dimen/notification_content_margin_start - 16dp - 2dp - 3dp - 24dp - 13sp - 10dp - 5dp - 26sp - 20sp - 17sp - 14sp - 33sp - 2dp - 16dp - 8dp - 8dp - 96dp - 6.5dp - 0dp - 16dp - #3333B5E5 - #0cffffff - - - - - - - - - - - - - - - - - - - 220 - 150 - 127 - 150 - 999 - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Navigate home - Navigate up - More options - Done - See all - Choose an app - OFF - ON - sans-serif - sans-serif-medium - sans-serif-medium - sans-serif - sans-serif - sans-serif - sans-serif - sans-serif-light - sans-serif - sans-serif - sans-serif - sans-serif-medium - Alt+ - Ctrl+ - delete - enter - Function+ - Meta+ - Shift+ - space - Sym+ - Menu+ - Search… - Clear query - Search query - Search - Submit query - Voice search - Share with - Share with %s - Collapse - Input describe - Input password - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Confirm to delete secret of this note? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - light mode - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Input password - Add secret - Remind me - Change view - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Init Order - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Delete secret - Restore - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Time Order - Select folder - night mode - Expired - Length - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Search - Text in your notes - Set reminder - 999+ - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml index 24b8fd12..8c9e4801 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ -#ffffffff#ff9e9e9e#1f000000#8a000000 +#ffffffff#ff9e9e9e#1f000000#8a000000 @@ -89,13 +89,13 @@ "999+""999+""999+""999+""999+" + "999+""999+""999+""999+""999+" @@ -179,7 +179,7 @@ truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF + truefalsetrue@android:color/black#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff009688#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF @@ -2319,14 +2319,14 @@ "होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%"होम पेज पर जाएं""ऊपर जाएं""ज़्यादा विकल्प""हो गया""सभी देखें""कोई एप्‍लिकेशन चुनें""बंद""चालू""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""खोजा जा रहा है…""क्‍वेरी साफ़ करें""सर्च क्वेरी""सर्च करें""क्वेरी सबमिट करें""आवाज़ सर्च""इसके साथ शेयर करें""%s के साथ शेयर करें""छोटा करें""सर्च""Idi na početnu""Idi gore""Dodatne opcije""Gotovo""Prikaži sve""Odabir aplikacije""ISKLJUČENO""UKLJUČENO""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""razmaknica""Sym+""Menu+""Pretražite…""Izbriši upit""Upit za pretraživanje""Pretraživanje""Pošalji upit""Glasovno pretraživanje""Dijeljenje sa""Dijeli putem aplikacije %s""Sažmi""Pretraživanje""Ugrás a főoldalra""Felfelé mozgatás""További lehetőségek""Kész""Összes megtekintése""Válasszon ki egy alkalmazást""KI""BE""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Szóköz""Sym+""Menu+""Keresés…""Lekérdezés törlése""Keresési lekérdezés""Keresés""Lekérdezés küldése""Hangalapú keresés""Megosztás a következővel:""Megosztás a következő alkalmazással: %s""Összecsukás""Keresés""Ուղղվել տուն""Ուղղվել վերև""Այլ ընտրանքներ""Պատրաստ է""Տեսնել բոլորը""Ընտրել ծրագիր""ԱՆՋԱՏՎԱԾ""ՄԻԱՑՎԱԾ""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""բացատ""Sym+""Menu+""Որոնում...""Մաքրել հարցումը""Որոնման հարցում""Որոնել""Ուղարկել հարցումը""Ձայնային որոնում""Կիսվել""Ուղարկել %s-ին""Թաքցնել""Որոնել""Navigasi ke beranda""Navigasi naik""Opsi lain""Selesai""Lihat semua""Pilih aplikasi""NONAKTIF""AKTIF""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""spasi""Sym+""Menu+""Telusuri...""Hapus kueri""Kueri penelusuran""Telusuri""Kirim kueri""Penelusuran suara""Bagikan dengan""Bagikan ke %s""Ciutkan""Telusuri""Fara heim""Fara upp""Fleiri valkostir""Lokið""Sjá allt""Veldu forrit""SLÖKKT""KVEIKT""Alt+""Ctrl+""delete""enter""Aðgerðarlykill+""Meta+""Shift+""bilslá""Sym+""Valmynd+""Leita…""Hreinsa fyrirspurn""Leitarfyrirspurn""Leita""Senda fyrirspurn""Raddleit""Deila með""Deila með %s""Minnka""Leita""Vai alla home page""Vai in alto""Altre opzioni""Fine""Visualizza tutte""Scegli un\'applicazione""OFF""ON""ALT +""CTRL +""CANC""INVIO""FUNZIONE +""META +""MAIUSC +""barra spaziatrice""SYM +""MENU +""Cerca…""Cancella query""Query di ricerca""Cerca""Invia query""Ricerca vocale""Condividi con""Condividi tramite %s""Comprimi""Ricerca""נווט לדף הבית""נווט למעלה""עוד אפשרויות""בוצע""ראה הכל""בחר אפליקציה""כבוי""פועל""Alt+""Ctrl+‎""delete""Enter""Function+""Meta+""Shift+""מקש רווח""Sym+""תפריט+""חיפוש…""מחק שאילתה""שאילתת חיפוש""חיפוש""שלח שאילתה""חיפוש קולי""שתף עם""שתף עם %s""כווץ""חיפוש""ホームへ移動""上へ移動""その他のオプション""完了""すべて表示""アプリの選択""OFF""ON""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""Space""Sym+""Menu+""検索…""検索キーワードを削除""検索キーワード""検索""検索キーワードを送信""音声検索""共有""%sと共有""折りたたむ""検索""მთავარზე ნავიგაცია""ზემოთ ნავიგაცია""მეტი ვარიანტები""დასრულდა""ყველას ნახვა""აპის არჩევა""გამორთულია""ჩართულია""Alt+""Ctrl+""წაშლა""შეყვანა""Function+""Meta+""Shift+""space""Sym+""Menu+""ძიება...""მოთხოვნის გასუფთავება""ძიების მოთხოვნა""ძიება""მოთხოვნის გადაგზავნა""ხმოვანი ძიება""გაზიარება:""გაუზიარეთ %s-ს""აკეცვა""ძიება""Негізгі бетте қозғалу""Жоғары қозғалу""Басқа опциялар""Дайын""Барлығын көру""Қолданбаны таңдау""ӨШІРУЛІ""ҚОСУЛЫ""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""бос орын""Sym+""Mәзір+""Іздеу…""Сұрақты жою""Сұрақты іздеу""Іздеу""Сұрақты жіберу""Дауыс арқылы іздеу""Бөлісу""%s қолданбасымен бөлісу""Тасалау""Іздеу""រកមើល​ទៅ​ដើម""រកមើល​ឡើងលើ""ជម្រើស​ច្រើន​ទៀត""រួចរាល់""មើល​ទាំងអស់""ជ្រើស​កម្មវិធី​​""បិទ""បើក""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ស្វែងរក…""សម្អាត​សំណួរ""ស្វែងរក​សំណួរ""ស្វែងរក""ដាក់​​​ស្នើ​សំណួរ""ការស្វែងរក​សំឡេង""ចែករំលែក​ជាមួយ""ចែក​រំលែក​ជា​មួយ %s""បង្រួម""ស្វែងរក""ಮುಖಪುಟವನ್ನು ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಮೇಲಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ""ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು""ಮುಗಿದಿದೆ""ಎಲ್ಲವನ್ನೂ ನೋಡಿ""ಒಂದು ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ""ಆಫ್""ಆನ್""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""space""Sym+""Menu+""ಹುಡುಕಿ…""ಪ್ರಶ್ನೆಯನ್ನು ತೆರವುಗೊಳಿಸು""ಪ್ರಶ್ನೆಯನ್ನು ಹುಡುಕಿ""ಹುಡುಕಿ""ಪ್ರಶ್ನೆಯನ್ನು ಸಲ್ಲಿಸು""ಧ್ವನಿ ಹುಡುಕಾಟ""ಇವರೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""%s ನೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಿ""ಸಂಕುಚಿಸು""ಹುಡುಕಿ""홈 탐색""위로 탐색""옵션 더보기""완료""전체 보기""앱 선택""사용 안함""사용""Alt+""Ctrl+""삭제""입력""Function+""Meta+""Shift+""스페이스바""Sym+""Menu+""검색...""검색어 삭제""검색어""검색""검색어 보내기""음성 검색""공유 대상""%s와(과) 공유""접기""검색""Үйгө багыттоо""Жогору""Көбүрөөк мүмкүнчүлүктөр""Даяр""Бардыгын көрүү""Колдонмо тандоо""ӨЧҮК""КҮЙҮК""Alt+""Ctrl+""Delete""Enter""Function+""Meta+""Shift+""боштук""Sym+""Menu+""Издөө…""Талаптарды тазалоо""Издөө талаптары""Издөө""Талап жөнөтүү""Үн аркылуу издөө""Бөлүшүү""%s аркылуу бөлүшүү""Жыйнап коюу""Издөө"48dp12dp14dp440dp60%90%60%90%55%80%0px0px"Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm""Điều hướng về trang chủ""Điều hướng lên trên""Tùy chọn khác""Xong""Xem tất cả""Chọn một ứng dụng""TẮT""BẬT""Alt+""Ctrl+""delete""enter""Function+""Meta+""Shift+""phím cách""Sym+""Menu+""Tìm kiếm…""Xóa truy vấn""Tìm kiếm truy vấn""Tìm kiếm""Gửi truy vấn""Tìm kiếm bằng giọng nói""Chia sẻ với""Chia sẻ với %s""Thu gọn""Tìm kiếm"60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" + 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" @@ -2817,17 +2817,7 @@ /> - - 短信 - 邮件 - 字数便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - + -%s --%s --%s @@ -2835,11 +2825,14 @@ Messaging Email - #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp + + + + #335b5b5b#FF039BE5#FF01579B#FF40C4FF#FF00B0FF#6600000033sp26sp20sp17sp14sp %1$s result for \"%2$s\" %1$s results for \"%2$s\" - light modenight modeLengthNotesNotes 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 syncingSettingsSearchRestoreChange viewTime OrderInit OrderDeleteMove 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 reminderAdd secretDelete secretSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Confirm to delete secret of this note?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 nameInput describeInput passwordInput passwordSearching NotesSearch notesText in your notesNotessetcancel - - - + + 短信 + 邮件 + 字数便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml new file mode 100644 index 00000000..ab30673f --- /dev/null +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 8b924a7a..c95d575a 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d219752b..e042d446 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Nov 09 00:03:28 CST 2021 -base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Tue Nov 09 09:13:48 CST 2021 +base.0=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index f4021837..dce6f99a 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 0f66e43b..29dd0cbb 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class new file mode 100644 index 00000000..47c81db3 Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/databinding/DialogDeleteSenoteBinding.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index d7a0eb63..a6ca1a0e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index faef58cc..16735863 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class index c43643f8..55a8c351 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class index 9b012960..a2406ade 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 7b330a8f..4673c609 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0aea84b6..7f99bd82 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 30180956..208d4955 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index bedd7cef..a85ac7a7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index a5314533..15836853 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 401f21f5..d04a70b7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index 25535745..4c8017ba 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 6faed80b..d3c01556 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index cc823b89..25581263 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index f1f2cfe1..1a03fd7f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index b1240fdb..0d8cc025 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class index 5d8717b6..4de0b09c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index b58eac37..13ea3a12 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index e7080a13..0cc2ab23 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index c8fc8a3d..bf844f5e 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -5,233 +5,234 @@ 5 android:versionName="0.1" > 6 7 D:\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 +7-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 8 android:minSdkVersion="16" -8-->D:\Notes-master1\app\src\main\AndroidManifest.xml:7:15-41 +8-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:15-41 9 android:targetSdkVersion="23" /> -9-->D:\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 +9-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44 10 11 -11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:9:5-81 -11-->D:\Notes-master1\app\src\main\AndroidManifest.xml:9:22-78 +11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:9:5-81 +11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:9:22-78 12 -12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:5-88 -12-->D:\Notes-master1\app\src\main\AndroidManifest.xml:10:22-85 +12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-88 +12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-85 13 -13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:5-67 -13-->D:\Notes-master1\app\src\main\AndroidManifest.xml:11:22-64 +13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:5-67 +13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:22-64 14 -14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:5-72 -14-->D:\Notes-master1\app\src\main\AndroidManifest.xml:12:22-69 +14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-72 +14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-69 15 -15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:5-74 -15-->D:\Notes-master1\app\src\main\AndroidManifest.xml:13:22-71 +15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:5-74 +15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:22-71 16 -16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:5-80 -16-->D:\Notes-master1\app\src\main\AndroidManifest.xml:14:22-77 +16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:5-80 +16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:22-77 17 -17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:5-71 -17-->D:\Notes-master1\app\src\main\AndroidManifest.xml:15:22-68 +17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:5-71 +17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:22-68 18 -18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:5-74 -18-->D:\Notes-master1\app\src\main\AndroidManifest.xml:16:22-71 +18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:5-74 +18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:22-71 19 -19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:5-81 -19-->D:\Notes-master1\app\src\main\AndroidManifest.xml:17:22-78 +19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:5-81 +19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:22-78 20 21 D:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-117:19 +21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-117:19 22 android:appComponentFactory="android.support.v4.app.CoreComponentFactory" -22-->[com.android.support:support-compat:28.0.0] C:\Users\fanyi\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 +22-->[com.android.support:support-compat:28.0.0] C:\Users\小超人\.gradle\caches\transforms-3\2b9474e47639de47b19dc72cadc6eaea\transformed\support-compat-28.0.0\AndroidManifest.xml:22:18-91 23 android:debuggable="true" 24 android:icon="@drawable/icon_app" -24-->D:\Notes-master1\app\src\main\AndroidManifest.xml:20:9-42 -25 android:label="@string/app_name" > -25-->D:\Notes-master1\app\src\main\AndroidManifest.xml:21:9-41 -26 D:\Notes-master1\app\src\main\AndroidManifest.xml:23:9-35:20 -27 android:name="net.micode.notes.ui.NotesListActivity" -27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:24:13-49 -28 android:configChanges="keyboardHidden|orientation|screenSize" -28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:13-74 -29 android:label="@string/app_name" -29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:13-45 -30 android:launchMode="singleTop" -30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:13-43 -31 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" -31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:13-71 -32 android:uiOptions="splitActionBarWhenNarrow" -32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:13-57 -33 android:windowSoftInputMode="adjustPan" > -33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:13-52 -34 -34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:13-34:29 -35 -35-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:17-69 -35-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:25-66 -36 -37 -37-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:17-77 -37-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:27-74 -38 -39 -40 D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-58:20 -41 android:name="net.micode.notes.ui.NoteEditActivity" -41-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:13-48 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\Notes-master1\app\src\main\AndroidManifest.xml:38:13-74 -43 android:launchMode="singleTop" -43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-43 -44 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > -44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-71 -45 -45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-48:29 -46 -46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:17-79 -46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:25-76 -47 -48 -48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 -48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 -49 -50 -50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 -50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 -51 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 -52 -53 -53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:13-53:29 -54 -54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:50:17-71 -54-->D:\Notes-master1\app\src\main\AndroidManifest.xml:50:25-68 -55 -56 -56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 -56-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 -57 -58 -59 D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-57:54 -60 android:name="android.app.searchable" -60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:17-54 -61 android:resource="@xml/searchable" /> -61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:17-51 -62 -63 D:\Notes-master1\app\src\main\AndroidManifest.xml:59:9-63:78 -64 android:name="net.micode.notes.ui.AlarmAlertActivity" -64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:13-50 -65 android:label="@string/app_name" -65-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:13-45 -66 android:launchMode="singleInstance" -66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:13-48 -67 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:63:13-75 -68 D:\Notes-master1\app\src\main\AndroidManifest.xml:64:9-68:63 -69 android:name="net.micode.notes.ui.NotesPreferenceActivity" -69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:65:13-55 -70 android:label="@string/preferences_title" -70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-54 -71 android:launchMode="singleTop" -71-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:13-43 -72 android:theme="@android:style/Theme.Holo.Light" /> -72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:68:13-60 -73 -74 D:\Notes-master1\app\src\main\AndroidManifest.xml:70:9-72:52 -75 android:name="android.app.default_searchable" -75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:71:13-58 -76 android:value=".ui.NoteEditActivity" /> -76-->D:\Notes-master1\app\src\main\AndroidManifest.xml:72:13-49 -77 -78 D:\Notes-master1\app\src\main\AndroidManifest.xml:74:9-77:43 -79 android:name="net.micode.notes.data.NotesProvider" -79-->D:\Notes-master1\app\src\main\AndroidManifest.xml:75:13-47 -80 android:authorities="micode_notes" -80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47 -81 android:multiprocess="true" /> -81-->D:\Notes-master1\app\src\main\AndroidManifest.xml:77:13-40 -82 -83 D:\Notes-master1\app\src\main\AndroidManifest.xml:79:9-91:20 -84 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:13-57 -85 android:label="@string/app_widget2x2" > -85-->D:\Notes-master1\app\src\main\AndroidManifest.xml:81:13-50 -86 -86-->D:\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 -87 -87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 -87-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 -88 -88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 -88-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 -89 -89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 -89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 -90 -91 -92 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 -93 android:name="android.appwidget.provider" -93-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 -94 android:resource="@xml/widget_2x_info" /> -94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 -95 -96 D:\Notes-master1\app\src\main\AndroidManifest.xml:92:9-104:20 -97 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:13-57 -98 android:label="@string/app_widget4x4" > -98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:13-50 -99 -99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 -100 -100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 -100-->D:\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 -101 -101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 -101-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 -102 -102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 -102-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 -103 -104 -105 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 -106 android:name="android.appwidget.provider" -106-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 -107 android:resource="@xml/widget_4x_info" /> -107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 -108 -109 -109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:9-109:20 -109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:105:19-55 -110 -110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:106:13-108:29 -111 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:17-79 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:107:25-76 -112 -113 -114 D:\Notes-master1\app\src\main\AndroidManifest.xml:110:9-112:41 -115 android:name="net.micode.notes.ui.AlarmReceiver" -115-->D:\Notes-master1\app\src\main\AndroidManifest.xml:111:13-45 -116 android:process=":remote" /> -116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:112:13-38 -117 -118 D:\Notes-master1\app\src\main\AndroidManifest.xml:114:9-116:40 -119 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:115:13-58 -120 android:exported="false" /> -120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:13-37 -121 -122 -123 +24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:9-42 +25 android:label="@string/app_name" +25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:9-41 +26 android:testOnly="true" > +27 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:23:9-35:20 +28 android:name="net.micode.notes.ui.NotesListActivity" +28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:24:13-49 +29 android:configChanges="keyboardHidden|orientation|screenSize" +29-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:13-74 +30 android:label="@string/app_name" +30-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-45 +31 android:launchMode="singleTop" +31-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-43 +32 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" +32-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-71 +33 android:uiOptions="splitActionBarWhenNarrow" +33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:13-57 +34 android:windowSoftInputMode="adjustPan" > +34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:13-52 +35 +35-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-34:29 +36 +36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:17-69 +36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:25-66 +37 +38 +38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:17-77 +38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:27-74 +39 +40 +41 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-58:20 +42 android:name="net.micode.notes.ui.NoteEditActivity" +42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:13-48 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:13-74 +44 android:launchMode="singleTop" +44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-43 +45 android:theme="@style/Theme.AppCompat.Light.DarkActionBar" > +45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-71 +46 +46-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-48:29 +47 +47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:17-79 +47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:25-76 +48 +49 +49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 +49-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 +50 +51 +51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 +51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 +52 +52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:17-78 +52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:46:23-75 +53 +54 +54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:13-53:29 +55 +55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:17-71 +55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:25-68 +56 +57 +57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:17-76 +57-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:44:27-73 +58 +59 +60 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-57:54 +61 android:name="android.app.searchable" +61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:17-54 +62 android:resource="@xml/searchable" /> +62-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:17-51 +63 +64 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:59:9-63:78 +65 android:name="net.micode.notes.ui.AlarmAlertActivity" +65-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:13-50 +66 android:label="@string/app_name" +66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:13-45 +67 android:launchMode="singleInstance" +67-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-48 +68 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> +68-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-75 +69 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:64:9-68:63 +70 android:name="net.micode.notes.ui.NotesPreferenceActivity" +70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:65:13-55 +71 android:label="@string/preferences_title" +71-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-54 +72 android:launchMode="singleTop" +72-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-43 +73 android:theme="@android:style/Theme.Holo.Light" /> +73-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:68:13-60 +74 +75 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:70:9-72:52 +76 android:name="android.app.default_searchable" +76-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:71:13-58 +77 android:value=".ui.NoteEditActivity" /> +77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:72:13-49 +78 +79 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:74:9-77:43 +80 android:name="net.micode.notes.data.NotesProvider" +80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:75:13-47 +81 android:authorities="micode_notes" +81-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47 +82 android:multiprocess="true" /> +82-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:77:13-40 +83 +84 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:79:9-91:20 +85 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +85-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:13-57 +86 android:label="@string/app_widget2x2" > +86-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-50 +87 +87-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 +88 +88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 +88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 +89 +89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 +89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 +90 +90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 +90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 +91 +92 +93 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 +94 android:name="android.appwidget.provider" +94-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 +95 android:resource="@xml/widget_2x_info" /> +95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 +96 +97 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:92:9-104:20 +98 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:13-57 +99 android:label="@string/app_widget4x4" > +99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-50 +100 +100-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29 +101 +101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:17-84 +101-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:25-81 +102 +102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-85 +102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-82 +103 +103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85 +103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82 +104 +105 +106 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:88:13-90:58 +107 android:name="android.appwidget.provider" +107-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:17-58 +108 android:resource="@xml/widget_4x_info" /> +108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-55 +109 +110 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:105:9-109:20 +110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:105:19-55 +111 +111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:13-108:29 +112 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:17-79 +112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:25-76 +113 +114 +115 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:110:9-112:41 +116 android:name="net.micode.notes.ui.AlarmReceiver" +116-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:111:13-45 +117 android:process=":remote" /> +117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-38 +118 +119 E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:114:9-116:40 +120 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +120-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:115:13-58 +121 android:exported="false" /> +121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:13-37 +122 +123 +124 diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar index 32d3e83b..b010b177 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar and b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 7b3565f8..483a811d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -22,7 +22,8 @@ android:appComponentFactory="android.support.v4.app.CoreComponentFactory" android:debuggable="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" > + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > + android:label="@string/app_name" + android:testOnly="true" > (position + 1)) { mIsMultiNotesFollowingFolder = true; } else { @@ -243,4 +249,8 @@ public class NoteItemData { public static int getNoteType(Cursor cursor) { return cursor.getInt(TYPE_COLUMN); } + + public boolean isNotesFollowItsFolder() { + return mIsNotesFollowItsFolder; + } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index f0379390..f8379197 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -442,7 +442,12 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); } } - + if (mCurrentFolderId == Notes.ID_TRASH_FOLER) { + getWindow().setBackgroundDrawableResource(R.drawable.trash_background); + } + else { + getWindow().setBackgroundDrawableResource(R.drawable.list_background); + } } @@ -499,6 +504,12 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe } private void batchDelete() { + for(AppWidgetAttribute widget : mNotesListAdapter.getSelectedWidget()) { + if (widget.widgetHavePasswd == 1) { + Toast.makeText(this, "选中的便签中有加密便签，不能\n删除,需将便签解密后才能删除", Toast.LENGTH_SHORT).show(); + return; + } + } new AsyncTask>() { protected HashSet doInBackground(Void... unused) { HashSet widgets = mNotesListAdapter.getSelectedWidget(); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java index 62d1da61..89af442d 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java @@ -41,6 +41,7 @@ public class NotesListAdapter extends CursorAdapter { public static class AppWidgetAttribute { public int widgetId; public int widgetType; + public long widgetHavePasswd; }; public NotesListAdapter(Context context) { @@ -115,6 +116,7 @@ public class NotesListAdapter extends CursorAdapter { NoteItemData item = new NoteItemData(mContext, c); widget.widgetId = item.getWidgetId(); widget.widgetType = item.getWidgetType(); + widget.widgetHavePasswd = item.getHavePassword(); itemSet.add(widget); /** * Don't close cursor here, only the adapter could close it diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java index 9c0c21c2..b1e5f7ce 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java @@ -131,7 +131,9 @@ public class NotesListItem extends LinearLayout { private void setBackground(NoteItemData data) { int id = data.getBgColorId(); if (data.getType() == Notes.TYPE_NOTE) { - if (data.isSingle() || data.isOneFollowingFolder()) { + if (data.isNotesFollowItsFolder()) { + setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id)); + } else if (data.isSingle() || data.isOneFollowingFolder()) { setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id)); } else if (data.isLast()) { setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id)); diff --git a/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png b/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png new file mode 100644 index 00000000..087e1f97 Binary files /dev/null and b/src/Notes-master1/app/src/main/res/drawable-hdpi/trash_background.png differ diff --git a/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml b/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml new file mode 100644 index 00000000..ab30673f --- /dev/null +++ b/src/Notes-master1/app/src/main/res/layout/dialog_delete_senote.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties index 3eac9fe9..b1388833 100644 --- a/src/Notes-master1/local.properties +++ b/src/Notes-master1/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Nov 08 16:59:38 CST 2021 -sdk.dir=D\:\\SDK +#Tue Nov 09 08:12:19 CST 2021 +sdk.dir=E\:\\SDK