Merge "Fix wrong padding on global actions dialog" into rvc-dev

1 files changed, 4 insertions, 3 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
index e6af36b2c86b..2c080b8efc63 100644
--- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -43,7 +43,6 @@ import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Color;
-import android.graphics.Insets;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
@@ -2178,8 +2177,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
             ViewGroup root = (ViewGroup) mGlobalActionsLayout.getRootView();
             root.setOnApplyWindowInsetsListener((v, windowInsets) -> {
                 if (mControlsUiController != null) {
-                    Insets insets = windowInsets.getInsets(WindowInsets.Type.all());
-                    root.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                    root.setPadding(windowInsets.getStableInsetLeft(),
+                            windowInsets.getStableInsetTop(),
+                            windowInsets.getStableInsetRight(),
+                            windowInsets.getStableInsetBottom());
                 }
                 return WindowInsets.CONSUMED;
             });