From b69d8c3939eea60bebfbcd8da53304097cdb3c96 Mon Sep 17 00:00:00 2001
From: Pranav Vashi <neobuddy89@gmail.com>
Date: Mon, 6 Dec 2021 01:59:47 +0530
Subject: [PATCH] Settings: Fix up panel theme and layout

* Ref: https://github.com/omnirom/android_packages_apps_Settings/commit/1f7b774ff240f3b5f5c8087d3a259a9bb31fd0aa
* The reference commit is incomplete.

Change-Id: I2f623b24447b5d8c3988a0061294faf471818c51
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
---
 res/drawable/settings_panel_background.xml                  | 6 +++---
 .../settings_panel_rounded_top_corner_background.xml        | 4 ++--
 res/values-night/colors.xml                                 | 3 ++-
 res/values/colors.xml                                       | 2 +-
 res/values/dimens.xml                                       | 2 +-
 res/values/styles.xml                                       | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/res/drawable/settings_panel_background.xml b/res/drawable/settings_panel_background.xml
index adb4646ccc3..15821f69272 100644
--- a/res/drawable/settings_panel_background.xml
+++ b/res/drawable/settings_panel_background.xml
@@ -16,7 +16,7 @@
 
 <inset xmlns:android="http://schemas.android.com/apk/res/android" android:inset="4dp">
     <shape android:shape="rectangle">
-        <corners android:radius="?android:attr/dialogCornerRadius" />
-        <solid android:color="?android:attr/colorBackground" />
+        <corners android:radius="@*android:dimen/config_dialogCornerRadius" />
+        <solid android:color="@color/contextual_card_background" />
     </shape>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/res/drawable/settings_panel_rounded_top_corner_background.xml b/res/drawable/settings_panel_rounded_top_corner_background.xml
index 1c234cca9b3..06eae8b2818 100644
--- a/res/drawable/settings_panel_rounded_top_corner_background.xml
+++ b/res/drawable/settings_panel_rounded_top_corner_background.xml
@@ -21,6 +21,6 @@
             android:topRightRadius="@dimen/settings_panel_corner_radius"
             android:bottomLeftRadius="0dp"
             android:bottomRightRadius="0dp"/>
-        <solid android:color="?android:attr/colorBackground" />
+        <solid android:color="@color/contextual_card_background" />
     </shape>
-</inset>
\ No newline at end of file
+</inset>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 53d2e9bc13e..ae766ee78ed 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -29,7 +29,8 @@
     <color name="homepage_red_bg">@color/m3_ref_palette_red80</color>
     <color name="homepage_purple_bg">@color/m3_ref_palette_purple80</color>
 
-    <color name="contextual_card_background">@*android:color/material_grey_900</color>
+    <color name="contextual_card_dismissal_background">@*android:color/background_device_default_dark</color>
+    <color name="contextual_card_background">@*android:color/background_device_default_dark</color>
     <color name="notification_importance_button_unselected">#5F6368</color>
 
     <!-- Palette list preference colors. -->
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e71636cf57e..c22d88edb56 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -116,7 +116,7 @@
     <color name="homepage_purple_fg">@color/m3_ref_palette_purple30</color>
     <color name="homepage_purple_bg">@color/m3_ref_palette_purple90</color>
 
-    <color name="contextual_card_dismissal_background">@*android:color/material_grey_100</color>
+    <color name="contextual_card_dismissal_background">@*android:color/background_device_default_light</color>
     <color name="contextual_card_background">@*android:color/background_device_default_light</color>
     <!-- End of dashboard/homepage icon background colors -->
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1690361db3d..7fbd86a70d6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -424,7 +424,7 @@
     <dimen name="notif_channel_panel_max_height">600dp</dimen>
 
     <!-- Settings panel related dimensions -->
-    <dimen name="settings_panel_corner_radius">28dp</dimen>
+    <dimen name="settings_panel_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>
     <dimen name="settings_panel_title_margin">24dp</dimen>
     <dimen name="settings_panel_title_margin_bottom">16dp</dimen>
     <dimen name="settings_panel_width">@dimen/match_parent</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e1aab016195..c319202ba39 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -530,7 +530,7 @@
     <style name="Widget.SliceView.Panel">
         <item name="titleSize">16sp</item>
         <item name="rowStyle">@style/SliceRow</item>
-        <item name="android:background">?android:attr/colorBackgroundFloating</item>
+        <item name="android:background">@color/contextual_card_background</item>
     </style>
 
     <style name="Widget.SliceView.Panel.Slider">