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

Commit ef0f8a4d authored by Mill Chen's avatar Mill Chen Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Update dialog background color for dark theme""" into qt-dev

parents 69faee73 9862f863

res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>

    <color name="contextual_card_background">@*android:color/material_grey_900</color>

    <color name="search_bar_background">@*android:color/material_grey_800</color>

    <!-- Dialog background color -->

    <color name="dialog_background">@*android:color/material_grey_800</color>

    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>

    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->

    <color name="notification_importance_button_unselected">#5F6368</color>

res/values-night/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">

        <item name="colorAccent">@*android:color/accent_device_default_dark</item>

        <item name="android:colorBackground">@color/dialog_background</item>

    </style>



</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -144,4 +144,7 @@ 
    <!-- Search bar background color -->

    <color name="search_bar_background">@android:color/white</color>



    <!-- Dialog background color -->

    <color name="dialog_background">@*android:color/background_device_default_light</color>



</resources>
 
 No newline at end of file

res/values/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ 


    <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">

        <item name="colorAccent">@*android:color/accent_device_default_light</item>

        <item name="android:colorBackground">@color/dialog_background</item>

    </style>



    <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">

src/com/android/settings/accessibility/HearingAidDialogFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package com.android.settings.accessibility;



import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.DialogInterface;

import android.os.Bundle;



import androidx.appcompat.app.AlertDialog;



import com.android.settings.R;

import com.android.settings.bluetooth.BluetoothPairingDetail;

import com.android.settings.core.SubSettingLauncher;