PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 388cca892a

Change-Id: I81afb0ca38b57e72fa1f7690ef654b3d69dc790f
This commit is contained in:
Mill Chen
2019-05-22 07:24:48 -07:00
committed by android-build-merger
parent ba572939ba 388cca892a
commit fa23fcc795
5 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values-night/colors.xml
View File

@@ -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>

1
res/values-night/themes.xml
View File

@@ -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>

3
res/values/colors.xml
View File

@@ -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>

1
res/values/themes.xml
View File

@@ -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">

3
src/com/android/settings/accessibility/HearingAidDialogFragment.java
View File

@@ -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;