diff options
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 58c9f777de33..6778d5a08506 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -562,7 +562,7 @@ android:exported="true" android:launchMode="singleTop" android:permission="android.permission.MANAGE_SENSOR_PRIVACY" - android:theme="@style/Theme.SystemUI.Dialog.Alert" + android:theme="@style/Theme.SystemUI.Dialog.Alert.SensorPrivacy" android:finishOnCloseSystemDialogs="true" android:showForAllUsers="true"> </activity> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index d520670ec012..10340c6847f7 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -451,6 +451,11 @@ <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" /> + <style name="Theme.SystemUI.Dialog.Alert.SensorPrivacy" parent="Theme.SystemUI.Dialog.Alert"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowContentOverlay">@null</item> + </style> + <style name="Theme.SystemUI.Dialog.GlobalActions" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar.Fullscreen"> <item name="android:colorError">@*android:color/error_color_material_dark</item> <item name="android:windowIsFloating">true</item> diff --git a/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt b/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt index d33d113f6cbd..2f0fc5127009 100644 --- a/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt @@ -228,6 +228,8 @@ open class SensorUseStartedActivity @Inject constructor( } override fun onDismiss(dialog: DialogInterface?) { - finish() + if (!isChangingConfigurations) { + finish() + } } } |