From 975ce0ec6c6acda7c65242b9e0bc8f642c9af367 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Wed, 8 May 2024 15:34:44 +0800
Subject: [PATCH] Fix the display problem of the cutout

- Add the WindowInsetsCompat.Type.displayCutout.

Fixes: 332514800
Test: atest com.android.settings.UtilsTest SettingsActivityTest
Change-Id: Ieb4ffb5a18c0babe3dd1c6f3482e8585899237f0
---
 src/com/android/settings/Utils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e067c730d60..f76ea279198 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1409,7 +1409,8 @@ public final class Utils extends com.android.settingslib.Utils {
         ViewCompat.setOnApplyWindowInsetsListener(activity.findViewById(android.R.id.content),
                 (v, windowInsets) -> {
                     Insets insets = windowInsets.getInsets(
-                            WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime());
+                            WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.ime()
+                                    | WindowInsetsCompat.Type.displayCutout());
                     int statusBarHeight = activity.getWindow().getDecorView().getRootWindowInsets()
                             .getInsets(WindowInsetsCompat.Type.statusBars()).top;
                     // Apply the insets paddings to the view.