Merge branch 'develop' of http://bdgit.educoder.net/p62491830/p34qyw7p8 into w_branch

# Conflicts:
#	doc/小米便签开源代码的泛读报告.docx

src/MiCodeNotes/.idea/libraries/Gradle____httpcomponents_client_4_5_12_lib_httpclient_osgi_4_5_12_jar.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-osgi-4.5.12.jar">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/httpcomponents-client-4.5.12/lib/httpclient-osgi-4.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

src/MiCodeNotes/.idea/libraries/Gradle____httpcomponents_client_4_5_12_lib_httpclient_win_4_5_12_jar.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-win-4.5.12.jar">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/httpcomponents-client-4.5.12/lib/httpclient-win-4.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

src/MiCodeNotes/.idea/libraries/Gradle____httpcomponents_client_4_5_12_lib_httpcore_4_4_13_jar.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: ./httpcomponents-client-4.5.12/lib/httpcore-4.4.13.jar">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/httpcomponents-client-4.5.12/lib/httpcore-4.4.13.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

src/MiCodeNotes/.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/MiCodeNotes.iml" filepath="$PROJECT_DIR$/.idea/modules/MiCodeNotes.iml" group="MiCodeNotes" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/MiCodeNotes-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/MiCodeNotes-app.iml" group="MiCodeNotes/app" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/app.iml" group="MiCodeNotes/app" />
     </modules>
   </component>

src/MiCodeNotes/.idea/modules/app/app.iml

@@ -85,11 +85,10 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-osgi-4.5.12.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./httpcomponents-client-4.5.12/lib/httpclient-win-4.5.12.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./httpcomponents-client-4.5.12/lib/httpcore-4.4.13.jar" level="project" />
-    <orderEntry type="library" name="Gradle: android-android-22" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/httpcomponents-client-4.5.12/lib/httpclient-osgi-4.5.12.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/httpcomponents-client-4.5.12/lib/httpclient-win-4.5.12.jar" level="project" />
+    <orderEntry type="library" name="Gradle: ./app/httpcomponents-client-4.5.12/lib/httpcore-4.4.13.jar" level="project" />
   </component>
 </module>

src/MiCodeNotes/app/build.gradle

@@ -1,20 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-<<<<<<< HEAD
-    compileSdkVersion 22
-=======
     compileSdkVersion 29
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
     buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "net.micode.notes"
