From 466363315f677f2f93800f5e268fa8f39b6acef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E4=BC=9F=E7=A8=8B?= <1724478130@qq.com> Date: Wed, 14 Sep 2022 08:10:18 +0800 Subject: [PATCH] update --- .../executionHistory/executionHistory.bin | Bin 177025 -> 177025 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes src/.gradle/7.3.3/fileHashes/fileHashes.bin | Bin 42547 -> 42547 bytes src/.gradle/7.3.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.3.3/fileHashes/resourceHashesCache.bin | Bin 21421 -> 21455 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes src/.gradle/file-system.probe | Bin 8 -> 8 bytes src/.idea/misc.xml | 7 + .../compile-file-map.properties | 2 +- .../merged.dir/values/values.xml | 4 +- .../debug/mergeDebugResources/merger.xml | 4 +- .../tmp/debug/dex-renamer-state.txt | 2 +- .../tmp/debug/zip-cache/androidResources | Bin 7931 -> 7931 bytes .../manifest-merger-blame-debug-report.txt | 387 +++++++++--------- .../merged_manifest/debug/AndroidManifest.xml | 5 +- .../debug/AndroidManifest.xml | 5 +- .../merged_res/debug/menu_note_list.xml.flat | Bin 1180 -> 1096 bytes .../merged_res/debug/values_values.arsc.flat | Bin 9336 -> 9276 bytes .../debug/out/multi-v2/debug.json | 6 +- .../debug/out/multi-v2/values.json | 6 +- .../debug/AndroidManifest.xml | 5 +- .../debug/out/resources-debug.ap_ | Bin 946355 -> 946351 bytes src/app/build/outputs/apk/debug/app-debug.apk | Bin 1050637 -> 1082362 bytes .../logs/manifest-merger-debug-report.txt | 4 - src/app/src/main/AndroidManifest.xml | 4 +- src/app/src/main/res/menu/note_list.xml | 6 +- src/app/src/main/res/values/styles.xml | 4 +- 27 files changed, 228 insertions(+), 223 deletions(-) diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/.gradle/7.3.3/executionHistory/executionHistory.bin index 58f8cc24de9bf816ff1c91313ce345acfbe4d789..05c221b7e565e2c09c5587d252967f9df4cc0ab6 100644 GIT binary patch delta 4965 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 G%KrmPjmd-n delta 4789 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 K$KQ1Z%l-#9y2dyF diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/.gradle/7.3.3/executionHistory/executionHistory.lock index 46703b6a82ad3d78eccfd02ff0933b7ae47b5ab7..c5dd95f5debb2d17bb91de233cb7f13ac960dd9c 100644 GIT binary patch literal 17 UcmZP;JW|tR&A7XS0Sp*r04W0lX#fBK literal 17 UcmZP;JW|tR&A7XS0Rk2R04at8?EnA( diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/.gradle/7.3.3/fileHashes/fileHashes.bin index 5bd0cc8750f0ea3aecd3b5555156d04e417c07c8..3e465a1521aeeed745155d93347f1ffcde52be9a 100644 GIT binary patch delta 2789 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 AAOHXW diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/.gradle/7.3.3/fileHashes/fileHashes.lock index 5f88173e1bb9611feece6252943ffe346863fee1..25a4f16d7d394cc5affe85d6c6fcbabec579bf5e 100644 GIT binary patch literal 17 VcmZR!=>8tnx-DOh0SwrG001&|1m6Gv literal 17 UcmZR!=>8tnx-DOh0Swp_0Wq8e2LJ#7 diff --git a/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index e5ef31d6c160f4461cf6697abd2830271a766d22..7d00be562af37ae69644630fd1ab1aa7e5586332 100644 GIT binary patch delta 88 zcmZ3xobmi}#tkMCjNzM2C1x-RtbFnFfL%izGXod|uibo9vYU<3a--r8@r?!#_%}Ox k+wo&*{LcqCi1803Z4r^#A|> delta 36 scmX@VoN?`P#tkMCjA5HiC1x;gek$3_#;CYa@rU?EgCG2x9X)cm0Rk!wkpKVy diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5ff7843555609a3a90a30e1e110f5bb7ecccc589..008edb87beb379668ecd584171295e98f35750e4 100644 GIT binary patch literal 17 UcmZP$UstCj6X49j00xZi03dS$r~m)} literal 17 TcmZP$UstCj6X49j00AEXAsYix diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 332ed35ffb725247017e25d47490ed29480fc5a8..0e9003c0101538f040558cd223c37cebf3c30570 100644 GIT binary patch literal 8 PcmZQzU~D$K%JLNe2Jr%k literal 8 PcmZQzU~Cqf=ko>t22%oY diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml index 54d5acd..3c9e27e 100644 --- a/src/.idea/misc.xml +++ b/src/.idea/misc.xml @@ -1,5 +1,12 @@ + + + diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index ded9aee..9326104 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Sep 07 14:23:37 CST 2022 +#Tue Sep 13 20:53:06 CST 2022 net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index e49b0c3..c71fd03 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -132,8 +132,8 @@ @color/secondary_text_dark 短信 邮件 diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 2e065cb..753dc18 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Sep 07 14:23:45 CST 2022 +#Tue Sep 13 20:53:08 CST 2022 base.0=D\:\\xiaomibianqian\\xiaomibianqian\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 4bdd3397adb1cfc10bb01d1af347f7d34ccef0d2..b62adbcf034aee2c9f9788a8f9b0b7b6752f116e 100644 GIT binary patch delta 1027 zcmY+@Ye*DP6bJA*=Q_LF?8E2o>|-=dD1zE*cNkmOb&br7-D+KXQz3n@=cgzvQiuo( zG-^FXk1rXLJ*ZgGUPu=75GsODj6S47L_rUf2r7#juWr)79De_Em^+sl?pSCnWRFDv z1%8#WLyY0 zD25TN3Gi7Lsu*6%2`q%aD``|zXd_eMBqdlJt75zXX@0y?%^6QC#=1?MSJQ%6v7M8N z0sOg}bAuSf6?L4QVhJ3j5iyS68+oI~prN5@{BP zGp|m@g?Q-JzlqW0!=i^g#!VV-8XRYfWS~o?BJ63TMP`M5nF4s~7-#jgAl^UDc}-{i zX--ip!d2%uH%JU;q+w$u=uM^nGRoPPjgE8qLd8S?>-rpVeoU zqVkLivfMO~xeVS@epVcpf7Kf@HDv{H>mSacERBiTR{qGrYy+v;es;Scl}lKMchWf$ z4Q2b-32iE?IexaUG?jxazanLc2K8Cr@~N!aRo1_HGCL${visQP+NnHj_p`LRsjN8` zu-+r79AfgBlqDK=sPLHVattm|tsI3p)G0^cH~rD=qNp>9jY%4IIwyD7u%pk|jBO+7kg>T?C*9HqOX&_^5H5qL?L-AkZ@zUcJ~sh&#x!!>xKdVT7d zt$4d$9}qzhKIx~>F>w$lYsph;RdT3M@#5ZRI_WSh!uIc6lF=RlDogLHJ=Zzqo4AxrAg$!Urm3)MXen0U=3^7N=^Jq zMDjc}^MR<%Ff?wYUSv4Moe4QR%?4Y`B}pXtX&c5IIy!|xA0aQYyecCLDv9&4cFAnX zbNu=S$=(u+pMOD1r(}o2;+4B4`yGpEFCIFw{CJ-%Habn_?#a*flsa(Q8Rvuh zr&5CdIx4qOD0SlH(q^vfosNzC_P75{N?kFI56YNznY?~@l0B*uCtMADW*?Tib^PN> zaQ=PC_E{DWd?@*i%{}`i9clw-zL4xtO?r&Hx{k+=+eIDRZi6f=aj)mI1zDVPn|$Xx zNzD`ECj&U_nS&i3gFe9_&r96*vn;B-CN&`AZRfEoIOVIuFJ6O>+?1T{Gr46*@(rI! zhf(mY(?%DC9oRLqvpTZ>jPY|pN)n#o4c5ZBgD=a7o-U`%vu znaQKUxKMV_WHa=v7<{jolOph0(JDqm2K|VjmZ2}PMN88&=+{#86ce_CNQcw>ZULj= z5DMXXx`C1Ki*y|etCsQR0r(>!xc96lIY#T}5XkMVE0hvW)uhz+OLw z5pA=7+*{GKyv_jTn?Y>TP1=sH^b{S% zJ-vkvU{Uo_`U5+w+vo!fRJV}3r{)Fv94$4=>1*U_7DRL7{`r^QRFuiv_rKSl!_As` F{{pHWIkEr% diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index f39dbe9..84fef90 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -71,202 +71,201 @@ 43-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:41:13-45 44 android:launchMode="singleTop" 44-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:42:13-43 -45 android:theme="@style/NoteTheme" +45 android:theme="@style/NoteTheme" > 45-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:43:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:44:13-57 -47 android:windowSoftInputMode="adjustPan" > -47-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:45:13-52 -48 -48-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:47:13-50:29 -49 -49-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:48:17-69 -49-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:48:25-66 -50 -51 -51-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:49:17-77 -51-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:49:27-74 -52 -53 -54 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:53:9-81:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:54:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:55:13-74 -57 android:launchMode="singleTop" -57-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:56:13-43 -58 android:theme="@style/NoteTheme" > -58-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:57:13-45 -59 -59-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:59:13-64:29 -60 -60-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:60:17-69 -60-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:60:25-66 -61 -62 -62-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 -62-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 -63 -64 -64-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 -64-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 -65 +46 +47 +48 android:windowSoftInputMode="adjustPan" > +49 +49-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:47:13-50:29 +50 +50-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:48:25-66 +51 +52 +52-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:49:27-74 +53 +54 +55 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:53:9-81:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:54:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:55:13-74 +58 android:launchMode="singleTop" +58-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:56:13-43 +59 android:theme="@style/NoteTheme" > +59-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:57:13-45 +60 +60-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:59:13-64:29 +61 +61-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:60:25-66 +62 +63 +63-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 +64 +65 65-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 65-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 -66 -67 -67-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:66:13-71:29 -68 -68-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:67:17-79 -68-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:67:25-76 -69 -70 -70-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 -70-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 -71 -72 -72-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 -72-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 -73 +66 +66-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 +67 +68 +68-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:66:13-71:29 +69 +69-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:67:25-76 +70 +71 +71-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 +72 +73 73-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 73-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 -74 -75 -75-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:73:13-76:29 -76 -76-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:74:17-71 -76-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:74:25-68 -77 -78 -78-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 -78-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 -79 -80 -81 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:78:13-80:54 -82 android:name="android.app.searchable" -82-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:79:17-54 -83 android:resource="@xml/searchable" /> -83-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:80:17-51 -84 -85 -86 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:83:9-86:43 -87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:84:13-63 -88 android:authorities="micode_notes" -88-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:85:13-47 -89 android:multiprocess="true" /> -89-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:86:13-40 -90 -91 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:88:9-100:20 -92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:89:13-57 -93 android:label="@string/app_widget2x2" > -93-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:90:13-50 -94 -94-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:91:13-95:29 -95 -95-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:17-84 -95-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:25-81 -96 -96-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:17-85 -96-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:25-82 -97 -97-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:17-85 -97-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:25-82 -98 -99 -100 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:97:13-99:58 -101 android:name="android.appwidget.provider" -101-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:98:17-58 -102 android:resource="@xml/widget_2x_info" /> -102-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:99:17-55 -103 -104 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:101:9-114:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:102:13-57 -106 android:label="@string/app_widget4x4" > -106-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:103:13-50 -107 -107-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:91:13-95:29 -108 -108-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:17-84 -108-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:25-81 -109 -109-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:17-85 -109-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:25-82 -110 -110-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:17-85 -110-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:25-82 -111 -112 -113 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:97:13-99:58 -114 android:name="android.appwidget.provider" -114-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:98:17-58 -115 android:resource="@xml/widget_4x_info" /> -115-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:99:17-55 -116 -117 -117-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:116:9-120:20 -117-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:116:19-55 -118 -118-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:117:13-119:29 -119 -119-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:118:17-79 -119-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:118:25-76 -120 -121 -122 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:122:9-125:20 -123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:123:13-61 -124 android:process=":remote" > -124-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:124:13-38 -125 -126 -127 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:127:9-132:20 -128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:128:13-50 -129 android:label="@string/app_name" -129-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:129:13-45 -130 android:launchMode="singleInstance" -130-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:130:13-48 -131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:131:13-75 -132 -133 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:134:9-139:20 -134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:135:13-71 -135 android:label="@string/preferences_title" -135-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:136:13-54 -136 android:launchMode="singleTop" -136-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:137:13-43 -137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:138:13-60 -138 -139 -140 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:141:9-144:19 -141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:142:13-74 -142 android:exported="false" > -142-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:143:13-37 -143 -144 -145 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:146:9-148:52 -146 android:name="android.app.default_searchable" -146-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:147:13-58 -147 android:value=".ui.NoteEditActivity" /> -147-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:148:13-49 -148 -149 -150 +74 +74-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:62:23-75 +75 +76 +76-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:73:13-76:29 +77 +77-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:74:25-68 +78 +79 +79-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:61:27-73 +80 +81 +82 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:78:13-80:54 +83 android:name="android.app.searchable" +83-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:79:17-54 +84 android:resource="@xml/searchable" /> +84-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:80:17-51 +85 +86 +87 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:83:9-86:43 +88 android:name="net.micode.notes.data.NotesProvider" +88-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:84:13-63 +89 android:authorities="micode_notes" +89-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:85:13-47 +90 android:multiprocess="true" /> +90-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:86:13-40 +91 +92 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:88:9-100:20 +93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +93-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:89:13-57 +94 android:label="@string/app_widget2x2" > +94-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:90:13-50 +95 +95-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:91:13-95:29 +96 +96-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:25-81 +97 +97-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:25-82 +98 +98-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:25-82 +99 +100 +101 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:97:13-99:58 +102 android:name="android.appwidget.provider" +102-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:98:17-58 +103 android:resource="@xml/widget_2x_info" /> +103-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:99:17-55 +104 +105 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:101:9-114:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +106-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:102:13-57 +107 android:label="@string/app_widget4x4" > +107-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:103:13-50 +108 +108-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:91:13-95:29 +109 +109-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:92:25-81 +110 +110-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:93:25-82 +111 +111-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:94:25-82 +112 +113 +114 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:97:13-99:58 +115 android:name="android.appwidget.provider" +115-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:98:17-58 +116 android:resource="@xml/widget_4x_info" /> +116-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:99:17-55 +117 +118 +118-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:116:19-55 +119 +119-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:117:13-119:29 +120 +120-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:118:25-76 +121 +122 +123 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:122:9-125:20 +124 android:name="net.micode.notes.ui.AlarmReceiver" +124-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:123:13-61 +125 android:process=":remote" > +125-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:124:13-38 +126 +127 +128 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:127:9-132:20 +129 android:name="net.micode.notes.ui.AlarmAlertActivity" +129-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:128:13-50 +130 android:label="@string/app_name" +130-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:129:13-45 +131 android:launchMode="singleInstance" +131-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:130:13-48 +132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +132-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:131:13-75 +133 +134 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:134:9-139:20 +135 android:name="net.micode.notes.ui.NotesPreferenceActivity" +135-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:135:13-71 +136 android:label="@string/preferences_title" +136-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:136:13-54 +137 android:launchMode="singleTop" +137-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:137:13-43 +138 android:theme="@android:style/Theme.Holo.Light" > +138-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:138:13-60 +139 +140 +141 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:141:9-144:19 +142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +142-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:142:13-74 +143 android:exported="false" > +143-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:143:13-37 +144 +145 +146 D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:146:9-148:52 +147 android:name="android.app.default_searchable" +147-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:147:13-58 +148 android:value=".ui.NoteEditActivity" /> +148-->D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:148:13-49 +149 +150 +151 diff --git a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 97501ac..8dfcded 100644 --- a/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -42,8 +42,9 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:theme="@style/NoteTheme" > + + android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 97501ac..8dfcded 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -42,8 +42,9 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:theme="@style/NoteTheme" > + + android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index 7af0b531197c9dae41e37d6da64e0b47e1eb7115..f15625288b652b7e293edae0f7e9074d9a8633f5 100644 GIT binary patch delta 56 zcmbQkd4faM(J>%|k%55$h7DMN93a>Y#2FK1k1*Y5+xR$=i8+!haIzzF;N-{5I{*|E B3~K-Y delta 80 zcmX@XF^5yu(J>%|k%55$hFe&G93a>Y!V_hWFl}Pr_&Ab@bu}Z`BF4$~%z;cw{*xCn Z=}unH$j%|+P+U@!nU_AfmiaUz0|1%V6HEXA diff --git a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index ea0ebfc6d86b85ecbadd69f5df9625cb4e89b6a5..c0e5804d41298ff1aaed78c01f70c2409b755ea3 100644 GIT binary patch delta 108 zcmez2vByKu(J>%|k%55$gh4=MqF@eV-^RLrX{LYtoB3rHGipv}6cX~wFG+PwF3HT# zb4n}%|k%55$gh3#7qF@f=@r`x;(oEY0HuK9YX4JjFC?w>UUy|yWT#}ie z=ag6!TvC~nD#c*5oso+{XcHqBs}M6s8>7|=MxmvQlW)sfS(<@`+8L#krKA({Qi}33 zQ>+q8N{aMTGK&jx5-a@+KqeI%{Qu8v!KlQ+#Rg$X8BG?G)8ycgV&h^-&(GWJCHIMy H8R#YeLWV9x diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index d7abdef..c0e93c2 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -109,15 +109,15 @@ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" } }, { diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 2c64aab..c14774f 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -66,15 +66,15 @@ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", "endLines": "128,132,136,139,143,147,151,155,159,163,167", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" } }, { diff --git a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 97501ac..8dfcded 100644 --- a/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -42,8 +42,9 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:theme="@style/NoteTheme" > + + android:windowSoftInputMode="adjustPan" > diff --git a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 2f444de7edb0f21c5c2e23c8adaeffc228cdb6e4..514cfcba268f1e69d4a5206f0130723fc9626357 100644 GIT binary patch delta 4192 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 S&o&xB>Jdy?pu`G;?0*2Fi4*ex delta 4412 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 delta 10249 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 diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 88f1b5c..bb75e95 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -83,10 +83,6 @@ ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:42:13-43 - android:windowSoftInputMode - ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges ADDED from D:\xiaomibianqian\xiaomibianqian\src\app\src\main\AndroidManifest.xml:40:13-74 android:theme diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index e5c7d47..134688f 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -40,8 +40,8 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/app_name" android:launchMode="singleTop" - android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:theme="@style/NoteTheme"> + android:windowSoftInputMode="adjustPan" > diff --git a/src/app/src/main/res/menu/note_list.xml b/src/app/src/main/res/menu/note_list.xml index 42ea736..e65c04e 100644 --- a/src/app/src/main/res/menu/note_list.xml +++ b/src/app/src/main/res/menu/note_list.xml @@ -19,7 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:title="@string/menu_create_folder" /> + android:id="@+id/menu_setting"/> + \ No newline at end of file