PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash on notifcations/device admin add pages" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-29 07:42:11 +00:00
committed by Android (Google) Code Review
parent d60eae5539 efaf49c19d
commit c24d5621de
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@@ -1323,7 +1323,8 @@
<activity <activity
android:name=".notification.history.NotificationHistoryActivity" android:name=".notification.history.NotificationHistoryActivity"
android:exported="true" android:exported="true"
android:label="@string/notification_history_title"> android:label="@string/notification_history_title"
android:theme="@style/Theme.Settings.NoActionBar">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.NOTIFICATION_HISTORY" /> <action android:name="android.settings.NOTIFICATION_HISTORY" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -1517,7 +1518,8 @@
<activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd" <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
android:label="@string/device_admin_add_title" android:label="@string/device_admin_add_title"
android:exported="true" android:exported="true"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:theme="@style/Theme.Settings.NoActionBar">
<intent-filter> <intent-filter>
<action android:name="android.app.action.ADD_DEVICE_ADMIN" /> <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />