Merge pull request '最后修改了部分细节' (#15) from Xie_Changrong into dev

src/Notes-master1/.idea/dbnavigator.xml

@@ -26,7 +26,7 @@
     <show-object-properties value="true" />
     <loaded-nodes>
       <connection connection-id="559db717-98ce-4bab-9101-a50869bd641a">
-        <schema name="main" object-types="table, view, constraint, index, column, dataset trigger" />
+        <schema name="main" object-types="table, view" />
       </connection>
     </loaded-nodes>
   </component>

src/Notes-master1/.idea/misc.xml

@@ -27,8 +27,11 @@
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_edit_text.xml" value="0.14356884057971014" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/dialog_input_passwd.xml" value="0.15729166666666666" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_edit.xml" value="0.33" />
+        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_edit_list_item.xml" value="0.125" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_item.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.15729166666666666" />
+        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.20520833333333333" />
+        <entry key="..\:/git/xcr_weihu/src/Notes-master1/app/src/main/res/menu/sub_folder.xml" value="0.20520833333333333" />
         <entry key="..\:/git/xcr_weihu_dev/src/Notes-master1/app/src/main/res/layout/note_list.xml" value="0.17755825734549138" />
         <entry key="..\:/git/xcr_weihu_dev/src/Notes-master1/app/src/main/res/menu/note_list.xml" value="0.2518518518518518" />
       </map>

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:S2589f"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

+java:S2589>"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

 S
-java:S2589>"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

+java:S2589f"8Remove this expression which always evaluates to "false"(ÎŽŽéûÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6

@@ -1,12 +0,0 @@
-
-m
-java:S37768"RRefactor this method to reduce its Cognitive Complexity from 27 to the 15 allowed.(üßú–ùÿÿÿÿ

-O
-java:S1874D"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×
-O
-java:S1874K"9Remove this use of "setTextAppearance"; it is deprecated.(Á†<C381>ö
-O
-java:S1874U"9Remove this use of "setTextAppearance"; it is deprecated.(¤ñÝ×
-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]*$'.(¬Ã•»

src/Notes-master1/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c

@@ -11,10 +11,10 @@ J
 java:S2864o"4Iterate over the "entrySet" instead of the "keySet".(਷â

 B
 java:S1125p"'Remove the unnecessary boolean literal.(ɯÀÐüÿÿÿÿ

-H
-java:S1168~"+Return an empty collection instead of null.(¥¹ï<C2B9>8ƒÍ­‘Ð/
-J
-java:S1125<18>
"'Remove the unnecessary boolean literal.( „Œ¢ùÿÿÿÿ
8’Í­‘Ð/
+A
+java:S1168~"+Return an empty collection instead of null.(¥¹ï<C2B9>
+C
+java:S1125<18>
"'Remove the unnecessary boolean literal.( „Œ¢ùÿÿÿÿ

 t
 java:S22931"YReplace the type specification in this constructor call with the diamond operator ("<>").(àÉ™âùÿÿÿÿ

 o
