Merge "Inset the non-overlay contextual action bar without a status guard" into lmp-dev (fe426d06) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -6601,6 +6601,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* @see #fitSystemWindows(Rect)
		* @see #setSystemUiVisibility(int)
		*/
		@ViewDebug.ExportedProperty
		public boolean getFitsSystemWindows() {
		return (mViewFlags & FITS_SYSTEM_WINDOWS) == FITS_SYSTEM_WINDOWS;
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -2929,6 +2929,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}
		}

		// The action mode's theme may differ from the app, so
		// always show the status guard above it if we have one.
		showStatusGuard = mStatusGuard != null;

		// We only need to consume the insets if the action
		// mode is overlaid on the app content (e.g. it's
		// sitting in a FrameLayout, see
		@@ -2936,11 +2940,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		final boolean nonOverlay = (getLocalFeatures()
		& (1 << FEATURE_ACTION_MODE_OVERLAY)) == 0;
		insets = insets.consumeSystemWindowInsets(
		false, nonOverlay /* top */, false, false);

		// The action mode's theme may differ from the app, so
		// always show the status guard above it.
		showStatusGuard = true;
		false, nonOverlay && showStatusGuard /* top */, false, false);
		} else {
		// reset top margin
		if (mlp.topMargin != 0) {