Merge "Revert^2 "Notify DecorContentParent about content change"" into main (918fdc0f) · Commits · e / os / android_frameworks_base

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

+21 −6

Original line number	Diff line number	Diff line
		@@ -537,9 +537,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		if (!isDestroyed()) {
		if (cb != null) {
		cb.onContentChanged();
		}
		if (mDecorContentParent != null) {
		mDecorContentParent.notifyContentChanged();
		}
		}
		mContentParentExplicitlySet = true;
		}

		@@ -568,9 +573,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		if (!isDestroyed()) {
		if (cb != null) {
		cb.onContentChanged();
		}
		if (mDecorContentParent != null) {
		mDecorContentParent.notifyContentChanged();
		}
		}
		mContentParentExplicitlySet = true;
		}

		@@ -586,9 +596,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		mContentParent.addView(view, params);
		mContentParent.requestApplyInsets();
		final Callback cb = getCallback();
		if (cb != null && !isDestroyed()) {
		if (!isDestroyed()) {
		if (cb != null) {
		cb.onContentChanged();
		}
		if (mDecorContentParent != null) {
		mDecorContentParent.notifyContentChanged();
		}
		}
		}

		@Override

+7 −0

Original line number	Diff line number	Diff line
		@@ -898,6 +898,13 @@ public class ActionBarOverlayLayout extends ViewGroup implements DecorContentPar
		mDecorToolbar.dismissPopupMenus();
		}

		@Override
		public void notifyContentChanged() {
		mLastBaseContentInsets.setEmpty();
		mLastBaseInnerInsets = WindowInsets.CONSUMED;
		mLastInnerInsets = WindowInsets.CONSUMED;
		}

		public static class LayoutParams extends MarginLayoutParams {
		public LayoutParams(Context c, AttributeSet attrs) {
		super(c, attrs);

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.os.Parcelable;
		import android.util.SparseArray;
		import android.view.Menu;
		import android.view.Window;

		import com.android.internal.view.menu.MenuPresenter;

		/**
		@@ -49,4 +50,5 @@ public interface DecorContentParent {
		void saveToolbarHierarchyState(SparseArray<Parcelable> toolbarStates);
		void restoreToolbarHierarchyState(SparseArray<Parcelable> toolbarStates);
		void dismissPopups();
		void notifyContentChanged();
		}