Merge "Fix collapsing toolbar does not stretch to top" into sc-dev am: 51119b00ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/14305135

Change-Id: I4f08c221d609b56886b3c24c1831fc87767c03ef
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c8ce13b..a9cf80c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,6 +32,7 @@
     </style>
 
     <style name="CustomizationTheme.NoActionBar">
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index d9b4035..ab381ee 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -120,7 +120,7 @@
         view.setOnApplyWindowInsetsListener((v, windowInsets) -> {
             v.setPadding(
                     v.getPaddingLeft(),
-                    v.getPaddingTop(),
+                    windowInsets.getSystemWindowInsetTop(),
                     v.getPaddingRight(),
                     windowInsets.getSystemWindowInsetBottom());
             return windowInsets.consumeSystemWindowInsets();