Merge "Request application of WindowInsets when setting a content view" into mnc-dev (40359f73) · Commits · e / os / android_frameworks_base

core/java/android/service/voice/VoiceInteractionSession.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1142,7 +1142,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
		mContentFrame.addView(view, new FrameLayout.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		ViewGroup.LayoutParams.MATCH_PARENT));

		mContentFrame.requestApplyInsets();
		}

		/** @hide */

+3 −0

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		} else {
		mLayoutInflater.inflate(layoutResID, mContentParent);
		}
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		cb.onContentChanged();
		@@ -419,6 +420,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		} else {
		mContentParent.addView(view, params);
		}
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		cb.onContentChanged();
		@@ -435,6 +437,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		Log.v(TAG, "addContentView does not support content transitions");
		}
		mContentParent.addView(view, params);
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		cb.onContentChanged();