From 1777a1be4fe3554ee2bb135c2667b373eaa3dab8 Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Wed, 28 Apr 2021 19:35:22 +0100
Subject: [PATCH] Use widget picker color surface for WidgetsBottomSheet

Test: Launch widgets bottom sheet, search popup to confirm the expected
      background color is applied.
Bug: 183601302
Change-Id: I300a364605e00a0d8046a907a40f4cb797ec161e
---
 ...ct_primary.xml => widgets_bottom_sheet_background.xml} | 8 ++++----
 res/layout/widgets_bottom_sheet.xml                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename res/drawable/{top_round_rect_primary.xml => widgets_bottom_sheet_background.xml} (85%)

diff --git a/res/drawable/top_round_rect_primary.xml b/res/drawable/widgets_bottom_sheet_background.xml
similarity index 85%
rename from res/drawable/top_round_rect_primary.xml
rename to res/drawable/widgets_bottom_sheet_background.xml
index 1caaa026f0..faa414c506 100644
--- a/res/drawable/top_round_rect_primary.xml
+++ b/res/drawable/widgets_bottom_sheet_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2018 The Android Open Source Project
+     Copyright (C) 2021 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
      limitations under the License.
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <solid android:color="?android:attr/colorPrimary" />
+    android:shape="rectangle">
+    <solid android:color="@color/widgets_picker_surface" />
     <corners
         android:topLeftRadius="@dimen/bg_round_rect_radius"
         android:topRightRadius="@dimen/bg_round_rect_radius"
         android:bottomLeftRadius="0dp"
         android:bottomRightRadius="0dp"
         />
-</shape>
+</shape>
\ No newline at end of file
diff --git a/res/layout/widgets_bottom_sheet.xml b/res/layout/widgets_bottom_sheet.xml
index 8002d1ddc7..08635c6e60 100644
--- a/res/layout/widgets_bottom_sheet.xml
+++ b/res/layout/widgets_bottom_sheet.xml
@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="16dp"
-    android:background="@drawable/top_round_rect_primary"
+    android:background="@drawable/widgets_bottom_sheet_background"
     android:elevation="@dimen/deep_shortcuts_elevation"
     android:layout_gravity="bottom"
     android:theme="?attr/widgetsTheme">