Merge "Provide mandatory gesture insets from the shell caption" into udc-qpr-dev (ece7006f) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,9 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
		mCaptionInsetsRect.bottom = mCaptionInsetsRect.top + captionHeight + params.mCaptionY;
		wct.addInsetsSource(mTaskInfo.token,
		mOwner, 0 /* index */, WindowInsets.Type.captionBar(), mCaptionInsetsRect);
		wct.addInsetsSource(mTaskInfo.token,
		mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures(),
		mCaptionInsetsRect);
		} else {
		startT.hide(mCaptionContainerSurface);
		}
		@@ -345,6 +348,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer>
		final WindowContainerTransaction wct = mWindowContainerTransactionSupplier.get();
		wct.removeInsetsSource(mTaskInfo.token,
		mOwner, 0 /* index */, WindowInsets.Type.captionBar());
		wct.removeInsetsSource(mTaskInfo.token,
		mOwner, 0 /* index */, WindowInsets.Type.mandatorySystemGestures());
		mTaskOrganizer.applyTransaction(wct);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -316,7 +316,8 @@ public class WindowDecorationTests extends ShellTestCase {
		releaseOrder.verify(t).remove(captionContainerSurface);
		releaseOrder.verify(t).remove(decorContainerSurface);
		releaseOrder.verify(t).apply();
		verify(mMockWindowContainerTransaction)
		// Expect to remove two insets sources, the caption insets and the mandatory gesture insets.
		verify(mMockWindowContainerTransaction, Mockito.times(2))
		.removeInsetsSource(eq(taskInfo.token), any(), anyInt(), anyInt());
		}