From 8ecc3315cec590e35e2ad52dfa4e49045853926f Mon Sep 17 00:00:00 2001 From: ziji Wu <2193177243@qq.com> Date: Thu, 10 Oct 2019 20:49:27 +0800 Subject: [PATCH] sdk 23 comment more --- .../executionHistory/executionHistory.bin | Bin 323601 -> 323601 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes src/.gradle/5.4.1/fileHashes/fileHashes.bin | Bin 43997 -> 44097 bytes src/.gradle/5.4.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 21089 -> 21197 bytes src/.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes src/.idea/caches/gradle_models.ser | Bin 29575 -> 29575 bytes ...dle__org_apache_http_legacy_android_23.xml | 9 + src/.idea/workspace.xml | 211 +++++---- src/app/app.iml | 4 +- src/app/build.gradle | 2 +- .../bundle-manifest/AndroidManifest.xml | 3 +- .../debug/AndroidManifest.xml | 3 +- .../manifest-merger-blame-debug-report.txt | 413 +++++++++--------- .../debug/AndroidManifest.xml | 3 +- .../notes/data/NotesDatabaseHelper.java | 34 +- .../net/micode/notes/ui/NoteEditActivity.java | 2 +- 18 files changed, 365 insertions(+), 319 deletions(-) create mode 100644 src/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.bin b/src/.gradle/5.4.1/executionHistory/executionHistory.bin index 4abe340d7d6c30c17ba2c70509597f4577797b7a..c76c7f698f1849cbf027ad7b0e24fd2ab05e5e53 100644 GIT binary patch delta 175 zcmbREKzQN<;SI-UsTda&rWTf%ndF%!=Ne}iRhbo(Cz=$Ol$0kjK!6m(-sy@DSQIvM z&*ouQBB)$x^8b|^Hosi7NKmD0HX+rFy_?r>;bmlG-h5)~R?Erj=L&8%>ucs|X8Y65 Q_JQ8JCz9W@i?q6lD}-rKe}*8X0FBml;5GC$Sg}SGcL$WE>A8q&do}y$Vh}LSD5^N<%Z2K7cCNGY@Gh?9itK> z_vZCmco}(En7cw;gG1u|{d^)f@7=o9a{7j+EP~T7IWQYc{@-J@c|l)2qrk($C9@u7 zJA4!0cTjKd$JZY=>raqm6gt$Adqr~Faii#~-_MC>F4)g_clyWEEQXUWOpw_8;gdY0 zfHvn_O{rUfTdj>moL_S;YTPXUg_#jzexe~$)MSS#|EKpoV-c9_Kea>fd)3E9?|mkU z%n{obpOvw{j&U;M2ZPD|Q{5)VO{)+@fj{j6e;9$7X}iE5X2vf7HcyEH diff --git a/src/.gradle/5.4.1/executionHistory/executionHistory.lock b/src/.gradle/5.4.1/executionHistory/executionHistory.lock index 24e9509240c31eb6683bab32ffa2b48f76ce71df..ac87ad4f8089df594e92c01fb85c4f226895a4a9 100644 GIT binary patch literal 17 VcmZRMdf@e>LT%?K1~6cp0suNV1xf$_ literal 17 VcmZRMdf@e>LT%?K1~6bO1^_x21t|ak diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.bin b/src/.gradle/5.4.1/fileHashes/fileHashes.bin index 0968d755e4b066657593f12deb4a8716a7a341a3..bf01019ff5477c7ef035342b7ad30763b0199571 100644 GIT binary patch delta 1517 zcmZ|Ndq`7p6bEoOdq633TuWU~i;NLXQ_P-*iD6DNGj-E#wlpdqsk3*KnbWy?I2tlOEV9pwUgtFK%Ftq8za@4}lK+l?>s)Q?b$b>~8>q|xIK$O^yb>6jOa}_ESfGfp38w^} zGKw&AB{dfzicyS>0>>C7cr5TsU``6%m4oj}dkZlKCG1I|yK>-g3S~NQk5P*60<%`p zrOmJkxCFWxTkwUk4Kq?{$~K-dVJil=NN}XmlDw41}zfm(`nCgw5C&j zIo=5PW>94xmI#zED$pqKTwt_`nkzA%u^;&YWi2{fHqmpiA5XaIgvxC2mbXE;IaGN< z4q%;`c0Mq?UJimcNw{dH^{Vi|O!)`#Ltu6$RjQHAID|S;xy^9lYbIs7IMaJF?3*Pl z&7#aYn6oIM4%Li$Tw~PWvp}$gdTQm04uuwfQxY?3d^FL_|HjUp~^ zL8YAjDdclGKRM}%O@7<;kMDv9q6?gl;uxAlTCP!7{*7G60BNx zQ}(>X+&_2Jl$1CpKDasL(G|7i-tXv_2Nd+r%zdH^P}NL0{_jdvVPh5zbp@10>&KVI Uo_@5HPDG4qq!Wefhm;e)0oKA6vH$=8 delta 1374 zcmZ|NX-HI26bEoet*ErJ7pW61ekhV?bTqTgY^+F~8O^L|#+h+xQ!6XmX)#)@tYrFU z5v{gZLD4c~v|$<{78SHm5fXlgh={NSY45)C_e((+-pp^#J@1@zhg<(Vu=!cwh4_d- z!!LhAge%-%6H^%KADCq98W_{!i;9IMb!u=*H&Z3{rf5qz!k7uV^E_Av#@>zr#)Z#7^QD>ICKhw5FRvQo5N90kT5hqu#1vtW{H8 z%t4rD)hn1gpq%K4t3)TfBRZq6O>(**lL*0jA{2h2J6_wQOBlO^M8e|K5NDSzJ&|UY z3K~`u;W$Sa@roFXunftG#&}|gN;aZ0qnAG4P@H1agcn3Cx@O7?aY!QKv5-hWH8C8I zi4o{9S&~N~kr;zwA_)hGWZWml;WuG{IZIA8fu{;LG7;A}nI8V$+3$Xy2Lq=N2k$M!uH(x`(L(^~45(Yau z(dyB#+aYr<#TkdxUyhf=3WQFV$Vwy=t58a;!EvGtPlOhhfvaLFa(?Ld=D>hHpLq7p-MB;rG! z!k*IcH{jE;$oL4ixpfd+FFsn=o_(`D`z+ph2aQ$P4Gb6()wd~L zeMGA#N`HF%r{OiVsg`P(nJXn!ZG9Q^xBn^8wyO2m2b-_g!QQobbBpTA{+?pA4gOr2 l`4*aU)qn1(x{B_3rr`V|HI1+kO<1B}{ZVn(e==``?GG23iEjV^ diff --git a/src/.gradle/5.4.1/fileHashes/fileHashes.lock b/src/.gradle/5.4.1/fileHashes/fileHashes.lock index 545a808256451c1f33dcd87ec29d85745977dcab..1c65b0e493a92f0015916d8af7fb63e26a19abc9 100644 GIT binary patch literal 17 VcmZR+pgrSz(_gE93}C>+4gf&x1y}$8 literal 17 VcmZR+pgrSz(_gE93}C=r1pq-^1;3fB`d$DSvJq+^kk@D;^w3B z9gG5cf*N(6!ksx#(c;aniUN!RmfLpCsoTEM6Dm4=v9A)7Kw4;DdZew715|MLW>=L0 sMwR+BzPB@H$z6qtuKbS%7#R2zH!A)R-)QiIbF-s|0@q~!AR%lR0R2HlK>z>% delta 67 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 diff --git a/src/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml b/src/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml new file mode 100644 index 0000000..a243f51 --- /dev/null +++ b/src/.idea/libraries/Gradle__org_apache_http_legacy_android_23.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/.idea/workspace.xml b/src/.idea/workspace.xml index 11b2b8a..ee65f3d 100644 --- a/src/.idea/workspace.xml +++ b/src/.idea/workspace.xml @@ -7,8 +7,27 @@ + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -78,8 +73,20 @@ - - + + + + + + + + + + + + + + @@ -87,8 +94,8 @@ - - + + @@ -97,7 +104,7 @@ - + @@ -111,7 +118,7 @@ - + @@ -157,6 +164,8 @@ finish // /* + getread + mHelper WRONGNOTEID @@ -189,8 +198,6 @@ @@ -544,13 +553,13 @@ - - + + - + @@ -635,7 +644,7 @@ - @@ -823,7 +832,14 @@ @@ -858,7 +874,7 @@ - + @@ -909,9 +925,6 @@ - - - @@ -966,13 +979,6 @@ - - - - - - - @@ -1134,13 +1140,6 @@ - - - - - - - @@ -1179,7 +1178,7 @@ - + @@ -1191,20 +1190,6 @@ - - - - - - - - - - - - - - @@ -1228,29 +1213,10 @@ - - - - - - - - - - - - - - - - - - - - - + + @@ -1269,6 +1235,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/app.iml b/src/app/app.iml index f5dc97a..917ced9 100644 --- a/src/app/app.iml +++ b/src/app/app.iml @@ -87,8 +87,8 @@ - + - + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index 8569daa..e5a9b07 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 + compileSdkVersion 23 buildToolsVersion "29.0.2" useLibrary 'org.apache.http.legacy' diff --git a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml index f237bf5..97501ac 100644 --- a/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml +++ b/src/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml @@ -36,8 +36,7 @@ + android:label="@string/app_name" > + android:label="@string/app_name" > C:\Project\minote\src\app\src\main\AndroidManifest.xml:34:9-42 -39 android:label="@string/app_name" +39 android:label="@string/app_name" > 39-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:35:9-41 -40 android:testOnly="true" > -41 C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 -44 android:label="@string/app_name" -44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 -45 android:launchMode="singleTop" -45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 -46 android:theme="@style/NoteTheme" -46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 -49 -49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 -50 -50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 -50-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 -51 -52 -52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 -52-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 -53 -54 -55 C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74 -58 android:launchMode="singleTop" -58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43 -59 android:theme="@style/NoteTheme" > -59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45 -60 -60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29 -61 -61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69 -61-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66 -62 -63 -63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -63-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -64 -65 +40 C:\Project\minote\src\app\src\main\AndroidManifest.xml:36:9-49:20 +41 android:name="net.micode.notes.ui.NotesListActivity" +41-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:37:13-49 +42 android:configChanges="keyboardHidden|orientation|screenSize" +42-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:38:13-74 +43 android:label="@string/app_name" +43-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:39:13-45 +44 android:launchMode="singleTop" +44-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:40:13-43 +45 android:theme="@style/NoteTheme" +45-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:41:13-45 +46 android:uiOptions="splitActionBarWhenNarrow" +46-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:42:13-57 +47 android:windowSoftInputMode="adjustPan" > +47-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:43:13-52 +48 +48-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:45:13-48:29 +49 +49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:17-69 +49-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:46:25-66 +50 +51 +51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:17-77 +51-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:47:27-74 +52 +53 +54 C:\Project\minote\src\app\src\main\AndroidManifest.xml:51:9-79:20 +55 android:name="net.micode.notes.ui.NoteEditActivity" +55-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:52:13-48 +56 android:configChanges="keyboardHidden|orientation|screenSize" +56-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:53:13-74 +57 android:launchMode="singleTop" +57-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:54:13-43 +58 android:theme="@style/NoteTheme" > +58-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:55:13-45 +59 +59-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:57:13-62:29 +60 +60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:17-69 +60-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:58:25-66 +61 +62 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 +62-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 +63 +64 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 +64-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 +65 65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 65-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -66 -66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -66-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -67 -68 -68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29 -69 -69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79 -69-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76 -70 -71 -71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -71-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -72 -73 +66 +67 +67-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:64:13-69:29 +68 +68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:17-79 +68-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:65:25-76 +69 +70 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 +70-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 +71 +72 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 +72-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 +73 73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 73-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -74 -74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:17-78 -74-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:60:23-75 -75 -76 -76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29 -77 -77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71 -77-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68 -78 -79 -79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 -79-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 -80 -81 -82 C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54 -83 android:name="android.app.searchable" -83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54 -84 android:resource="@xml/searchable" /> -84-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51 -85 -86 -87 C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63 -89 android:authorities="micode_notes" -89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47 -90 android:multiprocess="true" /> -90-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40 -91 -92 C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57 -94 android:label="@string/app_widget2x2" > -94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50 -95 -95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 -96 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 -96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 -97 -97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 -97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -98 -98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 -98-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 -99 -100 -101 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 -102 android:name="android.appwidget.provider" -102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 -104 -105 C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57 -107 android:label="@string/app_widget4x4" > -107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50 -108 -108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 -109 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 -109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 -110 -110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 -110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 -111 -111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 -111-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 -112 -113 -114 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 -115 android:name="android.appwidget.provider" -115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 -117 -118 -118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20 -118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55 -119 -119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29 -120 -120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79 -120-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76 -121 -122 -123 C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61 -125 android:process=":remote" > -125-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38 -126 -127 -128 C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50 -130 android:label="@string/app_name" -130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45 -131 android:launchMode="singleInstance" -131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75 -133 -134 C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71 -136 android:label="@string/preferences_title" -136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54 -137 android:launchMode="singleTop" -137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60 -139 -140 -141 C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74 -143 android:exported="false" > -143-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37 -144 -145 -146 C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52 -147 android:name="android.app.default_searchable" -147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49 -149 -150 -151 +74 +75 +75-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:71:13-74:29 +76 +76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:17-71 +76-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:72:25-68 +77 +78 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:17-76 +78-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:59:27-73 +79 +80 +81 C:\Project\minote\src\app\src\main\AndroidManifest.xml:76:13-78:54 +82 android:name="android.app.searchable" +82-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:77:17-54 +83 android:resource="@xml/searchable" /> +83-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:78:17-51 +84 +85 +86 C:\Project\minote\src\app\src\main\AndroidManifest.xml:81:9-84:43 +87 android:name="net.micode.notes.data.NotesProvider" +87-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:82:13-63 +88 android:authorities="micode_notes" +88-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:83:13-47 +89 android:multiprocess="true" /> +89-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:84:13-40 +90 +91 C:\Project\minote\src\app\src\main\AndroidManifest.xml:86:9-98:20 +92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +92-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:87:13-57 +93 android:label="@string/app_widget2x2" > +93-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:88:13-50 +94 +94-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 +95 +95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 +95-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 +96 +96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 +96-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 +97 +97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 +97-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 +98 +99 +100 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 +101 android:name="android.appwidget.provider" +101-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 +102 android:resource="@xml/widget_2x_info" /> +102-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 +103 +104 C:\Project\minote\src\app\src\main\AndroidManifest.xml:99:9-112:20 +105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +105-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:100:13-57 +106 android:label="@string/app_widget4x4" > +106-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:101:13-50 +107 +107-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:89:13-93:29 +108 +108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:17-84 +108-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:90:25-81 +109 +109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:17-85 +109-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:91:25-82 +110 +110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:17-85 +110-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:92:25-82 +111 +112 +113 C:\Project\minote\src\app\src\main\AndroidManifest.xml:95:13-97:58 +114 android:name="android.appwidget.provider" +114-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:96:17-58 +115 android:resource="@xml/widget_4x_info" /> +115-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:97:17-55 +116 +117 +117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:9-118:20 +117-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:114:19-55 +118 +118-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:115:13-117:29 +119 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:17-79 +119-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:116:25-76 +120 +121 +122 C:\Project\minote\src\app\src\main\AndroidManifest.xml:120:9-123:20 +123 android:name="net.micode.notes.ui.AlarmReceiver" +123-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:121:13-61 +124 android:process=":remote" > +124-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:122:13-38 +125 +126 +127 C:\Project\minote\src\app\src\main\AndroidManifest.xml:125:9-130:20 +128 android:name="net.micode.notes.ui.AlarmAlertActivity" +128-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:126:13-50 +129 android:label="@string/app_name" +129-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:127:13-45 +130 android:launchMode="singleInstance" +130-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:128:13-48 +131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +131-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:129:13-75 +132 +133 C:\Project\minote\src\app\src\main\AndroidManifest.xml:132:9-137:20 +134 android:name="net.micode.notes.ui.NotesPreferenceActivity" +134-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:133:13-71 +135 android:label="@string/preferences_title" +135-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:134:13-54 +136 android:launchMode="singleTop" +136-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:135:13-43 +137 android:theme="@android:style/Theme.Holo.Light" > +137-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:136:13-60 +138 +139 +140 C:\Project\minote\src\app\src\main\AndroidManifest.xml:139:9-142:19 +141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +141-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:140:13-74 +142 android:exported="false" > +142-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:141:13-37 +143 +144 +145 C:\Project\minote\src\app\src\main\AndroidManifest.xml:144:9-146:52 +146 android:name="android.app.default_searchable" +146-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:145:13-58 +147 android:value=".ui.NoteEditActivity" /> +147-->C:\Project\minote\src\app\src\main\AndroidManifest.xml:146:13-49 +148 +149 +150 diff --git a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index f237bf5..97501ac 100644 --- a/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -36,8 +36,7 @@ + android:label="@string/app_name" >