Merge "Remove TYPE_UNIVERSE_BACKGROUND from system" (5d497129) · Commits · e / os / android_frameworks_base

core/java/android/view/IWindowSession.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -188,9 +188,6 @@ interface IWindowSession {

		void wallpaperCommandComplete(IBinder window, in Bundle result);

		void setUniverseTransform(IBinder window, float alpha, float offx, float offy,
		float dsdx, float dtdx, float dsdy, float dtdy);

		/**
		* Notifies that a rectangle on the screen has been requested.
		*/

core/java/android/view/WindowManager.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -500,13 +500,6 @@ public interface WindowManager extends ViewManager {
		*/
		public static final int TYPE_NAVIGATION_BAR_PANEL = FIRST_SYSTEM_WINDOW+24;

		/**
		* Window type: Behind the universe of the real windows.
		* In multiuser systems shows on all users' windows.
		* @hide
		*/
		public static final int TYPE_UNIVERSE_BACKGROUND = FIRST_SYSTEM_WINDOW+25;

		/**
		* Window type: Display overlay window. Used to simulate secondary display devices.
		* In multiuser systems shows on all users' windows.

core/java/android/view/WindowManagerPolicy.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -578,13 +578,6 @@ public interface WindowManagerPolicy {
		*/
		public int getMaxWallpaperLayer();

		/**
		* Return the window layer at which windows appear above the normal
		* universe (that is no longer impacted by the universe background
		* transform).
		*/
		public int getAboveUniverseLayer();

		/**
		* Return the display width available after excluding any screen
		* decorations that can never be removed. That is, system bar or

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -1723,7 +1723,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		case TYPE_STATUS_BAR_PANEL:
		case TYPE_STATUS_BAR_SUB_PANEL:
		case TYPE_SYSTEM_DIALOG:
		case TYPE_UNIVERSE_BACKGROUND:
		case TYPE_VOLUME_OVERLAY:
		case TYPE_PRIVATE_PRESENTATION:
		break;
		@@ -1822,8 +1821,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return 2;
		}
		switch (type) {
		case TYPE_UNIVERSE_BACKGROUND:
		return 1;
		case TYPE_PRIVATE_PRESENTATION:
		return 2;
		case TYPE_WALLPAPER:
		@@ -1934,11 +1931,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return windowTypeToLayerLw(TYPE_STATUS_BAR);
		}

		@Override
		public int getAboveUniverseLayer() {
		return windowTypeToLayerLw(TYPE_SYSTEM_ERROR);
		}

		@Override
		public int getNonDecorDisplayWidth(int fullWidth, int fullHeight, int rotation) {
		if (mHasNavigationBar) {
		@@ -1997,7 +1989,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		case TYPE_NAVIGATION_BAR:
		case TYPE_WALLPAPER:
		case TYPE_DREAM:
		case TYPE_UNIVERSE_BACKGROUND:
		case TYPE_KEYGUARD_SCRIM:
		return false;
		default:
		@@ -3769,8 +3760,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		+ mOverscanScreenWidth;
		pf.bottom = df.bottom = of.bottom = cf.bottom = mOverscanScreenTop
		+ mOverscanScreenHeight;
		} else if (attrs.type == TYPE_BOOT_PROGRESS
		\|\| attrs.type == TYPE_UNIVERSE_BACKGROUND) {
		} else if (attrs.type == TYPE_BOOT_PROGRESS) {
		// Boot progress screen always covers entire display.
		pf.left = df.left = of.left = cf.left = mOverscanScreenLeft;
		pf.top = df.top = of.top = cf.top = mOverscanScreenTop;

services/core/java/com/android/server/wm/AccessibilityController.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -606,9 +606,8 @@ final class AccessibilityController {
		final int windowCount = windowList.size();
		for (int i = 0; i < windowCount; i++) {
		WindowState windowState = windowList.get(i);
		if ((windowState.isOnScreen() \|\| windowState.mAttrs.type == WindowManager
		.LayoutParams.TYPE_UNIVERSE_BACKGROUND)
		&& !windowState.mWinAnimator.mEnterAnimationPending) {
		if (windowState.isOnScreen() &&
		!windowState.mWinAnimator.mEnterAnimationPending) {
		outWindows.put(windowState.mLayer, windowState);
		}
		}
		@@ -1237,7 +1236,6 @@ final class AccessibilityController {
		&& windowType != WindowManager.LayoutParams.TYPE_DRAG
		&& windowType != WindowManager.LayoutParams.TYPE_HIDDEN_NAV_CONSUMER
		&& windowType != WindowManager.LayoutParams.TYPE_POINTER
		&& windowType != WindowManager.LayoutParams.TYPE_UNIVERSE_BACKGROUND
		&& windowType != WindowManager.LayoutParams.TYPE_MAGNIFICATION_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY
		&& windowType != WindowManager.LayoutParams.TYPE_SECURE_SYSTEM_OVERLAY