Fix crash on notifcations/device admin add pages

Do not apply window action bar in collasping tool bar activity.

Fix: 192291587
Test: Go through most pages in Settings app.
Change-Id: I4eafb92b67cd3a9e08d04e4aae007aa473f810dd
This commit is contained in:
Tsung-Mao Fang
2021-06-29 14:40:31 +08:00
parent 8d5b841fb1
commit efaf49c19d

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" />