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

Commit 6026e947 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Night version of Intent resolver"

parents fbeaa52a df0d75b6

core/res/res/values-night/themes_device_defaults.xml

+3 −1
Original line number Diff line number Diff line
@@ -59,4 +59,6 @@ easier. 


    <!-- Theme for the dialog shown when an app crashes or ANRs. -->

    <style name="Theme.DeviceDefault.Dialog.AppError" parent="Theme.DeviceDefault.Dialog.Alert" />



    <style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault" />

</resources>
 
 No newline at end of file

core/res/res/values/themes_device_defaults.xml

+3 −23
Original line number Diff line number Diff line
@@ -1646,8 +1646,10 @@ easier. 


    <style name="Theme.DeviceDefault.Settings.Dialog.NoActionBar" parent="Theme.DeviceDefault.Light.Dialog.NoActionBar" />



    <style name="Theme.DeviceDefault.DayNight" parent="Theme.DeviceDefault.Light" />



    <!-- Theme used for the intent picker activity. -->

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.DeviceDefault.DayNight">

        <item name="windowEnterTransition">@empty</item>

        <item name="windowExitTransition">@empty</item>

        <item name="windowIsTranslucent">true</item>
@@ -1659,30 +1661,8 @@ easier. 
        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>



        <!-- Dialog attributes -->

        <item name="dialogCornerRadius">@dimen/config_dialogCornerRadius</item>

        <item name="alertDialogTheme">@style/Theme.DeviceDefault.Light.Dialog.Alert</item>



        <!-- Button styles -->

        <item name="buttonCornerRadius">@dimen/config_buttonCornerRadius</item>

        <item name="buttonBarButtonStyle">@style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog</item>



        <!-- Color palette -->

        <item name="colorPrimary">@color/primary_device_default_light</item>

        <item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>

        <item name="colorAccent">@color/accent_device_default_light</item>

        <item name="colorError">@color/error_color_device_default_light</item>



        <!-- Progress bar attributes -->

        <item name="colorProgressBackgroundNormal">@color/config_progress_background_tint</item>

        <item name="progressBarCornerRadius">@dimen/config_progressBarCornerRadius</item>



        <!-- Toolbar attributes -->

        <item name="toolbarStyle">@style/Widget.DeviceDefault.Toolbar</item>

    </style>





    <!-- @hide DeviceDefault themes for the autofill FillUi -->

    <style name="Theme.DeviceDefault.Autofill" />

    <style name="Theme.DeviceDefault.Light.Autofill" />