-<<<<<<< HEAD
-        targetSdkVersion 22
-=======
         targetSdkVersion 29
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
     }
 
     buildTypes {
@@ -34,7 +26,7 @@ android {
 }
 
 dependencies {
-    implementation files("C:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\httpcomponents-client-4.5.12\\lib\\httpclient-osgi-4.5.12.jar")
-    implementation files("C:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\httpcomponents-client-4.5.12\\lib\\httpclient-win-4.5.12.jar")
-    implementation files("C:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\httpcomponents-client-4.5.12\\lib\\httpcore-4.4.13.jar")
+    implementation files("httpcomponents-client-4.5.12\\lib\\httpclient-osgi-4.5.12.jar")
+    implementation files("httpcomponents-client-4.5.12\\lib\\httpclient-win-4.5.12.jar")
+    implementation files("httpcomponents-client-4.5.12\\lib\\httpcore-4.4.13.jar")
 }

src/MiCodeNotes/app/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -21,11 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="1"
-<<<<<<< HEAD
-        android:targetSdkVersion="22" />
-=======
         android:targetSdkVersion="29" />
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -47,10 +43,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-<<<<<<< HEAD
-            android:uiOptions="splitActionBarWhenNarrow"
-=======
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -1,4 +1,4 @@
-#Sun Sep 27 09:44:21 CST 2020
+#Mon Sep 28 08:52:46 CST 2020
 C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\src\\main\\res\\raw-zh-rCN\\introduction=C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN_introduction.flat
 C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_list_green_down.9.png.flat
 C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\src\\main\\res\\drawable-hdpi\\search_result.png=C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi_search_result.png.flat

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

@@ -1,12 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Tue Sep 22 23:17:22 CST 2020
-=======
-#Sat Sep 26 23:30:28 CST 2020
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
-=======
-#Sun Sep 27 17:00:12 CST 2020
->>>>>>> 23dfd350b48e2280f12f3c9c41c1fd450c2526df
+#Mon Sep 28 08:53:12 CST 2020
 base.0=C\:\\Users\\titan\\Documents\\Git\\p34qyw7p8\\src\\MiCodeNotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

src/MiCodeNotes/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -22,11 +22,7 @@
 
     <uses-sdk
         android:minSdkVersion="1"
-<<<<<<< HEAD
-        android:targetSdkVersion="22" />
-=======
         android:targetSdkVersion="29" />
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -48,10 +44,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-<<<<<<< HEAD
-            android:uiOptions="splitActionBarWhenNarrow"
-=======
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -22,11 +22,7 @@
 22    <uses-sdk
 23        android:minSdkVersion="1"
 23-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml
-<<<<<<< HEAD
-24        android:targetSdkVersion="22" />
-=======
 24        android:targetSdkVersion="29" />
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
 24-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml
 25
 26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -65,214 +61,6 @@
 40        <activity
 40-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:37:9-50:20
 41            android:name="net.micode.notes.ui.NotesListActivity"
-<<<<<<< HEAD
-41-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:38:13-49
-42            android:configChanges="keyboardHidden|orientation|screenSize"
-42-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:39:13-74
-43            android:label="@string/app_name"
-43-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:40:13-45
-44            android:launchMode="singleTop"
-44-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:41:13-43
-45            android:theme="@style/NoteTheme"
-45-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:42:13-45
-46            android:uiOptions="splitActionBarWhenNarrow"
-46-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:43:13-57
-47            android:windowSoftInputMode="adjustPan" >
-47-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:44:13-52
-48            <intent-filter>
-48-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:46:13-49:29
-49                <action android:name="android.intent.action.MAIN" />
-49-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:47:17-69
-49-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:47:25-66
-50
-51                <category android:name="android.intent.category.LAUNCHER" />
-51-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:48:17-77
-51-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:48:27-74
-52            </intent-filter>
-53        </activity>
-54        <activity
-54-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:52:9-80:20
-55            android:name="net.micode.notes.ui.NoteEditActivity"
-55-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:53:13-48
-56            android:configChanges="keyboardHidden|orientation|screenSize"
-56-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:54:13-74
-57            android:launchMode="singleTop"
-57-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:55:13-43
-58            android:theme="@style/NoteTheme" >
-58-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:56:13-45
-59            <intent-filter>
-59-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:58:13-63:29
-60                <action android:name="android.intent.action.VIEW" />
-60-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:59:17-69
-60-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:59:25-66
-61
-62                <category android:name="android.intent.category.DEFAULT" />
-62-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:17-76
-62-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:27-73
-63
-64                <data android:mimeType="vnd.android.cursor.item/text_note" />
-64-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:17-78
-64-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:23-75
-65                <data android:mimeType="vnd.android.cursor.item/call_note" />
-65-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:17-78
-65-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:23-75
-66            </intent-filter>
-67            <intent-filter>
-67-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:65:13-70:29
-68                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-68-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:66:17-79
-68-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:66:25-76
-69
-70                <category android:name="android.intent.category.DEFAULT" />
-70-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:17-76
-70-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:27-73
-71
-72                <data android:mimeType="vnd.android.cursor.item/text_note" />
-72-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:17-78
-72-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:23-75
-73                <data android:mimeType="vnd.android.cursor.item/call_note" />
-73-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:17-78
-73-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:61:23-75
-74            </intent-filter>
-75            <intent-filter>
-75-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:72:13-75:29
-76                <action android:name="android.intent.action.SEARCH" />
-76-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:73:17-71
-76-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:73:25-68
-77
-78                <category android:name="android.intent.category.DEFAULT" />
-78-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:17-76
-78-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:60:27-73
-79            </intent-filter>
-80
-81            <meta-data
-81-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:77:13-79:54
-82                android:name="android.app.searchable"
-82-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:78:17-54
-83                android:resource="@xml/searchable" />
-83-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:79:17-51
-84        </activity>
-85
-86        <provider
-86-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:82:9-85:43
-87            android:name="net.micode.notes.data.NotesProvider"
-87-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:83:13-63
-88            android:authorities="micode_notes"
-88-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:84:13-47
-89            android:multiprocess="true" />
-89-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:85:13-40
-90
-91        <receiver
-91-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:87:9-99:20
-92            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-92-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:88:13-57
-93            android:label="@string/app_widget2x2" >
-93-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:89:13-50
-94            <intent-filter>
-94-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:90:13-94:29
-95                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-95-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:91:17-84
-95-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:91:25-81
-96                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-96-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:92:17-85
-96-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:92:25-82
-97                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-97-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:93:17-85
-97-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:93:25-82
-98            </intent-filter>
-99
-100            <meta-data
-100-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:96:13-98:58
-101                android:name="android.appwidget.provider"
-101-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:97:17-58
-102                android:resource="@xml/widget_2x_info" />
-102-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:98:17-55
-103        </receiver>
-104        <receiver
-104-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:100:9-113:20
-105            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-105-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:101:13-57
-106            android:label="@string/app_widget4x4" >
-106-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:102:13-50
-107            <intent-filter>
-107-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:90:13-94:29
-108                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-108-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:91:17-84
-108-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:91:25-81
-109                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-109-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:92:17-85
-109-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:92:25-82
-110                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-110-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:93:17-85
-110-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:93:25-82
-111            </intent-filter>
-112
-113            <meta-data
-113-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:96:13-98:58
-114                android:name="android.appwidget.provider"
-114-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:97:17-58
-115                android:resource="@xml/widget_4x_info" />
-115-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:98:17-55
-116        </receiver>
-117        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-117-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:115:9-119:20
-117-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:115:19-55
-118            <intent-filter>
-118-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:116:13-118:29
-119                <action android:name="android.intent.action.BOOT_COMPLETED" />
-119-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:117:17-79
-119-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:117:25-76
-120            </intent-filter>
-121        </receiver>
-122        <receiver
-122-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:121:9-124:20
-123            android:name="net.micode.notes.ui.AlarmReceiver"
-123-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:122:13-61
-124            android:process=":remote" >
-124-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:123:13-38
-125        </receiver>
-126
-127        <activity
-127-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:126:9-131:20
-128            android:name="net.micode.notes.ui.AlarmAlertActivity"
-128-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:127:13-50
-129            android:label="@string/app_name"
-129-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:128:13-45
-130            android:launchMode="singleInstance"
-130-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:129:13-48
-131            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-131-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:130:13-75
-132        </activity>
-133        <activity
-133-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:133:9-138:20
-134            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-134-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:134:13-71
-135            android:label="@string/preferences_title"
-135-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:135:13-54
-136            android:launchMode="singleTop"
-136-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:136:13-43
-137            android:theme="@android:style/Theme.Holo.Light" >
-137-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:137:13-60
-138        </activity>
-139
-140        <service
-140-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:140:9-143:19
-141            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-141-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:141:13-74
-142            android:exported="false" >
-142-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:142:13-37
-143        </service>
-144
-145        <meta-data
-145-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:145:9-147:52
-146            android:name="android.app.default_searchable"
-146-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:146:13-58
-147            android:value=".ui.NoteEditActivity" />
-147-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:147:13-49
-148    </application>
-149
-150</manifest>
-=======
 41-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:39:13-49
 42            android:configChanges="keyboardHidden|orientation|screenSize"
 42-->C:\Users\titan\Documents\Git\p34qyw7p8\src\MiCodeNotes\app\src\main\AndroidManifest.xml:40:13-74
@@ -477,4 +265,3 @@
 147    </application>
 148
 149</manifest>
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207

src/MiCodeNotes/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -21,11 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="1"
-<<<<<<< HEAD
-        android:targetSdkVersion="22" />
-=======
         android:targetSdkVersion="29" />
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
@@ -47,10 +43,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/NoteTheme"
-<<<<<<< HEAD
-            android:uiOptions="splitActionBarWhenNarrow"
-=======
->>>>>>> 9b14411d86f094a526ceea309df409f3ebf0a207
             android:windowSoftInputMode="adjustPan" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />