TP: Minor style fixes

Use the correct color to inherit from dark/light theme and to get
a proper divider on the bottom nav.

Bug: 120560581
Change-Id: I5053f02ad46a1c4f22d93d59296d407f7fb0e408
diff --git a/res/layout/fragment_theme_picker.xml b/res/layout/fragment_theme_picker.xml
index ef40334..245a22c 100644
--- a/res/layout/fragment_theme_picker.xml
+++ b/res/layout/fragment_theme_picker.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/category_picker_background_color">
+    android:background="?android:colorPrimary">
     <include layout="@layout/section_header"/>
 
     <com.android.customization.widget.PreviewPager
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4e5103c..5ecac90 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,7 +18,7 @@
     <style name="CustomizationTheme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="colorPrimary">?android:colorPrimary</item>
 
-        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:statusBarColor">?android:colorPrimary</item>
         <item name="android:windowLightStatusBar">true</item>
 
         <item name="android:navigationBarColor">@color/system_navigation_bar_background</item>
@@ -37,13 +37,14 @@
         <item name="itemTextColor">@color/bottom_nav_item_color</item>
         <item name="itemTextAppearanceActive">@style/BottomNavTextAppearance</item>
         <item name="itemTextAppearanceInactive">@style/BottomNavTextAppearance</item>
+         <item name="android:background">?android:colorPrimary</item>
     </style>
 
-    <style name="BottomNavTextAppearance" parent="@android:style/TextAppearance.Small">
+    <style name="BottomNavTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Small">
         <item name="android:textStyle">bold</item>
     </style>
     <style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">
-        <item name="android:background">@color/primary_color</item>
+        <item name="android:background">?android:colorPrimary</item>
         <item name="android:elevation">0dp</item>
     </style>
 
@@ -51,7 +52,7 @@
 
     <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
 
-    <style name="OptionTitleTextAppearance" parent="@android:style/TextAppearance.Small">
+    <style name="OptionTitleTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Small">
         <item name="android:textColor">@color/option_title_color</item>
     </style>