Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2cf8ef4 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "Fix SensorUseDialog UI issues" into main

parents 5814c395 79865c82

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/sensorprivacy/SensorUseStartedActivity.kt

+3 −1
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ open class SensorUseStartedActivity @Inject constructor( 
    }



    override fun onDismiss(dialog: DialogInterface?) {

        if (!isChangingConfigurations) {

            finish()

        }

    }

}