Merge branch 'dev' of https://bdgit.educoder.net/ps9up4ig6/gitProject1 into dev

src/Notes/app/src/main/AndroidManifest.xml

@@ -21,7 +21,6 @@
     android:versionCode="1"
     android:versionName="0.1" >
 
-<!--    添加 tools:ignore="GradleOverrides" 忽略 Gradle 对 minSdkVersion 的重写-->
     <uses-sdk android:minSdkVersion="14"
         tools:ignore="GradleOverrides" />
 
@@ -40,8 +39,6 @@
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
 
-<!--        添加：android:exported="true" -->
-<!--        原因：As of Android 12, android:exported must be set; use true to make the activity available to other apps, and false otherwise. For launcher activities, this should be set to true.-->
 <!--        移除：android:label="@string/app_name"-->
 <!--        原因：Redundant label can be removed.（冗余标签可以移除，第41行已经给出）-->
 
@@ -60,9 +57,6 @@
             </intent-filter>
         </activity>
 
-        <!--        添加：android:exported="true" -->
-        <!--        原因： As of Android 12, android:exported must be set; use true to make the activity available to other apps, and false otherwise. For launcher activities, this should be set to true.-->
-
         <activity
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -95,8 +89,6 @@
                 android:resource="@xml/searchable" />
         </activity>
 
-<!--        添加：android:exported="false"-->
-<!--        原因：Exported content providers can provide access to potentially sensitive data-->
 
         <provider
             android:name="net.micode.notes.data.NotesProvider"
@@ -104,8 +96,6 @@
             android:multiprocess="true"
             android:exported="false" />
 
-<!--        添加：android:exported="true" -->
-<!--        原因： As of Android 12, android:exported must be set; use true to make the activity available to other apps, and false otherwise. For launcher activities, this should be set to true.-->
 
         <receiver
             android:name=".widget.NoteWidgetProvider_2x"
@@ -122,9 +112,6 @@
                 android:resource="@xml/widget_2x_info" />
         </receiver>
 
-        <!--        添加：android:exported="true" -->
-        <!--        原因： As of Android 12, android:exported must be set; use true to make the activity available to other apps, and false otherwise. For launcher activities, this should be set to true.-->
-
 
         <receiver
             android:name=".widget.NoteWidgetProvider_4x"
@@ -142,9 +129,6 @@
                 android:resource="@xml/widget_4x_info" />
         </receiver>
 
-        <!--        添加：android:exported="true" -->
-        <!--        原因： As of Android 12, android:exported must be set; use true to make the activity available to other apps, and false otherwise. For launcher activities, this should be set to true.-->
-
 
         <receiver android:name=".ui.AlarmInitReceiver"
             android:exported="true">
@@ -158,9 +142,6 @@
             android:process=":remote" >
         </receiver>
 
-        <!--        移除：android:label="@string/app_name"-->
-        <!--        原因：Redundant label can be removed.（冗余标签可以移除，第41行已经给出）-->
-
         <activity
             android:name=".ui.AlarmAlertActivity"
             android:launchMode="singleInstance"