Merge "Fix View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION." (332d84a5) · Commits · e / os / android_frameworks_base

services/java/com/android/server/wm/TaskStack.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,10 @@ public class TaskStack {
		return mStackId == HOME_STACK_ID;
		}

		boolean hasSibling() {
		return mStackBox.mParent != null;
		}

		/**
		* Put a Task in this stack. Used for adding and moving.
		* @param task The task to add.

+7 −3

Original line number	Diff line number	Diff line
		@@ -461,8 +461,9 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		public void computeFrameLw(Rect pf, Rect df, Rect of, Rect cf, Rect vf) {
		mHaveFrame = true;

		if (mAppToken != null) {
		mContainingFrame.set(getStackBounds());
		TaskStack stack = mAppToken != null ? getStack() : null;
		if (stack != null && stack.hasSibling()) {
		mContainingFrame.set(getStackBounds(stack));
		if (mUnderStatusBar) {
		mContainingFrame.top = pf.top;
		}
		@@ -714,7 +715,10 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		}

		Rect getStackBounds() {
		TaskStack stack = getStack();
		return getStackBounds(getStack());
		}

		private Rect getStackBounds(TaskStack stack) {
		if (stack != null) {
		return stack.mStackBox.mBounds;
		}