diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/.gradle/7.3.3/executionHistory/executionHistory.bin index 58f8cc2..05c221b 100644 Binary files a/src/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/.gradle/7.3.3/executionHistory/executionHistory.lock index 46703b6..c5dd95f 100644 Binary files a/src/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/.gradle/7.3.3/fileHashes/fileHashes.bin index 5bd0cc8..3e465a1 100644 Binary files a/src/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/.gradle/7.3.3/fileHashes/fileHashes.lock index 5f88173..25a4f16 100644 Binary files a/src/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index e5ef31d..7d00be5 100644 Binary files a/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5ff7843..008edb8 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index 332ed35..0e9003c 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ 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 4bdd339..b62adbc 100644 Binary files a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ 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 7af0b53..f156252 100644 Binary files a/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ 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 ea0ebfc..c0e5804 100644 Binary files a/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ 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 2f444de..514cfcb 100644 Binary files a/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/app/build/outputs/apk/debug/app-debug.apk b/src/app/build/outputs/apk/debug/app-debug.apk index adfb159..24532b3 100644 Binary files a/src/app/build/outputs/apk/debug/app-debug.apk and b/src/app/build/outputs/apk/debug/app-debug.apk differ 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