Merge "Fix ThemePicker robo test build." into ub-launcher3-qt-dev
diff --git a/res/drawable/ic_close_24px.xml b/res/drawable/ic_close_24px.xml
index ff1d2d5..d5cdfab 100644
--- a/res/drawable/ic_close_24px.xml
+++ b/res/drawable/ic_close_24px.xml
@@ -2,7 +2,8 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="@color/toolbar_icon_color">
<path
android:fillColor="#FF000000"
android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41z"/>
diff --git a/res/drawable/ic_delete_24px.xml b/res/drawable/ic_delete_24px.xml
index f82e18d..5e4bdae 100644
--- a/res/drawable/ic_delete_24px.xml
+++ b/res/drawable/ic_delete_24px.xml
@@ -17,7 +17,8 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="@color/toolbar_icon_color">
<path
android:fillColor="#FF000000"
android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index ebb867b..edd414d 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -30,4 +30,7 @@
<color name="tip_dot_color">#81C995</color>
<color name="tip_dot_line_color">#000000</color>
+
+ <color name="toolbar_icon_color">@color/text_color_light</color>
+ <color name="toolbar_color">#000000</color>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index fa54e36..8e30525 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -47,4 +47,7 @@
<color name="tip_dot_color">#34A853</color>
<color name="tip_dot_line_color">#FFFFFF</color>
+
+ <color name="toolbar_icon_color">@color/text_color_dark</color>
+ <color name="toolbar_color">@color/material_white_100</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 753a877..1b69e3d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,6 +26,9 @@
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="dialogPreferredPadding">24dp</item>
<item name="colorControlHighlight">@color/ripple_material_dark</item>
+
+ <item name="actionButtonStyle">?android:actionButtonStyle</item>
+ <item name="actionMenuTextColor">?android:actionMenuTextColor</item>
</style>
<style name="CustomizationTheme.NoActionBar">
<item name="android:windowActionBar">false</item>
@@ -46,7 +49,9 @@
<item name="android:textSize">@dimen/bottom_navbar_font_text_size</item>
</style>
<style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
+ <item name="android:background">@color/toolbar_color</item>
<item name="android:elevation">0dp</item>
+ <item name="android:theme">@style/WallpaperTheme</item>
</style>
<style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>