commit 1b0cb472dde45eca551ab5b7cd394323001c0dd0
author Kunhung Li <kunhungli@google.com> Mon Apr 26 20:52:04 2021 +0800
committer Kunhung Li <kunhungli@google.com> Tue Apr 27 20:21:34 2021 +0800
tree 1b361dcd7b0a050abc18e515ca36fff6e63d2e75
parent 377b3b7ff2967891230be309f1ae45e276e70fb9

Fix collapsing toolbar does not stretch to top

Use getSystemWindowInsetTop() to keep status bar height for
CategorySelector and IndividualPicker fragments.

Bug: 186382184
Test: manual
Change-Id: I6cfa42cd7aab130b6602d9e668394c07a6130e2a

src/com/android/wallpaper/picker/CategorySelectorFragment.java

diff --git a/src/com/android/wallpaper/picker/CategorySelectorFragment.java b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
index 65c3819..4c04942 100644
--- a/src/com/android/wallpaper/picker/CategorySelectorFragment.java
+++ b/src/com/android/wallpaper/picker/CategorySelectorFragment.java
@@ -158,11 +158,19 @@
         }
 
         // For nav bar edge-to-edge effect.
-        view.findViewById(R.id.category_grid).setOnApplyWindowInsetsListener((v, windowInsets) -> {
+        view.setOnApplyWindowInsetsListener((v, windowInsets) -> {
+            // For status bar height.
             v.setPadding(
                     v.getPaddingLeft(),
-                    v.getPaddingTop(),
+                    windowInsets.getSystemWindowInsetTop(),
                     v.getPaddingRight(),
+                    v.getPaddingBottom());
+
+            View gridView = v.findViewById(R.id.category_grid);
+            gridView.setPadding(
+                    gridView.getPaddingLeft(),
+                    gridView.getPaddingTop(),
+                    gridView.getPaddingRight(),
                     windowInsets.getSystemWindowInsetBottom());
             return windowInsets.consumeSystemWindowInsets();
         });

src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java

diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
index 2277a99..655187f 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
@@ -520,11 +520,19 @@
         maybeSetUpImageGrid();
         setUpBottomSheet();
         // For nav bar edge-to-edge effect.
-        view.findViewById(R.id.wallpaper_grid).setOnApplyWindowInsetsListener((v, windowInsets) -> {
+        view.setOnApplyWindowInsetsListener((v, windowInsets) -> {
+            // For status bar height.
             v.setPadding(
                     v.getPaddingLeft(),
-                    v.getPaddingTop(),
+                    windowInsets.getSystemWindowInsetTop(),
                     v.getPaddingRight(),
+                    v.getPaddingBottom());
+
+            View gridView = v.findViewById(R.id.wallpaper_grid);
+            gridView.setPadding(
+                    gridView.getPaddingLeft(),
+                    gridView.getPaddingTop(),
+                    gridView.getPaddingRight(),
                     windowInsets.getSystemWindowInsetBottom());
             return windowInsets.consumeSystemWindowInsets();
         });