diff options
| author | Tsung-Mao Fang <tmfang@google.com> | 2021-06-29 14:40:31 +0800 |
|---|---|---|
| committer | Tsung-Mao Fang <tmfang@google.com> | 2021-06-29 14:40:31 +0800 |
| commit | efaf49c19d86d0611886ba5aafc3f3fa23f7e88b (patch) | |
| tree | bff9bb4af58d3bfa79d021a44c1edb8387b009b2 /AndroidManifest.xml | |
| parent | 8d5b841fb1cff040cb16be961c52211b1569aea6 (diff) | |
| download | Settings-efaf49c19d86d0611886ba5aafc3f3fa23f7e88b.tar.gz | |
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
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aa2a1422e3e..60dbb246044 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" /> |