Merge "Extract common logic for handling my photos" into ub-launcher3-master
diff --git a/res/layout/fragment_category_picker.xml b/res/layout/fragment_category_picker.xml
index 83bd7aa..51bf8d7 100755
--- a/res/layout/fragment_category_picker.xml
+++ b/res/layout/fragment_category_picker.xml
@@ -18,7 +18,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/category_picker_background_color">
+ android:background="?android:colorPrimary">
<include layout="@layout/section_header"/>
<androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/section_header.xml b/res/layout/section_header.xml
index 5c63fc3..7ca9ec0 100644
--- a/res/layout/section_header.xml
+++ b/res/layout/section_header.xml
@@ -26,7 +26,7 @@
style="@style/RegularToolbarStyle"
android:id="@+id/toolbar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="?android:attr/actionBarSize"
android:layout_gravity="top"
app:layout_scrollFlags="scroll|enterAlways">
<TextView
diff --git a/res/values-notnight-v27/styles.xml b/res/values-notnight-v27/styles.xml
index b3a7ccf..581ef68 100755
--- a/res/values-notnight-v27/styles.xml
+++ b/res/values-notnight-v27/styles.xml
@@ -17,8 +17,8 @@
<style name="WallpaperTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="colorControlActivated">?attr/colorPrimary</item>
- <item name="colorControlNormal">@color/accent_color</item>
- <item name="android:statusBarColor">@color/status_bar_color</item>
+ <item name="colorControlNormal">?attr/colorAccent</item>
+ <item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">#ffffffff</item>
@@ -26,4 +26,5 @@
<item name="android:windowLightNavigationBar">true</item>
</style>
+ <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar"/>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2d01222..9001971 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,7 +25,8 @@
<color name="material_black_100">#000000</color>
<color name="material_white_divider">#1fffffff</color>
-
+ <color name="text_color_dark">#2d2d2d</color>
+ <color name="text_color_light">@color/material_white_text</color>
<color name="primary_color">#2d2d2d</color>
<color name="secondary_color">#3a3a3a</color>
<color name="accent_color">@color/material_googblue500</color>
diff --git a/res/values/picker_colors.xml b/res/values/picker_colors.xml
index 7ebac09..f3686de 100755
--- a/res/values/picker_colors.xml
+++ b/res/values/picker_colors.xml
@@ -53,7 +53,7 @@
<color name="currently_set_both_attribution_title_text_color">@color/material_white_text</color>
<color name="currently_set_both_attribution_subtitle_text_color">@color/white_70_alpha</color>
- <color name="select_wallpaper_header_text_color">@color/translucent_black_60_alpha</color>
+ <color name="select_wallpaper_header_text_color">@color/white_60_alpha</color>
<color name="rotation_tile_enabled_background_color">@color/accent_color</color>
<color name="rotation_tile_enabled_title_text_color">@color/material_white_100</color>
@@ -67,7 +67,7 @@
<color name="individual_tile_title_scrim_color">@color/translucent_black</color>
<color name="individual_tile_title_text_color">@color/material_white_100</color>
- <color name="individual_picker_background_color">@color/material_grey200</color>
+ <color name="individual_picker_background_color">@color/translucent_black</color>
<color name="preview_pane_arrow_color">@color/material_white_100</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bd840d0..8ded2e2 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,7 +17,7 @@
<style name="WallpaperTheme" parent="@style/Theme.AppCompat.NoActionBar">
<item name="colorControlActivated">?attr/colorPrimary</item>
- <item name="android:statusBarColor">@color/status_bar_color</item>
+ <item name="android:statusBarColor">?attr/colorPrimary</item>
</style>
<style name="WallpaperTheme.Preview" parent="@style/Theme.AppCompat.NoActionBar">
@@ -48,10 +48,7 @@
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
</style>
- <style name="LightDialogTheme" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
- <item name="android:dialogCornerRadius">8dp</item>
- <item name="colorAccent">@color/accent_color</item>
- </style>
+ <style name="LightDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar"/>
<style name="ProgressDialogThemePreL" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
<item name="android:windowBackground">@android:color/transparent</item>
@@ -88,7 +85,7 @@
<item name="android:background">?attr/selectableItemBackground</item>
<item name="android:drawablePadding">@dimen/set_wallpaper_dialog_item_drawable_padding
</item>
- <item name="android:drawableTint">@color/accent_color</item>
+ <item name="android:drawableTint">?android:colorAccent</item>
<item name="android:drawableTintMode">src_atop</item>
</style>