Merge "WM: Move WindowManagerPolicy, DisplayFrames and WindowManagerInternal into services" (e3a80101) · Commits · e / os / android_frameworks_base

config/compiled-classes-phone

+2 −14

Original line number	Diff line number	Diff line
		@@ -4607,20 +4607,8 @@ android.view.WindowManagerGlobal
		android.view.WindowManagerGlobal$1
		android.view.WindowManagerGlobal$2
		android.view.WindowManagerImpl
		android.view.WindowManagerInternal
		android.view.WindowManagerInternal$AppTransitionListener
		android.view.WindowManagerInternal$MagnificationCallbacks
		android.view.WindowManagerInternal$OnHardKeyboardStatusChangeListener
		android.view.WindowManagerInternal$WindowsForAccessibilityCallback
		android.view.WindowManagerPolicy
		android.view.WindowManagerPolicy$InputConsumer
		android.view.WindowManagerPolicy$OnKeyguardExitResult
		android.view.WindowManagerPolicy$PointerEventListener
		android.view.WindowManagerPolicy$ScreenOffListener
		android.view.WindowManagerPolicy$ScreenOnListener
		android.view.WindowManagerPolicy$StartingSurface
		android.view.WindowManagerPolicy$WindowManagerFuncs
		android.view.WindowManagerPolicy$WindowState
		android.view.WindowManagerPolicyConstants
		android.view.WindowManagerPolicyConstants$PointerEventListener
		android.view.accessibility.AccessibilityEvent
		android.view.accessibility.AccessibilityEvent$1
		android.view.accessibility.AccessibilityEventSource

core/java/android/app/IActivityManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -473,7 +473,7 @@ interface IActivityManager {
		/**
		* Notify the system that the keyguard is going away.
		*
		* @param flags See {@link android.view.WindowManagerPolicy#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE}
		* @param flags See {@link android.view.WindowManagerPolicyConstants#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE}
		* etc.
		*/
		void keyguardGoingAway(int flags);

core/java/android/hardware/display/DisplayManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.SystemService;
		import android.app.KeyguardManager;
		import android.content.Context;
		import android.graphics.Point;
		import android.media.projection.MediaProjection;
		@@ -27,7 +28,6 @@ import android.os.Handler;
		import android.util.SparseArray;
		import android.view.Display;
		import android.view.Surface;
		import android.view.WindowManagerPolicy;

		import java.util.ArrayList;
		import java.util.List;
		@@ -254,8 +254,8 @@ public final class DisplayManager {
		* </p>
		*
		* @see #createVirtualDisplay
		* @see WindowManagerPolicy#isKeyguardSecure(int)
		* @see WindowManagerPolicy#isKeyguardTrustedLw()
		* @see KeyguardManager#isDeviceSecure()
		* @see KeyguardManager#isDeviceLocked()
		* @hide
		*/
		// TODO: Update name and documentation and un-hide the flag. Don't change the value before that.

core/java/android/view/Display.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE;

		import android.annotation.IntDef;
		import android.annotation.RequiresPermission;
		import android.app.KeyguardManager;
		import android.content.res.CompatibilityInfo;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		@@ -209,8 +210,8 @@ public final class Display {
		* </p>
		*
		* @see DisplayManager#VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD
		* @see WindowManagerPolicy#isKeyguardSecure(int)
		* @see WindowManagerPolicy#isKeyguardTrustedLw()
		* @see KeyguardManager#isDeviceSecure()
		* @see KeyguardManager#isDeviceLocked()
		* @see #getFlags
		* @hide
		*/

core/java/android/view/InputFilter.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,21 +72,21 @@ import android.os.RemoteException;
		* </p><p>
		* The early policy interception decides whether an input event should be delivered
		* to applications or dropped. The policy indicates its decision by setting the
		* {@link WindowManagerPolicy#FLAG_PASS_TO_USER} policy flag. The input filter may
		* {@link WindowManagerPolicyConstants#FLAG_PASS_TO_USER} policy flag. The input filter may
		* sometimes receive events that do not have this flag set. It should take note of
		* the fact that the policy intends to drop the event, clean up its state, and
		* then send appropriate cancellation events to the dispatcher if needed.
		* </p><p>
		* For example, suppose the input filter is processing a gesture and one of the touch events
		* it receives does not have the {@link WindowManagerPolicy#FLAG_PASS_TO_USER} flag set.
		* it receives does not have the {@link WindowManagerPolicyConstants#FLAG_PASS_TO_USER} flag set.
		* The input filter should clear its internal state about the gesture and then send key or
		* motion events to the dispatcher to cancel any keys or pointers that are down.
		* </p><p>
		* Corollary: Events that get sent to the dispatcher should usually include the
		* {@link WindowManagerPolicy#FLAG_PASS_TO_USER} flag. Otherwise, they will be dropped!
		* {@link WindowManagerPolicyConstants#FLAG_PASS_TO_USER} flag. Otherwise, they will be dropped!
		* </p><p>
		* It may be prudent to disable automatic key repeating for synthetic key events
		* by setting the {@link WindowManagerPolicy#FLAG_DISABLE_KEY_REPEAT} policy flag.
		* by setting the {@link WindowManagerPolicyConstants#FLAG_DISABLE_KEY_REPEAT} policy flag.
		* </p>
		*
		* @hide