From be3875757641682f93165d1dab052c4f94265e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E6=85=A7=E9=9C=96?= <1806370119@qq.com> Date: Wed, 3 Jan 2024 22:00:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.gradle/8.0/checksums/checksums.lock | Bin 17 -> 17 bytes .../.gradle/8.0/checksums/md5-checksums.bin | Bin 28097 -> 28397 bytes .../.gradle/8.0/checksums/sha1-checksums.bin | Bin 91121 -> 91931 bytes .../8.0/executionHistory/executionHistory.bin | Bin 288891 -> 289759 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.0/fileHashes/fileHashes.bin | Bin 126383 -> 155533 bytes .../.gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 24671 -> 27551 bytes src/Notes-master1/.gradle/file-system.probe | Bin 8 -> 8 bytes .../intermediates/apk/debug/app-debug.apk | Bin 1133839 -> 1042371 bytes .../dex_archive_input_jar_hashes/debug/out | Bin 385 -> 393 bytes .../compile-file-map.properties | 192 ++++++------- .../debug/mergeDebugResources/merger.xml | 16 +- .../compile-file-map.properties | 192 ++++++------- .../debug/packageDebugResources/merger.xml | 16 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 4 +- .../manifest-merger-blame-debug-report.txt | 244 ++++++++--------- .../debug/out/multi-v2/debug.json | 122 ++++----- .../debug/out/multi-v2/values-zh-rCN.json | 40 +-- .../debug/out/multi-v2/values-zh-rTW.json | 4 +- .../debug/out/multi-v2/values.json | 78 +++--- .../source_set_path_map/debug/file-map.txt | 14 +- .../logs/manifest-merger-debug-report.txt | 254 +++++++++--------- .../previous-compilation-data.bin | Bin 11873 -> 11881 bytes .../app/src/main/res/menu/note_list.xml | 16 ++ .../app/src/main/res/values/strings.xml | 7 + src/Notes-master1/local.properties | 7 +- 31 files changed, 618 insertions(+), 594 deletions(-) diff --git a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock index 67e78237a5c4ff0edfa16c6409e6f7f731ea4ee9..ed31e81a80e32bca0aba36cfd751f083fb2936c2 100644 GIT binary patch literal 17 VcmZQxsPjDR&y%M-3}C==5CA=^1*8A~ literal 17 VcmZQxsPjDR&y%M-3}C>r3;;cl1&IIv diff --git a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin index 43b24d6e09913ae19806725c0d4a40ef36f348cb..c3036500cdedce17e9faae3a84b69494b313161c 100644 GIT binary patch delta 225 zcmX?joAK>k#tkMCjK?;cN*FTpvn{{AYSW(u3}BG^d2+0@g1~yQ`#-nE^WKFD9^70i z{eel~c7|r~$;M1Bh-hBt=2$roRsr>k{tT(%&!#~|cW<7nypfqd<<XD56P13Px^XF?q1;aN_)mY8QxNxK55Alr#6|9>bJsMOePt8$cIcIxPb@J{UJs{)m ojLC1oj0c93<#RzI&tFas1T&tjn%tbLCveX85!4zHZJ^0|0JMQiy8r+H delta 60 zcmV-C0K@<7-2uVd0kAX}0l>307%>Brej69FtsCe9v#lOL1+xVtsROgdCr|;iE-9h` S0THnw_!qG-2nMr3NPs2C3KgyZ diff --git a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin index 3bdf9ac9874e396d15aad8eb91ea2d3da3c8c7c0..b92ca12733f5b0182bb222769ee796b6a7e38ed0 100644 GIT binary patch delta 583 zcmex(oOSj&)(s{SjK?>dN+h!J>q)d_PdHG|00NAu*_(UiCUWqzEx*2M)1L(p!Ia69 zMb$I;#qR&y7SDSZDyF`pvkn#E0qTdj~)P<8{ z4I25a&twJtDO>~*OMANcs(~ace}-o8$;M1Bs37m=r>34v{P!Hq7N2*#4G~O<-K=UM z!6fiZFJDsFVZ(f=nWmdft!}Y1Y3-ce$if)1+15FHA>)C~Q=bSj@#h|7*?#&`1yuXV z&2yg}!CUns&D z;6MFu0;3wsIop$}(?2FK8o^mo)5{YXC3w!+-kkx~%)qvFvf^~%=@p5L;y^`rXH1`* z2v+{UaQgp5Mycs*fy#jr5UvqW<0FUz8AP-v3$7KO9*_jq_+-^|-ejQi-AQ2O&tFbo zm;^Ql!jhWq50QYV1DW$y9^!zrIbd_*lELPD;+bBV4AOW~dD8UtK$gI{lNzcJl}p)x Gv=IQA=)E`q delta 133 zcmV;00DAwM&IR$u1+X+20lu>}7-0spt{#X8lTIgKv&JXT1+%U#7z2~uFnF_WF%Si_ zmNq~Fv+g(#0<#r6(gy}9;Q#`dy0r&y8HUa@)1GlaP0r3a|DS@#ekOsG*6ai3A#O^cK diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin index b96acb1491fafe12f5017620bc8f56ba9f85b43d..f930af3277f593d721668382489b7408c1c3197c 100644 GIT binary patch delta 37954 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 Qz3LLe?5jutf|&Hb0O;}fF#rGn delta 24912 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 bUJD0eam|^NM;hl1c!fhl-s?B~)a3sGDunAP diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock index 86773c04f03fa38f25d8f1885851f51e43a6bb3e..1e56f5ed75d4d0bd500975e6662d5964868c08ad 100644 GIT binary patch literal 17 VcmZQ(V9j`_>t#5B0Sp)?0{|X{10DbX literal 17 UcmZQ(V9j`_>t#5B0Sp-R03IL$xc~qF diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin index 75feee86958d9960e81cec1d1b515fe3fb22eaf6..556d3d0c0a24e518a686f78c3434f53e2e3db3bc 100644 GIT binary patch delta 20155 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
    @!IU}+(# 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 literal 17 UcmZQhDBrlssF|sQ0Sq_=0W5_Bj{pDw diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 57b9b1c912ef79467d5b2c04031196e569f0f620..114643c9dda7287bb885f0a1a59400cc198a332f 100644 GIT binary patch literal 17 VcmZR6`6f=9&+CT|0~j!K0{}B_1N;C0 literal 17 VcmZR6`6f=9&+CT|0~jz_001+Y1SkLi diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index e49aa914d4d561b09572ba260368f70df9c16e5a..bdd53a67406da34cdf3fa1aeadd477e9c0bfb2b5 100644 GIT binary patch delta 3542 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 delta 497 zcmWNLJy4Qy0Edt6>{_rX-~Ve!d+vL`*VfXBF<}sOh zEUI3Uu2*fmV|vRvx67*g#@zWjocMJ{evOIW;_&$a^8t(9fZ#(w<4*a>icWduf~BCv zX;APtsN)ZH_z@EP3t7~{2Hmh=5^m6p81y10zNln3dP&qUXc;=^hTz7qNST7BS>d;- zGcQfHr1~Gzsl^2EVio4%uV}_i`tdPu6M|vllD(whJlSR^CF!S3rm1gSy^t)V4XWun z*J+6}GiI6*__G>svXWtTpW3R$XjS9&T7&Ov8or$Rl+!p+zsqImLexu)G=o diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index a7d126bb34244e4aecb753f2206fa75523526b3a..847bbc2345d521a70c63a25bd9cf0adca0206d38 100644 GIT binary patch literal 8 PcmZQzVC*?}X38x93TOkC literal 8 PcmZQzVC*^TQ;`n<2tfjl diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk index 8530d4b00e332f29bf7c9cf7246a111ad7775aa1..c0e0749e77bc21c7b2c4d90cfbe71927f4a13a6b 100644 GIT binary patch delta 2945 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 delta 21 ccmeBVZe*TtfV<4aD#kG{r6@l$W#Z*+08 - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 5558880..a1df93f 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sun Dec 31 17:23:40 CST 2023 -net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/raw/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +#Wed Jan 03 18:09:26 CST 2024 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/raw/introduction=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index fa01dcf..2bfaf41 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index a93361f..36fbf59 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 601109b..a111670 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 133e628..f6381f4 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5235945..7de9eb9 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Jan 03 11:09:55 CST 2024 -base.0=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Wed Jan 03 20:43:21 CST 2024 +base.0=D\:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 440f2f1..3e7b09b 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 74a44ee..ae79481 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } } ] }, @@ -47,7 +47,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -64,43 +64,7 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -119,7 +83,26 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -136,6 +119,23 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } } ] }, @@ -143,7 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -162,7 +162,7 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index c14e1a2..94873d3 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index a0c1836..7c13b74 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index fc95104..4e3acde 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -21,43 +21,7 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -76,7 +40,26 @@ } }, { - "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -93,6 +76,23 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\ruangong\\xiaomi\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt index 3233259..fe5c822 100644 --- a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,7 +1,7 @@ -net.micode.notes.app-pngs-0 D:\Android\MiNote\src\Notes-master1\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Android\MiNote\src\Notes-master1\app\build\generated\res\resValues\debug -net.micode.notes.app-packageDebugResources-2 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -net.micode.notes.app-packageDebugResources-3 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -net.micode.notes.app-merged_res-4 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-5 D:\Android\MiNote\src\Notes-master1\app\src\debug\res -net.micode.notes.app-main-6 D:\Android\MiNote\src\Notes-master1\app\src\main\res +net.micode.notes.app-pngs-0 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\generated\res\resValues\debug +net.micode.notes.app-packageDebugResources-2 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir +net.micode.notes.app-packageDebugResources-3 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir +net.micode.notes.app-merged_res-4 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-5 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\debug\res +net.micode.notes.app-main-6 D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\res diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt index fc46af0..3438f6c 100644 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\ruangong\xiaomi\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index fabff0932ace0c819b376407e228b0f9d249ac35..aa284f05ee099178b5a16be8844f59e2c8f6607d 100644 GIT binary patch delta 114 zcmaDD^D<^bkE+1$+cLb4i|60Sn$$N}y#810<~ge3Y>cLpw`gDFn#;I|=?&w0rrnH_ z`*mvBra_oOx|%FZeN0)C?R2;DgOsdd{L8q7u@0<`NzY$=Jrg6NF9Sn28zWGdfngO3 KBa^lZ0|Njbxh22= delta 106 zcmaDE^Dt&ZkE(!p{jXTZ#q)1uP3oKb`?d`4<~ge3Y>Xz8w`gDFTEsM$@eSi{#`R2- z`*mvBb~8=`F@P5=M^ diff --git a/src/Notes-master1/app/src/main/res/menu/note_list.xml b/src/Notes-master1/app/src/main/res/menu/note_list.xml index 42ea736..4f867df 100644 --- a/src/Notes-master1/app/src/main/res/menu/note_list.xml +++ b/src/Notes-master1/app/src/main/res/menu/note_list.xml @@ -36,4 +36,20 @@ + + + + + + + + diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/Notes-master1/app/src/main/res/values/strings.xml index 55df868..293c571 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/Notes-master1/app/src/main/res/values/strings.xml @@ -38,6 +38,13 @@ /MIUI/notes/ notes_%s.txt + + + Background:Cat + Background:Green lattice + Background:Notes + Background:House + (%d) New Folder diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties index c2545ee..d0fc544 100644 --- a/src/Notes-master1/local.properties +++ b/src/Notes-master1/local.properties @@ -2,6 +2,7 @@ # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Sat Dec 02 10:18:27 CST 2023 -sdk.dir=D\:\\Android\\Sdk +# For customization when using a Version Control System, please read the +# header note. +#Wed Jan 03 18:03:28 CST 2024 +sdk.dir=C\:\\Users\\mhl\\AppData\\Local\\Android\\Sdk