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

Merge "Fix GAR color constrast issue on dialog" into sc-dev am: 958e587314 am: 38b44d2acc am: 8ece4916a6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732242

Change-Id: Ibcc516ee379152e7ec5ac176369ec0c998714fa6
This commit is contained in:
TreeHugger Robot
2021-05-31 12:37:31 +00:00
committed by Automerger Merge Worker
parent 7aef1e1cc2 8ece4916a6
commit 118b32e524
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,6 @@
<color name="homepage_support_background">#3F5FBD</color>
<color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
<color name="contextual_card_background">@*android:color/material_grey_900</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>

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

@@ -15,7 +15,8 @@
limitations under the License.
-->
<resources>
<resources
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
<item name="colorPrimary">@*android:color/primary_device_default_settings</item>
@@ -31,7 +32,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>
<item name="android:colorBackground">?androidprv:attr/colorSurface</item>
</style>
<!-- Material theme for the pages containing TabLayout and ViewPager -->

3
res/values/colors.xml
View File

@@ -147,9 +147,6 @@
<!-- Search bar background color -->
<color name="search_bar_background">?androidprv:attr/colorSurface</color>
<!-- Dialog background color -->
<color name="dialog_background">@*android:color/background_device_default_light</color>
<color name="face_intro_outline">#ffdadce0</color>
<color name="back_gesture_indicator">#4182ef</color>

5
res/values/themes.xml
View File

@@ -14,7 +14,8 @@
limitations under the License.
-->
<resources>
<resources
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<style name="Transparent">
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
@@ -129,7 +130,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>
<item name="android:colorBackground">?androidprv:attr/colorSurface</item>
</style>
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">