commit 51119b00ce6e841cf162ef4802609e2ecb7f00ef
author Kunhung Li <kunhungli@google.com> Wed Apr 28 01:22:07 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 28 01:22:07 2021 +0000
tree 6094a1bb2ee60d156330cabd0ca23f2f8bd9c777
parent 197cbffb611a8ce526386d5ec9926ddbb680d6f7
parent 202f4078db32f41e5f8088ec6ba401bb492d9944

Merge "Fix collapsing toolbar does not stretch to top" into sc-dev

res/values/styles.xml

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>

src/com/android/customization/picker/grid/GridFragment.java

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();