SettingsIntelligence: Match Settings style
* Also fixes dark style
Change-Id: I42041fbaf754b149a85f22ac46b84f50830d0504
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 01f098c..ea5de7e 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -32,9 +32,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/search_bar_margin"
- app:cardCornerRadius="2dp"
- app:cardBackgroundColor="?android:attr/colorBackground"
- app:cardElevation="2dp">
+ app:cardCornerRadius="@*android:dimen/config_dialogCornerRadius"
+ app:cardElevation="3dp">
<Toolbar
android:id="@+id/search_toolbar"
android:layout_width="match_parent"
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000..399913a
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <color name="search_panel_background">@*android:color/material_grey_800</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a2105f0..632c72d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,5 +18,5 @@
<resources>
<color name="launcher_background_color">#ff008577</color>
- <color name="search_panel_background">#f2f2f2</color>
+ <color name="search_panel_background">@android:color/white</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8a40eb6..9491650 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -26,8 +26,8 @@
<!-- The following two margins need to match, with the caveat that
the second should be negative. The second one ensures that the icons and text
align despite the additional padding caused by the search bar's card background. -->
- <dimen name="search_bar_margin">8dp</dimen>
- <dimen name="search_bar_negative_margin">-8dp</dimen>
+ <dimen name="search_bar_margin">16dp</dimen>
+ <dimen name="search_bar_negative_margin">-16dp</dimen>
<dimen name="search_bar_height">48dp</dimen>
<dimen name="search_bar_text_size">16dp</dimen>