Merge "Change TYPE_DREAM logic to use ACTIVITY_TYPE_DREAM" into rvc-dev am:... (eabda20a) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55762,7 +55762,7 @@ package android.view {
	field public int softInputMode;		field public int softInputMode;
	field @Deprecated public int systemUiVisibility;		field @Deprecated public int systemUiVisibility;
	field public android.os.IBinder token;		field public android.os.IBinder token;
	field @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION, to="BASE_APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION, to="APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING, to="APPLICATION_STARTING"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION, to="DRAWN_APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL, to="APPLICATION_PANEL"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA, to="APPLICATION_MEDIA"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL, to="APPLICATION_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=0x3ed, to="APPLICATION_ABOVE_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG, to="APPLICATION_ATTACHED_DIALOG"), @android.view.ViewDebug.IntToString(from=0x3ec, to="APPLICATION_MEDIA_OVERLAY"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR, to="STATUS_BAR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR, to="SEARCH_BAR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PHONE, to="PHONE"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT, to="SYSTEM_ALERT"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_TOAST, to="TOAST"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY, to="SYSTEM_OVERLAY"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE, to="PRIORITY_PHONE"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG, to="SYSTEM_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, to="KEYGUARD_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR, to="SYSTEM_ERROR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD, to="INPUT_METHOD"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG, to="INPUT_METHOD_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_WALLPAPER, to="WALLPAPER"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, to="STATUS_BAR_PANEL"), @android.view.ViewDebug.IntToString(from=0x7df, to="SECURE_SYSTEM_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7e0, to="DRAG"), @android.view.ViewDebug.IntToString(from=0x7e1, to="STATUS_BAR_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=0x7e2, to="POINTER"), @android.view.ViewDebug.IntToString(from=0x7e3, to="NAVIGATION_BAR"), @android.view.ViewDebug.IntToString(from=0x7e4, to="VOLUME_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7e5, to="BOOT_PROGRESS"), @android.view.ViewDebug.IntToString(from=0x7e6, to="INPUT_CONSUMER"), @android.view.ViewDebug.IntToString(from=0x7e7, to="DREAM"), @android.view.ViewDebug.IntToString(from=0x7e8, to="NAVIGATION_BAR_PANEL"), @android.view.ViewDebug.IntToString(from=0x7ea, to="DISPLAY_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7eb, to="MAGNIFICATION_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7f5, to="PRESENTATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION, to="PRIVATE_PRESENTATION"), @android.view.ViewDebug.IntToString(from=0x7ef, to="VOICE_INTERACTION"), @android.view.ViewDebug.IntToString(from=0x7f1, to="VOICE_INTERACTION_STARTING"), @android.view.ViewDebug.IntToString(from=0x7f2, to="DOCK_DIVIDER"), @android.view.ViewDebug.IntToString(from=0x7f3, to="QS_DIALOG"), @android.view.ViewDebug.IntToString(from=0x7f4, to="SCREENSHOT"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, to="APPLICATION_OVERLAY")}) public int type;		field @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION, to="BASE_APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION, to="APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING, to="APPLICATION_STARTING"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION, to="DRAWN_APPLICATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL, to="APPLICATION_PANEL"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA, to="APPLICATION_MEDIA"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL, to="APPLICATION_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=0x3ed, to="APPLICATION_ABOVE_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG, to="APPLICATION_ATTACHED_DIALOG"), @android.view.ViewDebug.IntToString(from=0x3ec, to="APPLICATION_MEDIA_OVERLAY"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR, to="STATUS_BAR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SEARCH_BAR, to="SEARCH_BAR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PHONE, to="PHONE"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT, to="SYSTEM_ALERT"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_TOAST, to="TOAST"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY, to="SYSTEM_OVERLAY"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE, to="PRIORITY_PHONE"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG, to="SYSTEM_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, to="KEYGUARD_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR, to="SYSTEM_ERROR"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD, to="INPUT_METHOD"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG, to="INPUT_METHOD_DIALOG"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_WALLPAPER, to="WALLPAPER"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL, to="STATUS_BAR_PANEL"), @android.view.ViewDebug.IntToString(from=0x7df, to="SECURE_SYSTEM_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7e0, to="DRAG"), @android.view.ViewDebug.IntToString(from=0x7e1, to="STATUS_BAR_SUB_PANEL"), @android.view.ViewDebug.IntToString(from=0x7e2, to="POINTER"), @android.view.ViewDebug.IntToString(from=0x7e3, to="NAVIGATION_BAR"), @android.view.ViewDebug.IntToString(from=0x7e4, to="VOLUME_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7e5, to="BOOT_PROGRESS"), @android.view.ViewDebug.IntToString(from=0x7e6, to="INPUT_CONSUMER"), @android.view.ViewDebug.IntToString(from=0x7e8, to="NAVIGATION_BAR_PANEL"), @android.view.ViewDebug.IntToString(from=0x7ea, to="DISPLAY_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7eb, to="MAGNIFICATION_OVERLAY"), @android.view.ViewDebug.IntToString(from=0x7f5, to="PRESENTATION"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION, to="PRIVATE_PRESENTATION"), @android.view.ViewDebug.IntToString(from=0x7ef, to="VOICE_INTERACTION"), @android.view.ViewDebug.IntToString(from=0x7f1, to="VOICE_INTERACTION_STARTING"), @android.view.ViewDebug.IntToString(from=0x7f2, to="DOCK_DIVIDER"), @android.view.ViewDebug.IntToString(from=0x7f3, to="QS_DIALOG"), @android.view.ViewDebug.IntToString(from=0x7f4, to="SCREENSHOT"), @android.view.ViewDebug.IntToString(from=android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, to="APPLICATION_OVERLAY")}) public int type;
	field public float verticalMargin;		field public float verticalMargin;
	field @android.view.ViewDebug.ExportedProperty public float verticalWeight;		field @android.view.ViewDebug.ExportedProperty public float verticalWeight;
	field public int windowAnimations;		field public int windowAnimations;

core/java/android/service/dreams/DreamService.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,8 +15,6 @@
	*/		*/
	package android.service.dreams;		package android.service.dreams;

	import static android.view.WindowManager.LayoutParams.TYPE_DREAM;

	import android.annotation.IdRes;		import android.annotation.IdRes;
	import android.annotation.LayoutRes;		import android.annotation.LayoutRes;
	import android.annotation.NonNull;		import android.annotation.NonNull;
	@@ -1071,7 +1069,6 @@ public class DreamService extends Service implements Window.Callback {
	private void onWindowCreated(Window w) {		private void onWindowCreated(Window w) {
	mWindow = w;		mWindow = w;
	mWindow.setCallback(this);		mWindow.setCallback(this);
	mWindow.setType(TYPE_DREAM);
	mWindow.requestFeature(Window.FEATURE_NO_TITLE);		mWindow.requestFeature(Window.FEATURE_NO_TITLE);

	WindowManager.LayoutParams lp = mWindow.getAttributes();		WindowManager.LayoutParams lp = mWindow.getAttributes();

core/java/android/view/WindowManager.java

+2 −10

Original line number	Original line	Diff line number	Diff line
	@@ -781,8 +781,6 @@ public interface WindowManager extends ViewManager {
	to = "BOOT_PROGRESS"),		to = "BOOT_PROGRESS"),
	@ViewDebug.IntToString(from = TYPE_INPUT_CONSUMER,		@ViewDebug.IntToString(from = TYPE_INPUT_CONSUMER,
	to = "INPUT_CONSUMER"),		to = "INPUT_CONSUMER"),
	@ViewDebug.IntToString(from = TYPE_DREAM,
	to = "DREAM"),
	@ViewDebug.IntToString(from = TYPE_NAVIGATION_BAR_PANEL,		@ViewDebug.IntToString(from = TYPE_NAVIGATION_BAR_PANEL,
	to = "NAVIGATION_BAR_PANEL"),		to = "NAVIGATION_BAR_PANEL"),
	@ViewDebug.IntToString(from = TYPE_DISPLAY_OVERLAY,		@ViewDebug.IntToString(from = TYPE_DISPLAY_OVERLAY,
	@@ -1104,13 +1102,6 @@ public interface WindowManager extends ViewManager {
	*/		*/
	public static final int TYPE_INPUT_CONSUMER = FIRST_SYSTEM_WINDOW+22;		public static final int TYPE_INPUT_CONSUMER = FIRST_SYSTEM_WINDOW+22;

	/**
	* Window type: Dreams (screen saver) window, just above keyguard.
	* In multiuser systems shows only on the owning user's window.
	* @hide
	*/
	public static final int TYPE_DREAM = FIRST_SYSTEM_WINDOW+23;

	/**		/**
	* Window type: Navigation bar panel (when navigation bar is distinct from status bar)		* Window type: Navigation bar panel (when navigation bar is distinct from status bar)
	* In multiuser systems shows on all users' windows.		* In multiuser systems shows on all users' windows.
	@@ -1180,8 +1171,9 @@ public interface WindowManager extends ViewManager {
	public static final int TYPE_QS_DIALOG = FIRST_SYSTEM_WINDOW+35;		public static final int TYPE_QS_DIALOG = FIRST_SYSTEM_WINDOW+35;

	/**		/**
	* Window type: shares similar characteristics with {@link #TYPE_DREAM}. The layer is		* Window type: shows directly above the keyguard. The layer is
	* reserved for screenshot region selection. These windows must not take input focus.		* reserved for screenshot region selection. These windows must not take input focus.
			* In multiuser systems shows only on the owning user's window.
	* @hide		* @hide
	*/		*/
	public static final int TYPE_SCREENSHOT = FIRST_SYSTEM_WINDOW + 36;		public static final int TYPE_SCREENSHOT = FIRST_SYSTEM_WINDOW + 36;

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_ERROR;
	import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;		import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY;
	import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
	import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
	import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
	import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
	import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;		import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;
	import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;		import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
	@@ -2091,7 +2090,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	// Window manager does the checking for this.		// Window manager does the checking for this.
	outAppOp[0] = OP_TOAST_WINDOW;		outAppOp[0] = OP_TOAST_WINDOW;
	return ADD_OKAY;		return ADD_OKAY;
	case TYPE_DREAM:
	case TYPE_INPUT_METHOD:		case TYPE_INPUT_METHOD:
	case TYPE_WALLPAPER:		case TYPE_WALLPAPER:
	case TYPE_PRESENTATION:		case TYPE_PRESENTATION:
	@@ -2230,7 +2228,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	case TYPE_STATUS_BAR:		case TYPE_STATUS_BAR:
	case TYPE_NAVIGATION_BAR:		case TYPE_NAVIGATION_BAR:
	case TYPE_WALLPAPER:		case TYPE_WALLPAPER:
	case TYPE_DREAM:
	return false;		return false;
	default:		default:
	// Hide only windows below the keyguard host window.		// Hide only windows below the keyguard host window.

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ import static android.view.WindowManager.LayoutParams.TYPE_BOOT_PROGRESS;
	import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;		import static android.view.WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY;
	import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;		import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
	import static android.view.WindowManager.LayoutParams.TYPE_DRAG;		import static android.view.WindowManager.LayoutParams.TYPE_DRAG;
	import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
	import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER;		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_CONSUMER;
	import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
	import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
	@@ -806,9 +805,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
	return canAddInternalSystemWindow ? 13 : 10;		return canAddInternalSystemWindow ? 13 : 10;
	case TYPE_APPLICATION_OVERLAY:		case TYPE_APPLICATION_OVERLAY:
	return 12;		return 12;
	case TYPE_DREAM:
	// used for Dreams (screensavers with TYPE_DREAM windows)
	return 14;
	case TYPE_INPUT_METHOD:		case TYPE_INPUT_METHOD:
	// on-screen keyboards and other such input method user interfaces go here.		// on-screen keyboards and other such input method user interfaces go here.
	return 15;		return 15;