Merge branch 'wushuxian_branch' of https://bdgit.educoder.net/m6wf5oeyl/MiNotes into wushuxian_branch

# Conflicts:
#	doc/小米便签泛读、标注和维护报告文档.docx
#	doc/小米便签质量分析报告.docx
#	src/main/AndroidManifest.xml
#	src/main/java/net/micode/notes/ui/NoteEditActivity.java

src/main/AndroidManifest.xml

@@ -48,7 +48,7 @@
     <!--- 应用程序组件声明 -->
     <!--- 定义应用程序的图标和名称 -->
     <application
-        android:icon="@drawable/icon_app_1"
+        android:icon="@drawable/icon_app"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true">
         <activity
@@ -76,7 +76,6 @@
         <!--- 应用程序的入口 NotesListActivity -->
         <activity
             android:name=".ui.NotesListActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"