Merge "WM: Add PhoneWindowManagerLayoutTest" (b0bebcfa) · Commits · e / os / android_frameworks_base

core/java/android/os/UEventObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ public abstract class UEventObserver {
		* UEventObserver after this call. Repeated calls have no effect.
		*/
		public final void stopObserving() {
		final UEventThread t = getThread();
		final UEventThread t = peekThread();
		if (t != null) {
		t.removeObserver(this);
		}

services/core/java/com/android/server/policy/PhoneWindowManager.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@ import android.view.inputmethod.InputMethodManagerInternal;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.policy.IKeyguardDismissCallback;
		import com.android.internal.policy.IShortcutService;
		@@ -1053,7 +1054,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		private ImmersiveModeConfirmation mImmersiveModeConfirmation;

		private SystemGesturesPointerEventListener mSystemGestures;
		@VisibleForTesting
		SystemGesturesPointerEventListener mSystemGestures;

		IStatusBarService getStatusBarService() {
		synchronized (mServiceAquireLock) {
		@@ -2724,7 +2726,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		@Override
		public void onConfigurationChanged() {
		// TODO(multi-display): Define policy for secondary displays.
		Context uiContext = ActivityThread.currentActivityThread().getSystemUiContext();
		Context uiContext = getSystemUiContext();
		final Resources res = uiContext.getResources();

		mStatusBarHeight =
		@@ -2765,6 +2767,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		@VisibleForTesting
		Context getSystemUiContext() {
		return ActivityThread.currentActivityThread().getSystemUiContext();
		}

		@Override
		public int getMaxWallpaperLayer() {
		return getWindowLayerFromTypeLw(TYPE_STATUS_BAR);

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
		*/
		public void computeFrameLw(Rect parentFrame, Rect displayFrame,
		Rect overlayFrame, Rect contentFrame, Rect visibleFrame, Rect decorFrame,
		Rect stableFrame, Rect outsetFrame);
		Rect stableFrame, @Nullable Rect outsetFrame);

		/**
		* Retrieve the current frame of the window that has been assigned by

services/tests/servicestests/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		platform-test-annotations \
		ShortcutManagerTestUtils \
		truth-prebuilt \
		testables \
		testng

		LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/aidl

services/tests/servicestests/src/com/android/server/policy/FakeWindowState.java

0 → 100644

+252 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.policy;

		import android.annotation.Nullable;
		import android.graphics.Point;
		import android.graphics.Rect;
		import android.view.Display;
		import android.view.IApplicationToken;
		import android.view.WindowManager;

		public class FakeWindowState implements WindowManagerPolicy.WindowState {

		public final Rect parentFrame = new Rect();
		public final Rect displayFrame = new Rect();
		public final Rect overscanFrame = new Rect();
		public final Rect contentFrame = new Rect();
		public final Rect visibleFrame = new Rect();
		public final Rect decorFrame = new Rect();
		public final Rect stableFrame = new Rect();
		public Rect outsetFrame = new Rect();

		public WindowManager.LayoutParams attrs;
		public int displayId;
		public boolean isVoiceInteraction;
		public boolean inMultiWindowMode;
		public boolean visible = true;
		public int surfaceLayer = 1;

		public boolean policyVisible = true;

		@Override
		public int getOwningUid() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public String getOwningPackage() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public void computeFrameLw(Rect parentFrame, Rect displayFrame, Rect overlayFrame,
		Rect contentFrame, Rect visibleFrame, Rect decorFrame, Rect stableFrame,
		@Nullable Rect outsetFrame) {
		this.parentFrame.set(parentFrame);
		this.displayFrame.set(displayFrame);
		this.overscanFrame.set(overlayFrame);
		this.contentFrame.set(contentFrame);
		this.visibleFrame.set(visibleFrame);
		this.decorFrame.set(decorFrame);
		this.stableFrame.set(stableFrame);
		this.outsetFrame = outsetFrame == null ? null : new Rect(outsetFrame);
		}

		@Override
		public Rect getFrameLw() {
		return parentFrame;
		}

		@Override
		public Point getShownPositionLw() {
		return new Point(parentFrame.left, parentFrame.top);
		}

		@Override
		public Rect getDisplayFrameLw() {
		return displayFrame;
		}

		@Override
		public Rect getOverscanFrameLw() {
		return overscanFrame;
		}

		@Override
		public Rect getContentFrameLw() {
		return contentFrame;
		}

		@Override
		public Rect getVisibleFrameLw() {
		return visibleFrame;
		}

		@Override
		public boolean getGivenInsetsPendingLw() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public Rect getGivenContentInsetsLw() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public Rect getGivenVisibleInsetsLw() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public WindowManager.LayoutParams getAttrs() {
		return attrs;
		}

		@Override
		public boolean getNeedsMenuLw(WindowManagerPolicy.WindowState bottom) {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public int getSystemUiVisibility() {
		return attrs.systemUiVisibility \| attrs.subtreeSystemUiVisibility;
		}

		@Override
		public int getSurfaceLayer() {
		return surfaceLayer;
		}

		@Override
		public int getBaseType() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public IApplicationToken getAppToken() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isVoiceInteraction() {
		return isVoiceInteraction;
		}

		@Override
		public boolean hasAppShownWindows() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isVisibleLw() {
		return visible && policyVisible;
		}

		@Override
		public boolean isDisplayedLw() {
		return isVisibleLw();
		}

		@Override
		public boolean isAnimatingLw() {
		return false;
		}

		@Override
		public boolean canAffectSystemUiFlags() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isGoneForLayoutLw() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isDrawnLw() {
		return true;
		}

		@Override
		public boolean hasDrawnLw() {
		return true;
		}

		@Override
		public boolean hideLw(boolean doAnimation) {
		if (!policyVisible) {
		return false;
		}
		policyVisible = false;
		return true;
		}

		@Override
		public boolean showLw(boolean doAnimation) {
		if (policyVisible) {
		return false;
		}
		policyVisible = true;
		return true;
		}

		@Override
		public boolean isAlive() {
		return true;
		}

		@Override
		public boolean isDefaultDisplay() {
		return displayId == Display.DEFAULT_DISPLAY;
		}

		@Override
		public boolean isDimming() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public int getWindowingMode() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isInMultiWindowMode() {
		return inMultiWindowMode;
		}

		@Override
		public int getRotationAnimationHint() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public boolean isInputMethodWindow() {
		throw new UnsupportedOperationException("not implemented");
		}

		@Override
		public int getDisplayId() {
		return displayId;
		}

		@Override
		public boolean canAcquireSleepToken() {
		throw new UnsupportedOperationException("not implemented");
		}
		}