Merge "Do not override insets frame if not set" into tm-dev (bfa7c5d2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayPolicy.java

+15 −13

Original line number	Diff line number	Diff line
		@@ -1190,7 +1190,8 @@ public class DisplayPolicy {
		if (attrs.providesInsetsTypes != null) {
		for (@InternalInsetsType int insetsType : attrs.providesInsetsTypes) {
		final TriConsumer<DisplayFrames, WindowContainer, Rect> imeFrameProvider =
		(displayFrames, windowContainer, inOutFrame) -> {
		win.getAttrs().providedInternalImeInsets != null
		? (displayFrames, windowContainer, inOutFrame) -> {
		final Insets[] providedInternalImeInsets =
		win.getLayoutingAttrs(displayFrames.mRotation)
		.providedInternalImeInsets;
		@@ -1199,7 +1200,7 @@ public class DisplayPolicy {
		&& providedInternalImeInsets[insetsType] != null) {
		inOutFrame.inset(providedInternalImeInsets[insetsType]);
		}
		};
		} : null;
		switch (insetsType) {
		case ITYPE_STATUS_BAR:
		mStatusBarAlt = win;
		@@ -1218,7 +1219,8 @@ public class DisplayPolicy {
		mExtraNavBarAltPosition = getAltBarPosition(attrs);
		break;
		}
		mDisplayContent.setInsetProvider(insetsType, win, (displayFrames,
		mDisplayContent.setInsetProvider(insetsType, win,
		win.getAttrs().providedInternalInsets != null ? (displayFrames,
		windowContainer, inOutFrame) -> {
		final Insets[] providedInternalInsets = win.getLayoutingAttrs(
		displayFrames.mRotation).providedInternalInsets;
		@@ -1228,7 +1230,7 @@ public class DisplayPolicy {
		inOutFrame.inset(providedInternalInsets[insetsType]);
		}
		inOutFrame.inset(win.mGivenContentInsets);
		}, imeFrameProvider);
		} : null, imeFrameProvider);
		mInsetsSourceWindowsExceptIme.add(win);
		}
		}