Merge "Account for cutouts in system insets (as done previously)" into rvc-qpr-dev (a03cd95a) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorView.java

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1094,13 +1094,15 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
	mLastWindowFlags = attrs.flags;		mLastWindowFlags = attrs.flags;

	if (insets != null) {		if (insets != null) {
	final Insets systemBarInsets = insets.getInsets(WindowInsets.Type.systemBars());
	final Insets stableBarInsets = insets.getInsetsIgnoringVisibility(		final Insets stableBarInsets = insets.getInsetsIgnoringVisibility(
	WindowInsets.Type.systemBars());		WindowInsets.Type.systemBars());
	mLastTopInset = systemBarInsets.top;		final Insets systemInsets = Insets.min(
	mLastBottomInset = systemBarInsets.bottom;		insets.getInsets(WindowInsets.Type.systemBars()
	mLastRightInset = systemBarInsets.right;		\| WindowInsets.Type.displayCutout()), stableBarInsets);
	mLastLeftInset = systemBarInsets.left;		mLastTopInset = systemInsets.top;
			mLastBottomInset = systemInsets.bottom;
			mLastRightInset = systemInsets.right;
			mLastLeftInset = systemInsets.left;

	// Don't animate if the presence of stable insets has changed, because that		// Don't animate if the presence of stable insets has changed, because that
	// indicates that the window was either just added and received them for the		// indicates that the window was either just added and received them for the