@@ -31,11 +31,11 @@ j
 java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(åÇŽ<C387>
 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‘ÿ¯‘Ð/
+r
+java:S1104,"\Make widgetHavePasswd a static final constant or non-public and provide accessors if needed.(››õÃ
 E
 java:S5411`"*Use the primitive boolean expression here.(ɯÀÐüÿÿÿÿ

 E
 java:S5411p"*Use the primitive boolean expression here.(ɯÀÐüÿÿÿÿ

-M
-java:S5411<18>
"*Use the primitive boolean expression here.( „Œ¢ùÿÿÿÿ
8ÂÍ­‘Ð/
+F
+java:S5411<18>
"*Use the primitive boolean expression here.( „Œ¢ùÿÿÿÿ

src/Notes-master1/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6

@@ -0,0 +1,115 @@
+
+<EFBFBD>

+java:S1186¯"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Û›ë´øÿÿÿÿ

+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".(ºá¯²ùÿÿÿÿ

+{
+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.(ѯ”<C2AF>

+\
+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]*$'.(êúÎêúÿÿÿÿ

+i	java:S100ò"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(‚—Ö°ýÿÿÿÿ

+F
+java:S1197™"*Move the array designators [] to the type.(¨ÅŠÂûÿÿÿÿ

+A
+java:S1197¦"*Move the array designators [] to the type.(Ô„¡å
+—

+java:S1186Ü"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(¢êÄ\
+{
+java:S1149Ò"_Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder".(ÄÈŒíþÿÿÿÿ

+O
+java:S1854Ï"8Remove this useless assignment to local variable "edit".(îß›¸
+O	java:S106Ã"9Replace this use of System.out or System.err by a logger.(¹ô•ƒ
+O	java:S106Æ"9Replace this use of System.out or System.err by a logger.(<28>õì—
+@
+java:S1481Ï")Remove this unused "edit" local variable.(îß›¸
+P
+java:S2864Ó"4Iterate over the "entrySet" instead of the "keySet".(<28>†—ýøÿÿÿÿ

+—

+java:S1186„	"€
Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(Ô¿Ñ4
+O	java:S106ï"9Replace this use of System.out or System.err by a logger.(×äÚà
+C
+java:S1068²
",Remove this unused "editText" private field.(²è‚Æ
+H
+java:S1068ì"1Remove this unused "mRecoListener" private field.(×ýÚ•
+t
+java:S2293q"YReplace the type specification in this constructor call with the diamond operator ("<>").(ÑÓ<C391>¥üÿÿÿÿ

+t
+java:S2293z"YReplace the type specification in this constructor call with the diamond operator ("<>").(®ú÷õþÿÿÿÿ

+u
+java:S2293ƒ
"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 ("<>").(À—’¢
+p
+java:S2293µ
"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 ("<>").(艥ð
+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]*$'.(“Ó<E2809C><C393>øÿÿÿÿ

+?
+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(„ñ×æ
+D
+java:S1604ê"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

+?
+java:S1604÷"(Make this anonymous inner class a lambda(ά¯”
+q
+java:S1104d"VMake tvModified a static final constant or non-public and provide accessors if needed.(ƒëÔ£ÿÿÿÿÿ

+r
+java:S1104f"WMake ivAlertIcon a static final constant or non-public and provide accessors if needed.(ªà¶±ûÿÿÿÿ

+r
+java:S1104h"WMake tvAlertDate a static final constant or non-public and provide accessors if needed.(“²<E2809C>Öúÿÿÿÿ

+s
+java:S1104j"XMake ibSetBgColor a static final constant or non-public and provide accessors if needed.(ýãä¬üÿÿÿÿ

+h
+java:S1104l"RMake ivLock a static final constant or non-public and provide accessors if needed.(›ÍØ•
+n
+java:S1104n"SMake ivRadio 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

src/Notes-master1/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477

@@ -1,5 +1,5 @@
 
-n	java:S116S"TRename this field "time_mode" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ö×ä¤ÿÿÿÿÿ

+i	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
@@ -40,68 +40,68 @@ java:S1874
 java:S1116¦"Remove this empty statement.(ôŸŽìúÿÿÿÿ

 i
 java:S3776ú"RRefactor this method to reduce its Cognitive Complexity from 32 to the 15 allowed.(ãìîí

-M
-java:S1874<18>"1Remove this use of "AsyncTask"; it is deprecated.(ýî?8ô»ˆ’Ð/
-F	java:S108ˆ")Either remove or fill this block of code.(žûÊ¥8÷»ˆ’Ð/
+F
+java:S1874<18>"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.( å«<C3A5>ûÿÿÿÿ

 h
-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.( å«<C3A5>ûÿÿÿÿ
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.( å«<C3A5>ûÿÿÿÿ
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¼ˆ’Ð/
+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:S3398Ê"0Move this method into "OnListItemClickListener".(‘ðð¡8ȼˆ’Ð/
-H
-java:S3398¢"%Move this method into "ModeCallback".(“ðÉçýÿÿÿÿ
8ȼˆ’Ð/
+java:S1135ü"2Complete the task associated to this TODO comment.(» æžÿÿÿÿÿ

+M
+java:S2696§"6Make the enclosing method "static" or remove this set.(œõ½€
+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.( å«<C3A5>ûÿÿÿÿ

+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.(δ¡Ûøÿÿÿÿ

 <
 java:S3398ú"%Move this method into "ModeCallback".(ãìîí

+A
+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ʼˆ’Ð/
+G
+java:S3398Ê"0Move this method into "OnListItemClickListener".(‘ðð¡
+p
+java:S2293µ"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥ð
 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.(¼üäÍ
-n	java:S117×"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( ú<C2A0>ª8Ó¼ˆ’Ð/
+g	java:S117×"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( ú<C2A0>ª
 >
 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(¿Ü´ã
-F
-java:S1604Ò"(Make this anonymous inner class a lambda(„ñ×æ8Ö¼ˆ’Ð/
-K
-java:S1604ã"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
8Ö¼ˆ’Ð/
-K
-java:S1604­"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ
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ؼˆ’Ð/
+?
+java:S1604Ò"(Make this anonymous inner class a lambda(„ñ×æ
+D
+java:S1604ã"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

+D
+java:S1604­"(Make this anonymous inner class a lambda(ˆÐï<C390>øÿÿÿÿ

+?
+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.(ד¾ñùÿÿÿÿ

 Z
 java:S2583´
"CChange this condition so that it does not always evaluate to "true"(¢õ§˜

src/Notes-master1/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff

@@ -1,12 +0,0 @@
-
-s
-java:S4144Ó
"\Update this method so that its implementation is not identical to "getParentId" on line 203.(ø¦¯ÿ
->
-java:S1125^"(Remove the unnecessary boolean literals.(ú«€É
-m
-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.(ãêÛì
-s	java:S117‡
"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(áçÙ®øÿÿÿÿ
8³—¢<E28094>Ð/

src/Notes-master1/.idea/sonarlint/issuestore/index.pb

@@ -87,17 +87,15 @@ l
 <app/src/main/java/net/micode/notes/ui/NotesListActivity.java,a\d\ad72331a1bed265bb9c0fe838faa74dbf69fce32
 h
 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad
-<
-build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
-c
-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
+<
+build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35
 b
 2src/main/java/net/micode/notes/tool/DataUtils.java,0\e\0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6
 g
 7src/main/java/net/micode/notes/ui/NotesListAdapter.java,5\3\53b98e6d0ece8f8c43934ef63db400be3bbe507c
 h
-8src/main/java/net/micode/notes/ui/NotesListActivity.java,7\b\7bccae5ecd745bba36ddfd464ec07b66de678477
+8src/main/java/net/micode/notes/ui/NotesListActivity.java,7\b\7bccae5ecd745bba36ddfd464ec07b66de678477
+g
+7src/main/java/net/micode/notes/ui/NoteEditActivity.java,6\c\6c40630893054a28c13c2eb04ceb5fa51173b0b6

src/Notes-master1/.idea/workspace.xml

@@ -13,498 +13,47 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f028e52a-5f24-429b-8af1-f5a0863e8065" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable-hdpi/trash_background.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/dialog_delete_senote.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/fileHashes/fileHashes.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.2/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.2/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/md5-checksums.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/checksums/sha1-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/6/066a3db98a4a279fde40d6ddf92c417b5c93198b" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/e/0e854f4195c0d44c8ada29e4ad9b0cb3970cb0e6" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/1/e/1e8670b74afc171cd1cff4b54f19c5c5e2b275e2" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/3/2/322f2bcce3dd21425ff2a882b59142fb9d0cef8b" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/4/6/4623bd3eb8366c31819ef25a6dc50fee4400c6d6" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/4/7/477514696ea40ffed472ce9039b069f29ff599fd" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/5/3/53b98e6d0ece8f8c43934ef63db400be3bbe507c" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/6/c/6c40630893054a28c13c2eb04ceb5fa51173b0b6" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/7/2/72971ba5cd5eebd08ece719bc9283211cd06a429" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/7/b/7bccae5ecd745bba36ddfd464ec07b66de678477" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/c/1/c10e14da9454435dc446fb22e21efef63afaf7fd" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/d/8/d8a02a8652b122905e3406dbc06e48f48ca280f7" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/d/9/d92e16000f49ca8e38a8b0a8ef8d26ecfa0c30ff" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/f/b/fb98ad3ee41ad2c62d8779eb8a7a0b3a8afb6645" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/f/e/fef8f2c22f47dd30d58ab667a0d7228194d7051f" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/b/6/b65a3167abb9f406cb51bd23d7afef4245bbcbb5" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AccountDialogTitleBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AccountDialogTitleBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AddAccountTextBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AddAccountTextBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DatetimePickerBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DatetimePickerBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogAddSecretBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogAddSecretBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogEditTextBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogEditTextBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogInputPasswdBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/DialogInputPasswdBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/FolderListItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/FolderListItemBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditListItemBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteItemBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteItemBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListDropdownMenuBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListFooterBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteListFooterBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/SettingsHeaderBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget2xBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget2xBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget4xBinding.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/Widget4xBinding.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/generated/source/buildConfig/debug/net/micode/notes/BuildConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/app_metadata/debug/app-metadata.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/app_metadata/debug/app-metadata.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/data_binding_base_class_log_artifact/debug/out/net.micode.notes-binding_classes.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_number_of_buckets_file/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_number_of_buckets_file/debug/out" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/dataBindingGenBaseClassesDebug/base_builder_log.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1_W15q7LeuWkNGTYPuth9dRTgeI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3mkuZFl0xfTQaqF8UhzkJthSBPQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3yuxLDmxFdVtaXROb6R1dLvsoDw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/6TIfGNH1KPBsEbPbyP81l3mpNXI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9ccf831OBotyj0pIkpV9zFty1ec=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9sjo_tbZmPFzeOCOMDzirmMDyYw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CE1WuYdw3lB4rIwtnna6iDpswi4=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DSC95mXyQ37bUs3AOctxRjluLT4=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GT1hsmEANwrCq7sQ5nuy9WMgAfM=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L1Z8LD2CXmyMLVBGQWHjUxeWvBI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/S00XUbzW_7z7mNTePBtrdvGIDW8=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SwXj+1+2q3G4OpwTBKUcqrzEzas=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UlGo9s1RQR+XiXq4PEgsiM5H58g=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UuRc09vK1JiV+lfTSi45YsFicFs=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WJ3Xci8v7MzZNPrnHsvJ9Nap+PY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XMpIGV0NlmQ5P+zejRbXKRU9oOI=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/XjMXkratVhre7m6qO6JaLEo_dxA=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_deTPkWANkUHb8vgXxkq56Kiyas=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dI+OlassKbBCJ+UNLcU5wPRDCis=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f3tGX7tl2UXTrGDyrXmR_LBrRlw=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fQgF1OYkCoSe9JLQ_4gnykSwaak=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/faGw4VI3Xaerit9mSWcMyw8wmlg=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/fsoIgGdxI41ux4ST6G5stapr5Po=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gtC1u8wslap_73arZOPY7fT_gAo=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iepOrlkSd9uYzTz3DqQhDT26HG4=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ktSEYahBM8WSsQHNOa49EYXB4t4=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/maXRyFfuaSiVWhgV9Gt12AIBwEQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ncbvxLOLgvkQ998BwH8zL4SHySo=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pqfTNCxc4EuqkeHe6s14d_T_tBY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q7qSLdWOjEsEzvrdwsNcFG8IJX0=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tJTnU9hSkZzShOpGq5ac_yD85IQ=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tlOQ4AWBT9N_OakX+0GHFLOrbJU=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zo5qwgKQ64nEwlD+Ps2ZZmTFduY=" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugAssets/merger.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values/values.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugResources/merger.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_java_res/debug/base.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_java_res/debug/base.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_manifests/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_p1.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_add_secret.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_dialog_input_passwd.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/menu_trash_folder.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw_introduction.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/raw_introduction.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-af_values-af.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-am_values-am.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ar_values-ar.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-as_values-as.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-az_values-az.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-be_values-be.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bg_values-bg.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bn_values-bn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-bs_values-bs.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ca_values-ca.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-cs_values-cs.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-da_values-da.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-de_values-de.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-el_values-el.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rAU_values-en-rAU.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rCA_values-en-rCA.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rGB_values-en-rGB.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rIN_values-en-rIN.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-en-rXC_values-en-rXC.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es-rUS_values-es-rUS.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-es_values-es.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-et_values-et.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-eu_values-eu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fa_values-fa.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fi_values-fi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr-rCA_values-fr-rCA.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-fr_values-fr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gl_values-gl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-gu_values-gu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hi_values-hi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hr_values-hr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hu_values-hu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-hy_values-hy.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-in_values-in.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-is_values-is.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-it_values-it.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-iw_values-iw.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ja_values-ja.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ka_values-ka.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kk_values-kk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-km_values-km.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-kn_values-kn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ko_values-ko.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ky_values-ky.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-land_values-land.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-large-v4_values-large-v4.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lo_values-lo.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lt_values-lt.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-lv_values-lv.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mk_values-mk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ml_values-ml.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mn_values-mn.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-mr_values-mr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ms_values-ms.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-my_values-my.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nb_values-nb.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ne_values-ne.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-night-v8_values-night-v8.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-nl_values-nl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-or_values-or.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pa_values-pa.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pl_values-pl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-port_values-port.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rBR_values-pt-rBR.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt-rPT_values-pt-rPT.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-pt_values-pt.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ro_values-ro.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ru_values-ru.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-si_values-si.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sk_values-sk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sl_values-sl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sq_values-sq.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sr_values-sr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sv_values-sv.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-sw_values-sw.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ta_values-ta.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-te_values-te.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-th_values-th.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tl_values-tl.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-tr_values-tr.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uk_values-uk.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-ur_values-ur.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-uz_values-uz.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v16_values-v16.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v17_values-v17.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v18_values-v18.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v21_values-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v22_values-v22.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v23_values-v23.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v24_values-v24.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v25_values-v25.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v26_values-v26.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-v28_values-v28.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-vi_values-vi.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v20_values-watch-v20.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-watch-v21_values-watch-v21.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rHK_values-zh-rHK.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values-zu_values-zu.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values_values.arsc.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/values_values.arsc.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-h720dp-v13.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hdpi-v4.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-land.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-large-v4.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ldltr-v21.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-night-v8.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-port.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw600dp-v13.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v17.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v18.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v22.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v23.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v24.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v25.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v26.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v28.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v20.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-watch-v21.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-xlarge-v4.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/layout.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_manifests/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/284a207e137659867dff3490669f92327cb21a8636308e21277be1e406bc7732_0.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/284a207e137659867dff3490669f92327cb21a8636308e21277be1e406bc7732_1.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/284a207e137659867dff3490669f92327cb21a8636308e21277be1e406bc7732_2.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/284a207e137659867dff3490669f92327cb21a8636308e21277be1e406bc7732_3.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_0.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_1.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_2.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_3.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_4.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e7fe7fba8592629dfe423c88d33d1167a220226eeec93e2e06e96b0d7fd2cbb2_5.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteItemData.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteItemData.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListActivity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/ui/NotesListItem.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/menu/trash_folder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/menu/trash_folder.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-zh-rCN/strings.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -604,10 +153,15 @@
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="E:\git\xcr_weihu\src\Notes-master1\app\src\main\res\drawable-hdpi" />
+      <recent name="E:\git\xcr_weihu\src\Notes-master1\app" />
+      <recent name="E:\git\xcr_weihu\src\Notes-master1\app\src\main" />
     </key>
     <key name="android.template.2039368219">
       <recent name="net.micode.notes.ui" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="net.micode.notes.ui" />
+    </key>
   </component>
   <component name="RunManager">
     <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">

src/Notes-master1/app/build.gradle

@@ -17,6 +17,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
     useLibrary 'org.apache.http.legacy'
     buildFeatures {
         viewBinding true
@@ -26,6 +31,7 @@ android {
 dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation files('libs\\Msc.jar')
 }
 sonarqube {
     properties {

src/Notes-master1/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/NoteEditBinding.java

@@ -22,6 +22,9 @@ public final class NoteEditBinding implements ViewBinding {
   @NonNull
   private final FrameLayout rootView;
 
+  @NonNull
+  public final ImageView btnRadio;
+
   @NonNull
   public final ImageView btnSetBgColor;
 
@@ -112,9 +115,10 @@ public final class NoteEditBinding implements ViewBinding {
   @NonNull
   public final TextView tvModifiedDate;
 
-  private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnSetBgColor,
-      @NonNull LinearLayout fontSizeSelector, @NonNull ImageView ivAlertIcon,
-      @NonNull ImageView ivBgBlue, @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen,
+  private NoteEditBinding(@NonNull FrameLayout rootView, @NonNull ImageView btnRadio,
+      @NonNull ImageView btnSetBgColor, @NonNull LinearLayout fontSizeSelector,
+      @NonNull ImageView ivAlertIcon, @NonNull ImageView ivBgBlue,
+      @NonNull ImageView ivBgBlueSelect, @NonNull ImageView ivBgGreen,
       @NonNull ImageView ivBgGreenSelect, @NonNull ImageView ivBgRed,
       @NonNull ImageView ivBgRedSelect, @NonNull ImageView ivBgWhite,
       @NonNull ImageView ivBgWhiteSelect, @NonNull ImageView ivBgYellow,
@@ -128,6 +132,7 @@ public final class NoteEditBinding implements ViewBinding {
       @NonNull LinearLayout svNoteEdit, @NonNull TextView textNum, @NonNull TextView tvAlertDate,
       @NonNull TextView tvModifiedDate) {
     this.rootView = rootView;
+    this.btnRadio = btnRadio;
     this.btnSetBgColor = btnSetBgColor;
     this.fontSizeSelector = fontSizeSelector;
     this.ivAlertIcon = ivAlertIcon;
@@ -187,6 +192,12 @@ public final class NoteEditBinding implements ViewBinding {
     // This is done to optimize the compiled bytecode for size and performance.
     int id;
     missingId: {
+      id = R.id.btn_radio;
+      ImageView btnRadio = ViewBindings.findChildViewById(rootView, id);
+      if (btnRadio == null) {
+        break missingId;
+      }
+
       id = R.id.btn_set_bg_color;
       ImageView btnSetBgColor = ViewBindings.findChildViewById(rootView, id);
       if (btnSetBgColor == null) {
@@ -367,7 +378,7 @@ public final class NoteEditBinding implements ViewBinding {
         break missingId;
       }
 
-      return new NoteEditBinding((FrameLayout) rootView, btnSetBgColor, fontSizeSelector,
+      return new NoteEditBinding((FrameLayout) rootView, btnRadio, btnSetBgColor, fontSizeSelector,
           ivAlertIcon, ivBgBlue, ivBgBlueSelect, ivBgGreen, ivBgGreenSelect, ivBgRed, ivBgRedSelect,
           ivBgWhite, ivBgWhiteSelect, ivBgYellow, ivBgYellowSelect, ivLargeSelect, ivLock,
           ivMediumSelect, ivSmallSelect, ivSuperSelect, llFontLarge, llFontNormal, llFontSmall,

src/Notes-master1/app/build/intermediates/data_binding_layout_info_type_merge/debug/out/note_edit-layout.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="413" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="77" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="42" startOffset="12" endLine="47" endOffset="60"/></Target><Target id="@+id/iv_lock" view="ImageView"><Expressions/><location startLine="49" startOffset="12" endLine="54" endOffset="53"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="55" startOffset="12" endLine="61" endOffset="17"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="63" startOffset="12" endLine="70" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="79" startOffset="8" endLine="129" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="103" startOffset="20" endLine="113" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="115" startOffset="20" endLine="121" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="132" startOffset="4" endLine="137" endOffset="44"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="139" startOffset="4" endLine="251" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="154" startOffset="12" endLine="157" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="159" startOffset="12" endLine="167" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="175" startOffset="12" endLine="178" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="180" startOffset="12" endLine="188" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="196" startOffset="12" endLine="199" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="201" startOffset="12" endLine="209" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="217" startOffset="12" endLine="220" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="222" startOffset="12" endLine="229" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="237" startOffset="12" endLine="240" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="242" startOffset="12" endLine="249" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="253" startOffset="4" endLine="412" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="261" startOffset="8" endLine="297" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="287" startOffset="12" endLine="296" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="299" startOffset="8" endLine="335" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="325" startOffset="12" endLine="334" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="337" startOffset="8" endLine="373" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="363" startOffset="12" endLine="372" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="375" startOffset="8" endLine="411" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="401" startOffset="12" endLine="410" endOffset="50"/></Target></Targets></Layout>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><Layout layout="note_edit" modulePackage="net.micode.notes" filePath="app\src\main\res\layout\note_edit.xml" directory="layout" isMerge="false" isBindingData="false" rootNodeType="android.widget.FrameLayout"><Targets><Target tag="layout/note_edit_0" view="FrameLayout"><Expressions/><location startLine="17" startOffset="0" endLine="420" endOffset="13"/></Target><Target id="@+id/note_title" view="LinearLayout"><Expressions/><location startLine="28" startOffset="8" endLine="77" endOffset="22"/></Target><Target id="@+id/tv_modified_date" view="TextView"><Expressions/><location startLine="33" startOffset="12" endLine="40" endOffset="77"/></Target><Target id="@+id/iv_alert_icon" view="ImageView"><Expressions/><location startLine="42" startOffset="12" endLine="47" endOffset="60"/></Target><Target id="@+id/iv_lock" view="ImageView"><Expressions/><location startLine="49" startOffset="12" endLine="54" endOffset="53"/></Target><Target id="@+id/text_num" view="TextView"><Expressions/><location startLine="55" startOffset="12" endLine="61" endOffset="17"/></Target><Target id="@+id/tv_alert_date" view="TextView"><Expressions/><location startLine="63" startOffset="12" endLine="70" endOffset="77"/></Target><Target id="@+id/sv_note_edit" view="LinearLayout"><Expressions/><location startLine="79" startOffset="8" endLine="129" endOffset="22"/></Target><Target id="@+id/note_edit_view" view="net.micode.notes.ui.NoteEditText"><Expressions/><location startLine="103" startOffset="20" endLine="113" endOffset="61"/></Target><Target id="@+id/note_edit_list" view="LinearLayout"><Expressions/><location startLine="115" startOffset="20" endLine="121" endOffset="51"/></Target><Target id="@+id/btn_set_bg_color" view="ImageView"><Expressions/><location startLine="132" startOffset="4" endLine="137" endOffset="44"/></Target><Target id="@+id/btn_radio" view="ImageView"><Expressions/><location startLine="139" startOffset="4" endLine="144" endOffset="46"/></Target><Target id="@+id/note_bg_color_selector" view="LinearLayout"><Expressions/><location startLine="146" startOffset="4" endLine="258" endOffset="18"/></Target><Target id="@+id/iv_bg_yellow" view="ImageView"><Expressions/><location startLine="161" startOffset="12" endLine="164" endOffset="54"/></Target><Target id="@+id/iv_bg_yellow_select" view="ImageView"><Expressions/><location startLine="166" startOffset="12" endLine="174" endOffset="50"/></Target><Target id="@+id/iv_bg_blue" view="ImageView"><Expressions/><location startLine="182" startOffset="12" endLine="185" endOffset="54"/></Target><Target id="@+id/iv_bg_blue_select" view="ImageView"><Expressions/><location startLine="187" startOffset="12" endLine="195" endOffset="50"/></Target><Target id="@+id/iv_bg_white" view="ImageView"><Expressions/><location startLine="203" startOffset="12" endLine="206" endOffset="54"/></Target><Target id="@+id/iv_bg_white_select" view="ImageView"><Expressions/><location startLine="208" startOffset="12" endLine="216" endOffset="50"/></Target><Target id="@+id/iv_bg_green" view="ImageView"><Expressions/><location startLine="224" startOffset="12" endLine="227" endOffset="54"/></Target><Target id="@+id/iv_bg_green_select" view="ImageView"><Expressions/><location startLine="229" startOffset="12" endLine="236" endOffset="50"/></Target><Target id="@+id/iv_bg_red" view="ImageView"><Expressions/><location startLine="244" startOffset="12" endLine="247" endOffset="54"/></Target><Target id="@+id/iv_bg_red_select" view="ImageView"><Expressions/><location startLine="249" startOffset="12" endLine="256" endOffset="50"/></Target><Target id="@+id/font_size_selector" view="LinearLayout"><Expressions/><location startLine="260" startOffset="4" endLine="419" endOffset="18"/></Target><Target id="@+id/ll_font_small" view="FrameLayout"><Expressions/><location startLine="268" startOffset="8" endLine="304" endOffset="21"/></Target><Target id="@+id/iv_small_select" view="ImageView"><Expressions/><location startLine="294" startOffset="12" endLine="303" endOffset="50"/></Target><Target id="@+id/ll_font_normal" view="FrameLayout"><Expressions/><location startLine="306" startOffset="8" endLine="342" endOffset="21"/></Target><Target id="@+id/iv_medium_select" view="ImageView"><Expressions/><location startLine="332" startOffset="12" endLine="341" endOffset="50"/></Target><Target id="@+id/ll_font_large" view="FrameLayout"><Expressions/><location startLine="344" startOffset="8" endLine="380" endOffset="21"/></Target><Target id="@+id/iv_large_select" view="ImageView"><Expressions/><location startLine="370" startOffset="12" endLine="379" endOffset="50"/></Target><Target id="@+id/ll_font_super" view="FrameLayout"><Expressions/><location startLine="382" startOffset="8" endLine="418" endOffset="21"/></Target><Target id="@+id/iv_super_select" view="ImageView"><Expressions/><location startLine="408" startOffset="12" endLine="417" endOffset="50"/></Target></Targets></Layout>

src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets"/><source path="E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets"><file name="iflytek/recognize.xml" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\recognize.xml"/><file name="iflytek/voice_bg.9.png" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\voice_bg.9.png"/><file name="iflytek/voice_empty.png" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\voice_empty.png"/><file name="iflytek/voice_full.png" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\voice_full.png"/><file name="iflytek/waiting.png" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\waiting.png"/><file name="iflytek/warning.png" path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\assets\iflytek\warning.png"/></source><source path="E:\git\xcr_weihu\src\Notes-master1\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\debug\assets"/></dataSet></merger>

src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\libs"><file name="arm64-v8a/libmsc.so" path="E:\git\xcr_weihu\src\Notes-master1\app\libs\arm64-v8a\libmsc.so"/><file name="armeabi-v7a/libmsc.so" path="E:\git\xcr_weihu\src\Notes-master1\app\libs\armeabi-v7a\libmsc.so"/><file name="Msc.jar" path="E:\git\xcr_weihu\src\Notes-master1\app\libs\Msc.jar"/></source></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\git\xcr_weihu\src\Notes-master1\app\src\debug\jniLibs"/></dataSet></merger>

src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,6 +1,7 @@
-#Tue Nov 09 08:54:37 CST 2021
+#Tue Nov 09 20:01:01 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\\radio.png=E\:\\git\\xcr_weihu\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_radio.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

src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string msgid="4600421777120114993" name="abc_action_bar_home_description">"转到主屏幕"</string>
+    <string msgid="1594238315039666878" name="abc_action_bar_up_description">"转到上一层级"</string>
+    <string msgid="3588849162933574182" name="abc_action_menu_overflow_description">"更多选项"</string>
+    <string msgid="4076576682505996667" name="abc_action_mode_done">"完成"</string>
+    <string msgid="7468859129482906941" name="abc_activity_chooser_view_see_all">"查看全部"</string>
+    <string msgid="2031811694353399454" name="abc_activitychooserview_choose_application">"选择应用"</string>
+    <string msgid="121134116657445385" name="abc_capital_off">"关闭"</string>
+    <string msgid="3405795526292276155" name="abc_capital_on">"开启"</string>
+    <string msgid="1302280443949172191" name="abc_menu_alt_shortcut_label">"Alt+"</string>
+    <string msgid="1324831542140195728" name="abc_menu_ctrl_shortcut_label">"Ctrl+"</string>
+    <string msgid="8362206064229013510" name="abc_menu_delete_shortcut_label">"Delete 键"</string>
+    <string msgid="8341180395196749340" name="abc_menu_enter_shortcut_label">"Enter 键"</string>
+    <string msgid="4792426091847145555" name="abc_menu_function_shortcut_label">"Fn+"</string>
+    <string msgid="7643535737296831317" name="abc_menu_meta_shortcut_label">"Meta+"</string>
+    <string msgid="8126296154200614004" name="abc_menu_shift_shortcut_label">"Shift+"</string>
+    <string msgid="2378550843553983978" name="abc_menu_space_shortcut_label">"空格键"</string>
+    <string msgid="9002602288060866689" name="abc_menu_sym_shortcut_label">"Sym+"</string>
+    <string msgid="1351762916121158029" name="abc_prepend_shortcut_label">"Menu+"</string>
+    <string msgid="7723749260725869598" name="abc_search_hint">"搜索…"</string>
+    <string msgid="3691816814315814921" name="abc_searchview_description_clear">"清除查询"</string>
+    <string msgid="2550479030709304392" name="abc_searchview_description_query">"搜索查询"</string>
+    <string msgid="8264924765203268293" name="abc_searchview_description_search">"搜索"</string>
+    <string msgid="8928215447528550784" name="abc_searchview_description_submit">"提交查询"</string>
+    <string msgid="893419373245838918" name="abc_searchview_description_voice">"语音搜索"</string>
+    <string msgid="3421042268587513524" name="abc_shareactionprovider_share_with">"分享方式"</string>
+    <string msgid="3300176832234831527" name="abc_shareactionprovider_share_with_application">"使用<ns1:g id="APPLICATION_NAME">%s</ns1:g>分享"</string>
+    <string msgid="1603543279005712093" name="abc_toolbar_collapse_description">"收起"</string>
+    <string name="add_describe">输入描述语</string>
+    <string name="add_password">输入密码</string>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_message_delete_secret">确认删除该便签的密码吗？</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="day_time">日间模式</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="input_passwd">输入密码</string>
+    <string name="menu_add_secret">添加密码</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_change_view">改变视图</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_init_order">初始排序</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_remove_secret">删除密码</string>
+    <string name="menu_restore">最近删除</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_time_order">按时间排序</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="night_time">夜间模式</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_length">字数</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string msgid="146198913615257606" name="search_menu_title">"搜索"</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string msgid="7988687684186075107" name="status_bar_notification_info_overflow">"999+"</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>

src/Notes-master1/app/build/intermediates/incremental/mergeDebugResources/stripped.dir/layout/dialog_delete_senote.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<EditText
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/et_delete_senote"
-    android:layout_width="fill_parent"
-    android:hint="@string/add_password"
-    android:layout_height="fill_parent" />

src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Tue Nov 09 09:13:48 CST 2021
+#Tue Nov 09 20:11:39 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

src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -5,234 +5,261 @@
 5    android:versionName="0.1" >
 6
 7    <uses-sdk
-7-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44
+7-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
 8        android:minSdkVersion="16"
-8-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:15-41
+8-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:15-41
 9        android:targetSdkVersion="23" />
-9-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:7:5-44
+9-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:8:5-44
 10
 11    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-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
+11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
+11-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
 12    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-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
+12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:5-88
+12-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:11:22-85
 13    <uses-permission android:name="android.permission.INTERNET" />
-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
+13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
+13-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
 14    <uses-permission android:name="android.permission.READ_CONTACTS" />
-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
+14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:5-72
+14-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:13:22-69
 15    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-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
+15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:5-74
+15-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:14:22-71
 16    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-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
+16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:5-80
+16-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:15:22-77
 17    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-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
+17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:5-71
+17-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:16:22-68
 18    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-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
+18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:5-74
+18-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:17:22-71
 19    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-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    <application
-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\小超人\.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-->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        <activity
-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            <intent-filter>
-35-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-34:29
-36                <action android:name="android.intent.action.MAIN" />
-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                <category android:name="android.intent.category.LAUNCHER" />
-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            </intent-filter>
-40        </activity>
-41        <activity
-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            <intent-filter>
-46-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-48:29
-47                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-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                <category android:name="android.intent.category.DEFAULT" />
-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                <data android:mimeType="vnd.android.cursor.item/text_note" />
-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                <data android:mimeType="vnd.android.cursor.item/call_note" />
-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            </intent-filter>
-54            <intent-filter>
-54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:49:13-53:29
-55                <action android:name="android.intent.action.SEARCH" />
-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                <category android:name="android.intent.category.DEFAULT" />
-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            </intent-filter>
+19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:5-81
+19-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:18:22-78
+20    <uses-permission android:name="android.permission.INTERNET" />
+20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:5-67
+20-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:12:22-64
+21    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:120:5-71
+21-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:120:22-68
+22    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:121:5-79
+22-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:121:22-76
+23    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:5-76
+23-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:122:22-73
+24    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:5-79
+24-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:123:22-76
+25    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:5-75
+25-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:124:22-72
+26    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:126:5-127:47
+26-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:126:22-70
+27    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:5-81
+27-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:10:22-78
+28    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:5-80
+28-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:129:22-77
+29
+30    <application
+30-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-118:19
+31        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
+31-->[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
+32        android:debuggable="true"
+33        android:icon="@drawable/icon_app"
+33-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:21:9-42
+34        android:label="@string/app_name"
+34-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:22:9-41
+35        android:testOnly="true" >
+36        <activity
+36-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:24:9-36:20
+37            android:name="net.micode.notes.ui.NotesListActivity"
+37-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:25:13-49
+38            android:configChanges="keyboardHidden|orientation|screenSize"
+38-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:26:13-74
+39            android:label="@string/app_name"
+39-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:27:13-45
+40            android:launchMode="singleTop"
+40-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:28:13-43
+41            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+41-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:29:13-71
+42            android:uiOptions="splitActionBarWhenNarrow"
+42-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:30:13-57
+43            android:windowSoftInputMode="adjustPan" >
+43-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:31:13-52
+44            <intent-filter>
+44-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:32:13-35:29
+45                <action android:name="android.intent.action.MAIN" />
+45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:17-69
+45-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:33:25-66
+46
+47                <category android:name="android.intent.category.LAUNCHER" />
+47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:17-77
+47-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:34:27-74
+48            </intent-filter>
+49        </activity>
+50        <activity
+50-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-59:20
+51            android:name="net.micode.notes.ui.NoteEditActivity"
+51-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:38:13-48
+52            android:configChanges="keyboardHidden|orientation|screenSize"
+52-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-74
+53            android:launchMode="singleTop"
+53-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-43
+54            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
+54-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-71
+55            <intent-filter>
+55-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-49:29
+56                <action android:name="android.intent.action.INSERT_OR_EDIT" />
+56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:17-79
+56-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:43:25-76
+57
+58                <category android:name="android.intent.category.DEFAULT" />
+58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:17-76
+58-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:27-73
 59
-60            <meta-data
-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        </activity>
-64        <activity
-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        <activity
-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        <meta-data
-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        <provider
-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
+60                <data android:mimeType="vnd.android.cursor.item/text_note" />
+60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-78
+60-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:23-75
+61                <data android:mimeType="vnd.android.cursor.item/call_note" />
+61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:17-78
+61-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:47:23-75
+62            </intent-filter>
+63            <intent-filter>
+63-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:50:13-54:29
+64                <action android:name="android.intent.action.SEARCH" />
+64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:51:17-71
+64-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:51:25-68
+65
+66                <category android:name="android.intent.category.DEFAULT" />
+66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:17-76
+66-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:45:27-73
+67            </intent-filter>
+68
+69            <meta-data
+69-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-58:54
+70                android:name="android.app.searchable"
+70-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:57:17-54
+71                android:resource="@xml/searchable" />
+71-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:58:17-51
+72        </activity>
+73        <activity
+73-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:60:9-64:78
+74            android:name="net.micode.notes.ui.AlarmAlertActivity"
+74-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:61:13-50
+75            android:label="@string/app_name"
+75-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:62:13-45
+76            android:launchMode="singleInstance"
+76-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:63:13-48
+77            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" />
+77-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:64:13-75
+78        <activity
+78-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:65:9-69:63
+79            android:name="net.micode.notes.ui.NotesPreferenceActivity"
+79-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-55
+80            android:label="@string/preferences_title"
+80-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-54
+81            android:launchMode="singleTop"
+81-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:68:13-43
+82            android:theme="@android:style/Theme.Holo.Light" />
+82-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:69:13-60
 83
-84        <receiver
-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            <intent-filter>
-87-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29
-88                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-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                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-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                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-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            </intent-filter>
+84        <meta-data
+84-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:71:9-73:52
+85            android:name="android.app.default_searchable"
+85-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:72:13-58
+86            android:value=".ui.NoteEditActivity" />
+86-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-49
+87
+88        <provider
+88-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:75:9-78:43
+89            android:name="net.micode.notes.data.NotesProvider"
+89-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:76:13-47
+90            android:authorities="micode_notes"
+90-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:77:13-47
+91            android:multiprocess="true" />
+91-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-40
 92
-93            <meta-data
-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        </receiver>
-97        <receiver
-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            <intent-filter>
-100-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-86:29
-101                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-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                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-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                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-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            </intent-filter>
-105
-106            <meta-data
-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        </receiver>
-110        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-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            <intent-filter>
-111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:13-108:29
-112                <action android:name="android.intent.action.BOOT_COMPLETED" />
-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
+93        <receiver
+93-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:80:9-92:20
+94            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+94-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:81:13-57
+95            android:label="@string/app_widget2x2" >
+95-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:82:13-50
+96            <intent-filter>
+96-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-87:29
+97                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-84
+97-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-81
+98                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85
+98-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82
+99                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
+99-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
+100            </intent-filter>
+101
+102            <meta-data
+102-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-91:58
+103                android:name="android.appwidget.provider"
+103-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-58
+104                android:resource="@xml/widget_2x_info" />
+104-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-55
+105        </receiver>
+106        <receiver
+106-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:93:9-105:20
+107            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+107-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:94:13-57
+108            android:label="@string/app_widget4x4" >
+108-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:95:13-50
+109            <intent-filter>
+109-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:83:13-87:29
+110                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:17-84
+110-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:84:25-81
+111                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
+111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:17-85
+111-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:85:25-82
+112                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
+112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:17-85
+112-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:86:25-82
 113            </intent-filter>
-114        </receiver>
-115        <receiver
-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        <service
-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    </application>
-123
-124</manifest>
+114
+115            <meta-data
+115-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-91:58
+116                android:name="android.appwidget.provider"
+116-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:90:17-58
+117                android:resource="@xml/widget_4x_info" />
+117-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:91:17-55
+118        </receiver>
+119        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
+119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:9-110:20
+119-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:106:19-55
+120            <intent-filter>
+120-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:107:13-109:29
+121                <action android:name="android.intent.action.BOOT_COMPLETED" />
+121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:108:17-79
+121-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:108:25-76
+122            </intent-filter>
+123        </receiver>
+124        <receiver
+124-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:111:9-113:41
+125            android:name="net.micode.notes.ui.AlarmReceiver"
+125-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:112:13-45
+126            android:process=":remote" />
+126-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:113:13-38
+127
+128        <service
+128-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:115:9-117:40
+129            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+129-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:116:13-58
+130            android:exported="false" />
+130-->E:\git\xcr_weihu\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-37
+131    </application>
+132
+133</manifest>

src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml

@@ -17,6 +17,15 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:appComponentFactory="android.support.v4.app.CoreComponentFactory"