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
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aa2a142..60dbb24 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1323,7 +1323,8 @@
<activity
android:name=".notification.history.NotificationHistoryActivity"
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">
<action android:name="android.settings.NOTIFICATION_HISTORY" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1517,7 +1518,8 @@
<activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
android:label="@string/device_admin_add_title"
android:exported="true"
- android:clearTaskOnLaunch="true">
+ android:clearTaskOnLaunch="true"
+ android:theme="@style/Theme.Settings.NoActionBar">
<intent-filter>
<action android:name="android.app.action.ADD_DEVICE_ADMIN" />
<category android:name="android.intent.category.DEFAULT" />