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

Commit ca14c189 authored by Yifei Zhang's avatar Yifei Zhang Committed by Android (Google) Code Review
Browse files

Merge "swipe-back: disable background dimming on Dialog" into main

parents f85cdaca 2dbca6c6

core/res/res/values-watch/themes_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -43,11 +43,13 @@ please see styles_device_defaults.xml. 
    <!-- Override behaviour to set the theme colours for dialogs, keep them the same. -->

    <style name="ThemeOverlay.Material.Dialog" parent="ThemeOverlay.Material.BaseDialog">

        <item name="android:windowFullscreen">true</item>

        <item name="backgroundDimEnabled">false</item>

    </style>



    <!-- Force the background and floating colours to be the default colours. -->

    <style name="Theme.Material.Dialog" parent="Theme.Material.BaseDialog">

        <item name="android:windowFullscreen">true</item>

        <item name="backgroundDimEnabled">false</item>

        <item name="colorBackground">@color/background_material_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_material_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>
@@ -56,6 +58,7 @@ please see styles_device_defaults.xml. 
    <!-- Force the background and floating colours to be the default colours. -->

    <style name="Theme.Material.Dialog.Alert" parent="Theme.Material.Dialog.BaseAlert">

        <item name="android:windowFullscreen">true</item>

        <item name="backgroundDimEnabled">false</item>

        <item name="colorBackground">@color/background_material_dark</item>

        <item name="colorBackgroundFloating">@color/background_floating_material_dark</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_dark</item>
@@ -64,6 +67,7 @@ please see styles_device_defaults.xml. 
    <!-- Force the background and floating colours to be the default colours. -->

    <style name="Theme.Material.Light.Dialog" parent="Theme.Material.Light.BaseDialog">

        <item name="android:windowFullscreen">true</item>

        <item name="backgroundDimEnabled">false</item>

        <item name="colorBackground">@color/background_material_light</item>

        <item name="colorBackgroundFloating">@color/background_floating_material_light</item>

        <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_material_light</item>