Merge "Fix wrong padding on global actions dialog" into rvc-dev am: 7ee779c95d am: 0528f8e01a

Change-Id: I7a2cfbad6eafa909546d78598e59b3195cd153fc
This commit is contained in:
TreeHugger Robot
2020-04-15 17:49:27 +00:00
committed by Automerger Merge Worker

View File

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