diff options
| author | 2017-11-20 17:55:31 +0100 | |
|---|---|---|
| committer | 2017-11-23 17:23:26 +0100 | |
| commit | e99bc0501a288735d337f2ff64f8fa47f766a59b (patch) | |
| tree | 2d9c23f38c8f10758ea868eb9dd5e5effea2f737 | |
| parent | 78252a23d6d38e4b1c938fef3d7b1dc6b7dfbe05 (diff) | |
WM: Move WindowManagerPolicy, DisplayFrames and WindowManagerInternal into services
Splits WindowManagerPolicy into a framework and a services part, preventing concepts that are
internal to the window manager from leaking out into the framework.
Test: make droid
Change-Id: I7b6a54f55f76f6fbb5f27090981b8f1d4d8be88b
82 files changed, 335 insertions, 296 deletions
diff --git a/config/compiled-classes-phone b/config/compiled-classes-phone index 8684d0a9cd06..afa802c70fd4 100644 --- a/config/compiled-classes-phone +++ b/config/compiled-classes-phone @@ -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 diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 4fc649e0443e..2d6308ccfe93 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -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); diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index ef77d6e6815e..89357456053c 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -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. diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 6a44cdb9ee57..9673be01d7fb 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -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 */ diff --git a/core/java/android/view/InputFilter.java b/core/java/android/view/InputFilter.java index d0dab4000fff..0ab4dc026e69 100644 --- a/core/java/android/view/InputFilter.java +++ b/core/java/android/view/InputFilter.java @@ -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 diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 4eab496effda..578679b12b9a 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -17,9 +17,9 @@ package android.view; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL; -import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_OVERLAY_SUBLAYER; -import static android.view.WindowManagerPolicy.APPLICATION_MEDIA_SUBLAYER; -import static android.view.WindowManagerPolicy.APPLICATION_PANEL_SUBLAYER; +import static android.view.WindowManagerPolicyConstants.APPLICATION_MEDIA_OVERLAY_SUBLAYER; +import static android.view.WindowManagerPolicyConstants.APPLICATION_MEDIA_SUBLAYER; +import static android.view.WindowManagerPolicyConstants.APPLICATION_PANEL_SUBLAYER; import android.content.Context; import android.content.res.CompatibilityInfo.Translator; diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java new file mode 100644 index 000000000000..21943bd6ba31 --- /dev/null +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2006 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 android.view; + +import static android.view.Display.DEFAULT_DISPLAY; + +import android.annotation.SystemApi; + +/** + * Constants for interfacing with WindowManagerService and WindowManagerPolicyInternal. + * @hide + */ +public interface WindowManagerPolicyConstants { + // Policy flags. These flags are also defined in frameworks/base/include/ui/Input.h. + int FLAG_WAKE = 0x00000001; + int FLAG_VIRTUAL = 0x00000002; + + int FLAG_INJECTED = 0x01000000; + int FLAG_TRUSTED = 0x02000000; + int FLAG_FILTERED = 0x04000000; + int FLAG_DISABLE_KEY_REPEAT = 0x08000000; + + int FLAG_INTERACTIVE = 0x20000000; + int FLAG_PASS_TO_USER = 0x40000000; + + // Flags for IActivityManager.keyguardGoingAway() + int KEYGUARD_GOING_AWAY_FLAG_TO_SHADE = 1 << 0; + int KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS = 1 << 1; + int KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER = 1 << 2; + + // Flags used for indicating whether the internal and/or external input devices + // of some type are available. + int PRESENCE_INTERNAL = 1 << 0; + int PRESENCE_EXTERNAL = 1 << 1; + + /** + * Sticky broadcast of the current HDMI plugged state. + */ + String ACTION_HDMI_PLUGGED = "android.intent.action.HDMI_PLUGGED"; + + /** + * Extra in {@link #ACTION_HDMI_PLUGGED} indicating the state: true if + * plugged in to HDMI, false if not. + */ + String EXTRA_HDMI_PLUGGED_STATE = "state"; + + /** + * Set to {@code true} when intent was invoked from pressing the home key. + * @hide + */ + @SystemApi + String EXTRA_FROM_HOME_KEY = "android.intent.extra.FROM_HOME_KEY"; + + // TODO: move this to a more appropriate place. + interface PointerEventListener { + /** + * 1. onPointerEvent will be called on the service.UiThread. + * 2. motionEvent will be recycled after onPointerEvent returns so if it is needed later a + * copy() must be made and the copy must be recycled. + **/ + void onPointerEvent(MotionEvent motionEvent); + + /** + * @see #onPointerEvent(MotionEvent) + **/ + default void onPointerEvent(MotionEvent motionEvent, int displayId) { + if (displayId == DEFAULT_DISPLAY) { + onPointerEvent(motionEvent); + } + } + } + + /** Screen turned off because of a device admin */ + int OFF_BECAUSE_OF_ADMIN = 1; + /** Screen turned off because of power button */ + int OFF_BECAUSE_OF_USER = 2; + /** Screen turned off because of timeout */ + int OFF_BECAUSE_OF_TIMEOUT = 3; + + int APPLICATION_LAYER = 2; + int APPLICATION_MEDIA_SUBLAYER = -2; + int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1; + int APPLICATION_PANEL_SUBLAYER = 1; + int APPLICATION_SUB_PANEL_SUBLAYER = 2; + int APPLICATION_ABOVE_SUB_PANEL_SUBLAYER = 3; + + /** + * Convert the off reason to a human readable format. + */ + static String offReasonToString(int why) { + switch (why) { + case OFF_BECAUSE_OF_ADMIN: + return "OFF_BECAUSE_OF_ADMIN"; + case OFF_BECAUSE_OF_USER: + return "OFF_BECAUSE_OF_USER"; + case OFF_BECAUSE_OF_TIMEOUT: + return "OFF_BECAUSE_OF_TIMEOUT"; + default: + return Integer.toString(why); + } + } +} diff --git a/core/java/com/android/internal/widget/PointerLocationView.java b/core/java/com/android/internal/widget/PointerLocationView.java index e53162cc97fd..5847033feb1e 100644 --- a/core/java/com/android/internal/widget/PointerLocationView.java +++ b/core/java/com/android/internal/widget/PointerLocationView.java @@ -32,7 +32,7 @@ import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; import android.view.ViewConfiguration; -import android.view.WindowManagerPolicy.PointerEventListener; +import android.view.WindowManagerPolicyConstants.PointerEventListener; import android.view.MotionEvent.PointerCoords; import java.util.ArrayList; diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java index 5a02178a5a7b..8d55eea40951 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java @@ -21,7 +21,7 @@ import android.media.AudioManager; import android.os.SystemClock; import android.hardware.fingerprint.FingerprintManager; import android.telephony.TelephonyManager; -import android.view.WindowManagerPolicy; +import android.view.WindowManagerPolicyConstants; import com.android.internal.telephony.IccCardConstants; @@ -171,9 +171,9 @@ public class KeyguardUpdateMonitorCallback { /** * Called when the device has finished going to sleep. - * @param why either {@link WindowManagerPolicy#OFF_BECAUSE_OF_ADMIN}, - * {@link WindowManagerPolicy#OFF_BECAUSE_OF_USER}, or - * {@link WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}. + * @param why either {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_ADMIN}, + * {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_USER}, or + * {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_TIMEOUT}. * * @deprecated use {@link com.android.systemui.keyguard.WakefulnessLifecycle}. */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index a35ba9fadab4..b99e76a28c6d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -60,7 +60,7 @@ import android.util.EventLog; import android.util.Log; import android.util.Slog; import android.view.ViewGroup; -import android.view.WindowManagerPolicy; +import android.view.WindowManagerPolicyConstants; import android.view.animation.Animation; import android.view.animation.AnimationUtils; @@ -129,7 +129,7 @@ import java.util.ArrayList; * false, this will override all other conditions for turning on the keyguard. * * Threading and synchronization: - * This class is created by the initialization routine of the {@link android.view.WindowManagerPolicy}, + * This class is created by the initialization routine of the {@link WindowManagerPolicyConstants}, * and runs on its thread. The keyguard UI is created from that thread in the * constructor of this class. The apis may be called from other threads, including the * {@link com.android.server.input.InputManagerService}'s and {@link android.view.WindowManager}'s. @@ -766,8 +766,8 @@ public class KeyguardViewMediator extends SystemUI { /** * Called to let us know the screen was turned off. - * @param why either {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_USER} or - * {@link android.view.WindowManagerPolicy#OFF_BECAUSE_OF_TIMEOUT}. + * @param why either {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_USER} or + * {@link WindowManagerPolicyConstants#OFF_BECAUSE_OF_TIMEOUT}. */ public void onStartedGoingToSleep(int why) { if (DEBUG) Log.d(TAG, "onStartedGoingToSleep(" + why + ")"); @@ -797,8 +797,8 @@ public class KeyguardViewMediator extends SystemUI { } } else if (mShowing) { mPendingReset = true; - } else if ((why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT && timeout > 0) - || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) { + } else if ((why == WindowManagerPolicyConstants.OFF_BECAUSE_OF_TIMEOUT && timeout > 0) + || (why == WindowManagerPolicyConstants.OFF_BECAUSE_OF_USER && !lockImmediately)) { doKeyguardLaterLocked(timeout); mLockLater = true; } else if (!mLockPatternUtils.isLockScreenDisabled(currentUser)) { @@ -1031,7 +1031,7 @@ public class KeyguardViewMediator extends SystemUI { } /** - * Same semantics as {@link android.view.WindowManagerPolicy#enableKeyguard}; provide + * Same semantics as {@link WindowManagerPolicyConstants#enableKeyguard}; provide * a way for external stuff to override normal keyguard behavior. For instance * the phone app disables the keyguard when it receives incoming calls. */ @@ -1780,13 +1780,13 @@ public class KeyguardViewMediator extends SystemUI { int flags = 0; if (mStatusBarKeyguardViewManager.shouldDisableWindowAnimationsForUnlock() || mWakeAndUnlocking) { - flags |= WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; + flags |= WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; } if (mStatusBarKeyguardViewManager.isGoingToNotificationShade()) { - flags |= WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE; + flags |= WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE; } if (mStatusBarKeyguardViewManager.isUnlockWithWallpaper()) { - flags |= WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; + flags |= WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; } mUpdateMonitor.setKeyguardGoingAway(true /* goingAway */); diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityClientConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityClientConnection.java index df4c8ed5e400..7e94d7b6f1fe 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityClientConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityClientConnection.java @@ -47,7 +47,6 @@ import android.util.SparseArray; import android.view.KeyEvent; import android.view.MagnificationSpec; import android.view.View; -import android.view.WindowManagerInternal; import android.view.accessibility.AccessibilityCache; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; @@ -60,6 +59,7 @@ import android.view.accessibility.IAccessibilityInteractionConnectionCallback; import com.android.internal.os.SomeArgs; import com.android.internal.util.DumpUtils; import com.android.server.accessibility.AccessibilityManagerService.SecurityPolicy; +import com.android.server.wm.WindowManagerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java index f6fcaae4f4c3..11b2343d0e1b 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java @@ -31,11 +31,11 @@ import android.view.InputEvent; import android.view.InputFilter; import android.view.KeyEvent; import android.view.MotionEvent; -import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; import com.android.internal.util.BitUtils; import com.android.server.LocalServices; +import com.android.server.policy.WindowManagerPolicy; /** * This class is an input filter for implementing accessibility features such diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index d661754a059d..3554448efe18 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -82,7 +82,6 @@ import android.view.MagnificationSpec; import android.view.View; import android.view.WindowInfo; import android.view.WindowManager; -import android.view.WindowManagerInternal; import android.view.accessibility.AccessibilityCache; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityInteractionClient; @@ -102,6 +101,7 @@ import com.android.internal.util.DumpUtils; import com.android.internal.util.IntPair; import com.android.server.LocalServices; import com.android.server.policy.AccessibilityShortcutController; +import com.android.server.wm.WindowManagerInternal; import org.xmlpull.v1.XmlPullParserException; diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java index eb26752988aa..9cafa1e778b6 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java @@ -33,10 +33,10 @@ import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings; import android.util.Slog; -import android.view.WindowManagerInternal; import com.android.server.accessibility.AccessibilityManagerService.SecurityPolicy; import com.android.server.accessibility.AccessibilityManagerService.UserState; +import com.android.server.wm.WindowManagerInternal; import java.lang.ref.WeakReference; import java.util.List; diff --git a/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java b/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java index 5867006d6c18..3b8d4bca0598 100644 --- a/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java +++ b/services/accessibility/java/com/android/server/accessibility/GlobalActionPerformer.java @@ -29,10 +29,10 @@ import android.view.IWindowManager; import android.view.InputDevice; import android.view.KeyCharacterMap; import android.view.KeyEvent; -import android.view.WindowManagerInternal; import com.android.server.LocalServices; import com.android.server.statusbar.StatusBarManagerInternal; +import com.android.server.wm.WindowManagerInternal; /** * Handle the back-end of AccessibilityService#performGlobalAction diff --git a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java index 3358432606c2..b144e1c8c82c 100644 --- a/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java +++ b/services/accessibility/java/com/android/server/accessibility/KeyEventDispatcher.java @@ -26,7 +26,8 @@ import android.util.Pools.Pool; import android.util.Slog; import android.view.InputEventConsistencyVerifier; import android.view.KeyEvent; -import android.view.WindowManagerPolicy; + +import com.android.server.policy.WindowManagerPolicy; import java.util.ArrayList; import java.util.List; diff --git a/services/accessibility/java/com/android/server/accessibility/KeyboardInterceptor.java b/services/accessibility/java/com/android/server/accessibility/KeyboardInterceptor.java index 772494521ff6..bc379c204d44 100644 --- a/services/accessibility/java/com/android/server/accessibility/KeyboardInterceptor.java +++ b/services/accessibility/java/com/android/server/accessibility/KeyboardInterceptor.java @@ -22,7 +22,8 @@ import android.os.SystemClock; import android.util.Pools; import android.util.Slog; import android.view.KeyEvent; -import android.view.WindowManagerPolicy; + +import com.android.server.policy.WindowManagerPolicy; /** * Intercepts key events and forwards them to accessibility manager service. diff --git a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java index a10b7a20d741..a70b88e87ae4 100644 --- a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java @@ -34,7 +34,6 @@ import android.util.MathUtils; import android.util.Slog; import android.view.MagnificationSpec; import android.view.View; -import android.view.WindowManagerInternal; import android.view.animation.DecelerateInterpolator; import com.android.internal.R; @@ -42,6 +41,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.SomeArgs; import com.android.server.LocalServices; +import com.android.server.wm.WindowManagerInternal; import java.util.Locale; diff --git a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java index b6b781290c65..46e3226bb751 100644 --- a/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java +++ b/services/accessibility/java/com/android/server/accessibility/MotionEventInjector.java @@ -31,9 +31,9 @@ import android.util.SparseArray; import android.util.SparseIntArray; import android.view.InputDevice; import android.view.MotionEvent; -import android.view.WindowManagerPolicy; import com.android.internal.os.SomeArgs; +import com.android.server.policy.WindowManagerPolicy; import java.util.ArrayList; import java.util.Arrays; diff --git a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java index a32686dfff61..3419b809f1b8 100644 --- a/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/TouchExplorer.java @@ -26,11 +26,12 @@ import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; import android.view.ViewConfiguration; -import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; +import com.android.server.policy.WindowManagerPolicy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java index a6b81ffff1c1..f05711265e18 100644 --- a/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java +++ b/services/accessibility/java/com/android/server/accessibility/UiAutomationManager.java @@ -26,9 +26,10 @@ import android.os.IBinder; import android.os.IBinder.DeathRecipient; import android.os.RemoteException; import android.util.Slog; -import android.view.WindowManagerInternal; import android.view.accessibility.AccessibilityEvent; +import com.android.server.wm.WindowManagerInternal; + import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index a903f3dff0ae..b7b5bd930f8e 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -40,13 +40,13 @@ import android.provider.Settings; import android.util.MutableBoolean; import android.util.Slog; import android.view.KeyEvent; -import android.view.WindowManagerInternal; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.LocalServices; import com.android.server.statusbar.StatusBarManagerInternal; +import com.android.server.wm.WindowManagerInternal; /** * The service that listens for gestures detected in sensor firmware and starts the intent diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index f007bcc829b1..fc57a0d58400 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -128,7 +128,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.Window; import android.view.WindowManager; -import android.view.WindowManagerInternal; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputConnection; @@ -147,6 +146,8 @@ import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; +import com.android.server.wm.WindowManagerInternal; + import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 5927666141d4..a2c46f14ed3a 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -79,7 +79,6 @@ import static android.os.Build.VERSION_CODES.HONEYCOMB; import static android.os.Build.VERSION_CODES.O; import static android.os.Process.SYSTEM_UID; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; -import static android.view.WindowManagerPolicy.NAV_BAR_LEFT; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_CONFIGURATION; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_SAVED_STATE; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_STATES; @@ -117,6 +116,7 @@ import static com.android.server.am.proto.ActivityRecordProto.IDENTIFIER; import static com.android.server.am.proto.ActivityRecordProto.PROC_ID; import static com.android.server.am.proto.ActivityRecordProto.STATE; import static com.android.server.am.proto.ActivityRecordProto.VISIBLE; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT; import static com.android.server.wm.proto.IdentifierProto.HASH_CODE; import static com.android.server.wm.proto.IdentifierProto.TITLE; import static com.android.server.wm.proto.IdentifierProto.USER_ID; diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java index 76b46796baa5..35f4f253198f 100644 --- a/services/core/java/com/android/server/am/KeyguardController.java +++ b/services/core/java/com/android/server/am/KeyguardController.java @@ -19,9 +19,9 @@ package com.android.server.am; import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER; import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Display.INVALID_DISPLAY; -import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; -import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE; -import static android.view.WindowManagerPolicy.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; +import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS; +import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_TO_SHADE; +import static android.view.WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER; import static com.android.server.am.ActivityManagerDebugConfig.TAG_AM; import static com.android.server.am.ActivityManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS; @@ -41,8 +41,11 @@ import android.os.RemoteException; import android.os.Trace; import android.util.Slog; import android.util.proto.ProtoOutputStream; + import com.android.internal.policy.IKeyguardDismissCallback; +import com.android.server.policy.WindowManagerPolicy; import com.android.server.wm.WindowManagerService; + import java.io.PrintWriter; /** @@ -118,7 +121,7 @@ class KeyguardController { /** * Called when Keyguard is going away. * - * @param flags See {@link android.view.WindowManagerPolicy#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE} + * @param flags See {@link WindowManagerPolicy#KEYGUARD_GOING_AWAY_FLAG_TO_SHADE} * etc. */ void keyguardGoingAway(int flags) { diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index 7530f3ef942b..379aaadca9ee 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -68,13 +68,13 @@ import android.util.SparseArray; import android.view.Display; import android.view.DisplayInfo; import android.view.Surface; -import android.view.WindowManagerInternal; import com.android.server.AnimationThread; import com.android.server.DisplayThread; import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.UiThread; +import com.android.server.wm.WindowManagerInternal; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index 600bc42e970c..29a007a36d41 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import com.android.internal.app.IBatteryStats; import com.android.server.LocalServices; import com.android.server.am.BatteryStatsService; +import com.android.server.policy.WindowManagerPolicy; import android.animation.Animator; import android.animation.ObjectAnimator; @@ -43,7 +44,6 @@ import android.util.Slog; import android.util.Spline; import android.util.TimeUtils; import android.view.Display; -import android.view.WindowManagerPolicy; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index fa9b1078e8ad..4050790c01e3 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -33,6 +33,7 @@ import com.android.internal.util.XmlUtils; import com.android.server.DisplayThread; import com.android.server.LocalServices; import com.android.server.Watchdog; +import com.android.server.policy.WindowManagerPolicy; import org.xmlpull.v1.XmlPullParser; @@ -98,7 +99,6 @@ import android.view.KeyEvent; import android.view.PointerIcon; import android.view.Surface; import android.view.ViewConfiguration; -import android.view.WindowManagerPolicy; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 08da568d5931..cf0140072721 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -152,7 +152,6 @@ import android.util.Slog; import android.util.SparseArray; import android.util.Xml; import android.util.proto.ProtoOutputStream; -import android.view.WindowManagerInternal; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.widget.Toast; @@ -180,6 +179,7 @@ import com.android.server.notification.ManagedServices.ManagedServiceInfo; import com.android.server.notification.ManagedServices.UserProfiles; import com.android.server.policy.PhoneWindowManager; import com.android.server.statusbar.StatusBarManagerInternal; +import com.android.server.wm.WindowManagerInternal; import libcore.io.IoUtils; diff --git a/services/core/java/com/android/server/policy/BarController.java b/services/core/java/com/android/server/policy/BarController.java index b1792358be53..10d9565c8359 100644 --- a/services/core/java/com/android/server/policy/BarController.java +++ b/services/core/java/com/android/server/policy/BarController.java @@ -24,9 +24,9 @@ import android.util.Slog; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.view.WindowManagerPolicy.WindowState; import com.android.server.LocalServices; +import com.android.server.policy.WindowManagerPolicy.WindowState; import com.android.server.statusbar.StatusBarManagerInternal; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index 3707a5edb3c1..108b6b25b0c4 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -14,14 +14,14 @@ package com.android.server.policy; -import com.android.server.LocalServices; -import com.android.server.statusbar.StatusBarManagerInternal; -import com.android.server.statusbar.StatusBarManagerInternal.GlobalActionsListener; - import android.content.Context; import android.os.Handler; import android.util.Slog; -import android.view.WindowManagerPolicy.WindowManagerFuncs; + +import com.android.server.LocalServices; +import com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs; +import com.android.server.statusbar.StatusBarManagerInternal; +import com.android.server.statusbar.StatusBarManagerInternal.GlobalActionsListener; class GlobalActions implements GlobalActionsListener { diff --git a/services/core/java/com/android/server/policy/LegacyGlobalActions.java b/services/core/java/com/android/server/policy/LegacyGlobalActions.java index 8eb6d065bf25..96d062df0fea 100644 --- a/services/core/java/com/android/server/policy/LegacyGlobalActions.java +++ b/services/core/java/com/android/server/policy/LegacyGlobalActions.java @@ -25,6 +25,7 @@ import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; import com.android.internal.R; import com.android.internal.widget.LockPatternUtils; +import com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs; import android.app.ActivityManager; import android.app.Dialog; @@ -64,7 +65,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; import android.view.WindowManagerGlobal; -import android.view.WindowManagerPolicy.WindowManagerFuncs; import android.view.accessibility.AccessibilityEvent; import android.widget.AdapterView; import android.widget.BaseAdapter; @@ -919,7 +919,7 @@ class LegacyGlobalActions implements DialogInterface.OnDismissListener, DialogIn /** * @param enabledIconResId The icon for when this action is on. * @param disabledIconResid The icon for when this action is off. - * @param essage The general information message, e.g 'Silent Mode' + * @param message The general information message, e.g 'Silent Mode' * @param enabledStatusMessageResId The on status message, e.g 'sound disabled' * @param disabledStatusMessageResId The off status message, e.g. 'sound enabled' */ diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 384070cf4777..ddd3bbdf561b 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -119,12 +119,13 @@ import static android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN; import static android.view.WindowManager.TAKE_SCREENSHOT_SELECTED_REGION; import static android.view.WindowManagerGlobal.ADD_OKAY; import static android.view.WindowManagerGlobal.ADD_PERMISSION_DENIED; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVERED; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVER_ABSENT; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_UNCOVERED; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED; -import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN; + +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVERED; +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVER_ABSENT; +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_UNCOVERED; +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED; +import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_OPEN; import android.annotation.Nullable; import android.app.ActivityManager; @@ -210,7 +211,6 @@ import android.util.Slog; import android.util.SparseArray; import android.util.proto.ProtoOutputStream; import android.view.Display; -import android.view.DisplayFrames; import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.IApplicationToken; @@ -230,9 +230,6 @@ import android.view.ViewConfiguration; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.WindowManagerGlobal; -import android.view.WindowManagerInternal; -import android.view.WindowManagerInternal.AppTransitionListener; -import android.view.WindowManagerPolicy; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import android.view.animation.Animation; @@ -259,6 +256,9 @@ import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback; import com.android.server.statusbar.StatusBarManagerInternal; import com.android.server.vr.VrManagerInternal; import com.android.server.wm.AppTransition; +import com.android.server.wm.DisplayFrames; +import com.android.server.wm.WindowManagerInternal; +import com.android.server.wm.WindowManagerInternal.AppTransitionListener; import java.io.File; import java.io.FileReader; diff --git a/services/core/java/com/android/server/policy/PolicyControl.java b/services/core/java/com/android/server/policy/PolicyControl.java index dbafc424b7fd..3f26d867b6a0 100644 --- a/services/core/java/com/android/server/policy/PolicyControl.java +++ b/services/core/java/com/android/server/policy/PolicyControl.java @@ -25,7 +25,8 @@ import android.util.Slog; import android.view.View; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; -import android.view.WindowManagerPolicy.WindowState; + +import com.android.server.policy.WindowManagerPolicy.WindowState; import java.io.PrintWriter; import java.io.StringWriter; @@ -36,7 +37,7 @@ import java.io.StringWriter; * This includes forcing immersive mode behavior for one or both system bars (based on a package * list) and permanently disabling immersive mode confirmations for specific packages. * - * Control by setting {@link Settings.Global.POLICY_CONTROL} to one or more name-value pairs. + * Control by setting {@link Settings.Global#POLICY_CONTROL} to one or more name-value pairs. * e.g. * to force immersive mode everywhere: * "immersive.full=*" diff --git a/services/core/java/com/android/server/policy/SplashScreenSurface.java b/services/core/java/com/android/server/policy/SplashScreenSurface.java index 37d6c0b55d54..b9202c334fec 100644 --- a/services/core/java/com/android/server/policy/SplashScreenSurface.java +++ b/services/core/java/com/android/server/policy/SplashScreenSurface.java @@ -23,11 +23,10 @@ import android.os.IBinder; import android.util.Slog; import android.view.View; import android.view.WindowManager; -import android.view.WindowManagerPolicy; -import android.view.WindowManagerPolicy.StartingSurface; import com.android.internal.policy.DecorView; import com.android.internal.policy.PhoneWindow; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; /** * Holds the contents of a splash screen starting window, i.e. the {@link DecorView} of a diff --git a/services/core/java/com/android/server/policy/StatusBarController.java b/services/core/java/com/android/server/policy/StatusBarController.java index ecc88b50a37c..af7e91c5bfa6 100644 --- a/services/core/java/com/android/server/policy/StatusBarController.java +++ b/services/core/java/com/android/server/policy/StatusBarController.java @@ -18,7 +18,7 @@ package com.android.server.policy; import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS; import static android.view.WindowManager.LayoutParams.MATCH_PARENT; -import static android.view.WindowManagerInternal.AppTransitionListener; +import static com.android.server.wm.WindowManagerInternal.AppTransitionListener; import android.app.StatusBarManager; import android.os.IBinder; diff --git a/services/core/java/com/android/server/policy/SystemGesturesPointerEventListener.java b/services/core/java/com/android/server/policy/SystemGesturesPointerEventListener.java index 598c58e50e79..d3cc8effb8ad 100644 --- a/services/core/java/com/android/server/policy/SystemGesturesPointerEventListener.java +++ b/services/core/java/com/android/server/policy/SystemGesturesPointerEventListener.java @@ -24,7 +24,7 @@ import android.util.Slog; import android.view.GestureDetector; import android.view.InputDevice; import android.view.MotionEvent; -import android.view.WindowManagerPolicy.PointerEventListener; +import android.view.WindowManagerPolicyConstants.PointerEventListener; import android.widget.OverScroller; /* diff --git a/core/java/android/view/WindowManagerPolicy.java b/services/core/java/com/android/server/policy/WindowManagerPolicy.java index c192f5c25f01..8d56eb80181a 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/services/core/java/com/android/server/policy/WindowManagerPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 The Android Open Source Project + * 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. @@ -14,10 +14,8 @@ * limitations under the License. */ -package android.view; +package com.android.server.policy; -import static android.Manifest.permission; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY; @@ -63,9 +61,9 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManager.LayoutParams.isSystemAlertWindowType; +import android.Manifest; import android.annotation.IntDef; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.content.Context; import android.content.pm.ActivityInfo; import android.content.res.CompatibilityInfo; @@ -78,10 +76,20 @@ import android.os.Looper; import android.os.RemoteException; import android.util.Slog; import android.util.proto.ProtoOutputStream; +import android.view.Display; +import android.view.IApplicationToken; +import android.view.IWindowManager; +import android.view.InputEventReceiver; +import android.view.KeyEvent; +import android.view.Surface; +import android.view.WindowManager; +import android.view.WindowManagerGlobal; +import android.view.WindowManagerPolicyConstants; import android.view.animation.Animation; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IShortcutService; +import com.android.server.wm.DisplayFrames; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -125,62 +133,26 @@ import java.lang.annotation.RetentionPolicy; * acquired by the window manager while it holds the window lock, so this is * even more restrictive than <var>Lw</var>. * </dl> - * - * @hide */ -public interface WindowManagerPolicy { - // Policy flags. These flags are also defined in frameworks/base/include/ui/Input.h. - public final static int FLAG_WAKE = 0x00000001; - public final static int FLAG_VIRTUAL = 0x00000002; - - public final static int FLAG_INJECTED = 0x01000000; - public final static int FLAG_TRUSTED = 0x02000000; - public final static int FLAG_FILTERED = 0x04000000; - public final static int FLAG_DISABLE_KEY_REPEAT = 0x08000000; - - public final static int FLAG_INTERACTIVE = 0x20000000; - public final static int FLAG_PASS_TO_USER = 0x40000000; - - // Flags for IActivityManager.keyguardGoingAway() - public final static int KEYGUARD_GOING_AWAY_FLAG_TO_SHADE = 1 << 0; - public final static int KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS = 1 << 1; - public final static int KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER = 1 << 2; - - // Flags used for indicating whether the internal and/or external input devices - // of some type are available. - public final static int PRESENCE_INTERNAL = 1 << 0; - public final static int PRESENCE_EXTERNAL = 1 << 1; - +public interface WindowManagerPolicy extends WindowManagerPolicyConstants { // Navigation bar position values int NAV_BAR_LEFT = 1 << 0; int NAV_BAR_RIGHT = 1 << 1; int NAV_BAR_BOTTOM = 1 << 2; - public final static boolean WATCH_POINTER = false; - - /** - * Sticky broadcast of the current HDMI plugged state. - */ - public final static String ACTION_HDMI_PLUGGED = "android.intent.action.HDMI_PLUGGED"; - - /** - * Extra in {@link #ACTION_HDMI_PLUGGED} indicating the state: true if - * plugged in to HDMI, false if not. - */ - public final static String EXTRA_HDMI_PLUGGED_STATE = "state"; - - /** - * Set to {@code true} when intent was invoked from pressing the home key. - * @hide - */ - @SystemApi - public static final String EXTRA_FROM_HOME_KEY = "android.intent.extra.FROM_HOME_KEY"; - /** * Pass this event to the user / app. To be returned from * {@link #interceptKeyBeforeQueueing}. */ - public final static int ACTION_PASS_TO_USER = 0x00000001; + int ACTION_PASS_TO_USER = 0x00000001; + /** Layout state may have changed (so another layout will be performed) */ + int FINISH_LAYOUT_REDO_LAYOUT = 0x0001; + /** Configuration state may have changed */ + int FINISH_LAYOUT_REDO_CONFIG = 0x0002; + /** Wallpaper may need to move */ + int FINISH_LAYOUT_REDO_WALLPAPER = 0x0004; + /** Need to recompute animations */ + int FINISH_LAYOUT_REDO_ANIM = 0x0008; /** * Register shortcuts for window manager to dispatch. @@ -483,7 +455,7 @@ public interface WindowManagerPolicy { /** * Returns true if the window owner can add internal system windows. - * That is, they have {@link permission#INTERNAL_SYSTEM_WINDOW}. + * That is, they have {@link Manifest.permission#INTERNAL_SYSTEM_WINDOW}. */ default boolean canAddInternalSystemWindow() { return false; @@ -491,7 +463,7 @@ public interface WindowManagerPolicy { /** * Returns true if the window owner has the permission to acquire a sleep token when it's - * visible. That is, they have the permission {@link permission#DEVICE_POWER}. + * visible. That is, they have the permission {@link Manifest.permission#DEVICE_POWER}. */ boolean canAcquireSleepToken(); } @@ -648,24 +620,6 @@ public interface WindowManagerPolicy { } } - public interface PointerEventListener { - /** - * 1. onPointerEvent will be called on the service.UiThread. - * 2. motionEvent will be recycled after onPointerEvent returns so if it is needed later a - * copy() must be made and the copy must be recycled. - **/ - void onPointerEvent(MotionEvent motionEvent); - - /** - * @see #onPointerEvent(MotionEvent) - **/ - default void onPointerEvent(MotionEvent motionEvent, int displayId) { - if (displayId == DEFAULT_DISPLAY) { - onPointerEvent(motionEvent); - } - } - } - /** Window has been added to the screen. */ public static final int TRANSIT_ENTER = 1; /** Window has been removed from the screen. */ @@ -682,13 +636,6 @@ public interface WindowManagerPolicy { // NOTE: screen off reasons are in order of significance, with more // important ones lower than less important ones. - /** Screen turned off because of a device admin */ - public final int OFF_BECAUSE_OF_ADMIN = 1; - /** Screen turned off because of power button */ - public final int OFF_BECAUSE_OF_USER = 2; - /** Screen turned off because of timeout */ - public final int OFF_BECAUSE_OF_TIMEOUT = 3; - /** @hide */ @IntDef({USER_ROTATION_FREE, USER_ROTATION_LOCKED}) @Retention(RetentionPolicy.SOURCE) @@ -806,7 +753,7 @@ public interface WindowManagerPolicy { * @param type The type of window being assigned. * @param canAddInternalSystemWindow If the owner window associated with the type we are * evaluating can add internal system windows. I.e they have - * {@link permission#INTERNAL_SYSTEM_WINDOW}. If true, alert window + * {@link Manifest.permission#INTERNAL_SYSTEM_WINDOW}. If true, alert window * types {@link android.view.WindowManager.LayoutParams#isSystemAlertWindowType(int)} * can be assigned layers greater than the layer for * {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY} Else, their @@ -916,13 +863,6 @@ public interface WindowManagerPolicy { } } - int APPLICATION_LAYER = 2; - int APPLICATION_MEDIA_SUBLAYER = -2; - int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1; - int APPLICATION_PANEL_SUBLAYER = 1; - int APPLICATION_SUB_PANEL_SUBLAYER = 2; - int APPLICATION_ABOVE_SUB_PANEL_SUBLAYER = 3; - /** * Return how to Z-order sub-windows in relation to the window they are attached to. * Return positive to have them ordered in front, negative for behind. @@ -975,7 +915,7 @@ public interface WindowManagerPolicy { /** * Return the available screen width that we should report for the * configuration. This must be no larger than - * {@link #getNonDecorDisplayWidth(int, int, int)}; it may be smaller than + * {@link #getNonDecorDisplayWidth(int, int, int, int int, int)}; it may be smaller than * that to account for more transient decoration like a status bar. */ public int getConfigDisplayWidth(int fullWidth, int fullHeight, int rotation, @@ -984,7 +924,7 @@ public interface WindowManagerPolicy { /** * Return the available screen height that we should report for the * configuration. This must be no larger than - * {@link #getNonDecorDisplayHeight(int, int, int)}; it may be smaller than + * {@link #getNonDecorDisplayHeight(int, int, int, int, int)}; it may be smaller than * that to account for more transient decoration like a status bar. */ public int getConfigDisplayHeight(int fullWidth, int fullHeight, int rotation, @@ -1213,15 +1153,6 @@ public interface WindowManagerPolicy { return false; } - /** Layout state may have changed (so another layout will be performed) */ - static final int FINISH_LAYOUT_REDO_LAYOUT = 0x0001; - /** Configuration state may have changed */ - static final int FINISH_LAYOUT_REDO_CONFIG = 0x0002; - /** Wallpaper may need to move */ - static final int FINISH_LAYOUT_REDO_WALLPAPER = 0x0004; - /** Need to recompute animations */ - static final int FINISH_LAYOUT_REDO_ANIM = 0x0008; - /** * Called following layout of all windows before each window has policy applied. * @@ -1374,7 +1305,7 @@ public interface WindowManagerPolicy { public void enableKeyguard(boolean enabled); /** - * Callback used by {@link WindowManagerPolicy#exitKeyguardSecurely} + * Callback used by {@link #exitKeyguardSecurely} */ interface OnKeyguardExitResult { void onKeyguardExitResult(boolean success); @@ -1552,8 +1483,8 @@ public interface WindowManagerPolicy { * * @return The rotation mode. * - * @see WindowManagerPolicy#USER_ROTATION_LOCKED - * @see WindowManagerPolicy#USER_ROTATION_FREE + * @see #USER_ROTATION_LOCKED + * @see #USER_ROTATION_FREE */ @UserRotationMode public int getUserRotationMode(); @@ -1561,8 +1492,7 @@ public interface WindowManagerPolicy { /** * Inform the policy that the user has chosen a preferred orientation ("rotation lock"). * - * @param mode One of {@link WindowManagerPolicy#USER_ROTATION_LOCKED} or - * {@link WindowManagerPolicy#USER_ROTATION_FREE}. + * @param mode One of {@link #USER_ROTATION_LOCKED} or {@link #USER_ROTATION_FREE}. * @param rotation One of {@link Surface#ROTATION_0}, {@link Surface#ROTATION_90}, * {@link Surface#ROTATION_180}, {@link Surface#ROTATION_270}. */ @@ -1757,20 +1687,4 @@ public interface WindowManagerPolicy { return Integer.toString(mode); } } - - /** - * Convert the off reason to a human readable format. - */ - static String offReasonToString(int why) { - switch (why) { - case OFF_BECAUSE_OF_ADMIN: - return "OFF_BECAUSE_OF_ADMIN"; - case OFF_BECAUSE_OF_USER: - return "OFF_BECAUSE_OF_USER"; - case OFF_BECAUSE_OF_TIMEOUT: - return "OFF_BECAUSE_OF_TIMEOUT"; - default: - return Integer.toString(why); - } - } } diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index 70cd54ffd09d..58002bc8fcdb 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -15,14 +15,14 @@ import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; import android.util.Slog; -import android.view.WindowManagerPolicy; -import android.view.WindowManagerPolicy.OnKeyguardExitResult; +import android.view.WindowManagerPolicyConstants; import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IKeyguardDrawnCallback; import com.android.internal.policy.IKeyguardExitCallback; import com.android.internal.policy.IKeyguardService; import com.android.server.UiThread; +import com.android.server.policy.WindowManagerPolicy.OnKeyguardExitResult; import java.io.PrintWriter; @@ -419,7 +419,7 @@ public class KeyguardServiceDelegate { pw.println(prefix + "deviceHasKeyguard=" + mKeyguardState.deviceHasKeyguard); pw.println(prefix + "enabled=" + mKeyguardState.enabled); pw.println(prefix + "offReason=" + - WindowManagerPolicy.offReasonToString(mKeyguardState.offReason)); + WindowManagerPolicyConstants.offReasonToString(mKeyguardState.offReason)); pw.println(prefix + "currentUser=" + mKeyguardState.currentUser); pw.println(prefix + "bootCompleted=" + mKeyguardState.bootCompleted); pw.println(prefix + "screenState=" + screenStateToString(mKeyguardState.screenState)); diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index 0ecf0e1ea7a7..8ee26f29957a 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -25,6 +25,7 @@ import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.server.EventLogTags; import com.android.server.LocalServices; +import com.android.server.policy.WindowManagerPolicy; import android.content.BroadcastReceiver; import android.content.Context; @@ -49,7 +50,6 @@ import android.os.WorkSource; import android.provider.Settings; import android.util.EventLog; import android.util.Slog; -import android.view.WindowManagerPolicy; import android.view.inputmethod.InputMethodManagerInternal; /** diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 2c87a4034300..7f1a534c12e9 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -69,7 +69,6 @@ import android.util.SparseArray; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; import android.view.Display; -import android.view.WindowManagerPolicy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IAppOpsService; @@ -90,6 +89,7 @@ import com.android.server.Watchdog; import com.android.server.am.BatteryStatsService; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; +import com.android.server.policy.WindowManagerPolicy; import com.android.server.power.batterysaver.BatterySaverController; import libcore.util.Objects; diff --git a/services/core/java/com/android/server/vr/Vr2dDisplay.java b/services/core/java/com/android/server/vr/Vr2dDisplay.java index 95d03d4bda49..7866e7d44938 100644 --- a/services/core/java/com/android/server/vr/Vr2dDisplay.java +++ b/services/core/java/com/android/server/vr/Vr2dDisplay.java @@ -24,9 +24,8 @@ import android.service.vr.IPersistentVrStateCallbacks; import android.service.vr.IVrManager; import android.util.Log; import android.view.Surface; -import android.view.WindowManagerInternal; -import com.android.server.vr.VrManagerService; +import com.android.server.wm.WindowManagerInternal; /** * Creates a 2D Virtual Display while VR Mode is enabled. This display will be used to run and diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index 5493207d0f8a..1f4e64e8b1b3 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -58,7 +58,7 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; import android.util.SparseArray; -import android.view.WindowManagerInternal; +import com.android.server.wm.WindowManagerInternal; import com.android.internal.R; import com.android.internal.util.DumpUtils; diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java index 88d1e5560bcc..95b139ad4da2 100644 --- a/services/core/java/com/android/server/wm/AccessibilityController.java +++ b/services/core/java/com/android/server/wm/AccessibilityController.java @@ -55,14 +55,14 @@ import android.view.SurfaceControl; import android.view.ViewConfiguration; import android.view.WindowInfo; import android.view.WindowManager; -import android.view.WindowManagerInternal.MagnificationCallbacks; -import android.view.WindowManagerInternal.WindowsForAccessibilityCallback; -import android.view.WindowManagerPolicy; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import com.android.internal.R; import com.android.internal.os.SomeArgs; +import com.android.server.policy.WindowManagerPolicy; +import com.android.server.wm.WindowManagerInternal.MagnificationCallbacks; +import com.android.server.wm.WindowManagerInternal.WindowsForAccessibilityCallback; import java.util.ArrayList; import java.util.HashSet; diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index c19ede0c0f4c..c2cbced2311c 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -16,7 +16,6 @@ package com.android.server.wm; -import static android.view.WindowManagerInternal.AppTransitionListener; import static com.android.internal.R.styleable.WindowAnimation_activityCloseEnterAnimation; import static com.android.internal.R.styleable.WindowAnimation_activityCloseExitAnimation; import static com.android.internal.R.styleable.WindowAnimation_activityOpenEnterAnimation; @@ -44,6 +43,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; +import static com.android.server.wm.WindowManagerInternal.AppTransitionListener; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_NONE; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM; diff --git a/services/core/java/com/android/server/wm/AppWindowAnimator.java b/services/core/java/com/android/server/wm/AppWindowAnimator.java index accfc652aac6..5c1d5b255d88 100644 --- a/services/core/java/com/android/server/wm/AppWindowAnimator.java +++ b/services/core/java/com/android/server/wm/AppWindowAnimator.java @@ -16,7 +16,7 @@ package com.android.server.wm; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; import static com.android.server.wm.AppTransition.TRANSIT_UNSET; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS; diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java index 584184020d33..a528ecdf537e 100644 --- a/services/core/java/com/android/server/wm/AppWindowContainerController.java +++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java @@ -45,10 +45,11 @@ import android.os.Trace; import android.util.Slog; import android.view.DisplayInfo; import android.view.IApplicationToken; -import android.view.WindowManagerPolicy.StartingSurface; import com.android.internal.annotations.VisibleForTesting; import com.android.server.AttributeCache; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; + /** * Controller for the app window token container. This is created by activity manager to link * activity records to the app window token container they use in window manager. diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 98db80ef0a3b..627f8cee3fd1 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -16,7 +16,6 @@ package com.android.server.wm; -import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.content.pm.ActivityInfo.CONFIG_ORIENTATION; import static android.content.pm.ActivityInfo.CONFIG_SCREEN_SIZE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_BEHIND; @@ -28,8 +27,8 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.AppTransition.TRANSIT_UNSET; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; @@ -67,10 +66,10 @@ import android.view.IApplicationToken; import android.view.SurfaceControl; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; -import android.view.WindowManagerPolicy.StartingSurface; import com.android.internal.util.ToBooleanFunction; import com.android.server.input.InputApplicationHandle; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; import com.android.server.wm.WindowManagerService.H; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/wm/BoundsAnimationController.java b/services/core/java/com/android/server/wm/BoundsAnimationController.java index 7953ee430934..ba67ff6a678e 100644 --- a/services/core/java/com/android/server/wm/BoundsAnimationController.java +++ b/services/core/java/com/android/server/wm/BoundsAnimationController.java @@ -33,7 +33,6 @@ import android.util.ArrayMap; import android.util.Slog; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; -import android.view.WindowManagerInternal; import com.android.internal.annotations.VisibleForTesting; diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 17312b217c08..44dfa07794d2 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -58,10 +58,10 @@ import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR; import static android.view.WindowManager.LayoutParams.TYPE_TOAST; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_UNOCCLUDE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT; @@ -146,12 +146,11 @@ import android.view.MagnificationSpec; import android.view.Surface; import android.view.SurfaceControl; import android.view.SurfaceSession; -import android.view.WindowManagerPolicy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ToBooleanFunction; import com.android.internal.view.IInputMethodClient; -import android.view.DisplayFrames; +import com.android.server.policy.WindowManagerPolicy; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/core/java/android/view/DisplayFrames.java b/services/core/java/com/android/server/wm/DisplayFrames.java index e6861d83d2fd..0249713ec3c4 100644 --- a/core/java/android/view/DisplayFrames.java +++ b/services/core/java/com/android/server/wm/DisplayFrames.java @@ -11,10 +11,10 @@ * 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 + * limitations under the License. */ -package android.view; +package com.android.server.wm; import static android.view.Surface.ROTATION_180; import static android.view.Surface.ROTATION_270; @@ -23,6 +23,7 @@ import static com.android.server.wm.proto.DisplayFramesProto.STABLE_BOUNDS; import android.graphics.Rect; import android.util.proto.ProtoOutputStream; +import android.view.DisplayInfo; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/wm/DragDropController.java b/services/core/java/com/android/server/wm/DragDropController.java index 4567e101157d..65951dc634f8 100644 --- a/services/core/java/com/android/server/wm/DragDropController.java +++ b/services/core/java/com/android/server/wm/DragDropController.java @@ -36,9 +36,10 @@ import android.view.Surface; import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.View; -import android.view.WindowManagerInternal.IDragDropCallback; + import com.android.internal.util.Preconditions; import com.android.server.input.InputWindowHandle; +import com.android.server.wm.WindowManagerInternal.IDragDropCallback; /** * Managing drag and drop operations initiated by View#startDragAndDrop. diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index a766097c7078..18b0f976dbd2 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -47,11 +47,11 @@ import android.view.InputChannel; import android.view.InputEventReceiver; import android.view.KeyEvent; import android.view.WindowManager; -import android.view.WindowManagerPolicy; import com.android.server.input.InputApplicationHandle; import com.android.server.input.InputManagerService; import com.android.server.input.InputWindowHandle; +import com.android.server.policy.WindowManagerPolicy; import java.io.PrintWriter; import java.util.Arrays; diff --git a/services/core/java/com/android/server/wm/KeyguardDisableHandler.java b/services/core/java/com/android/server/wm/KeyguardDisableHandler.java index 2eb186b5973f..4a20f1a039ef 100644 --- a/services/core/java/com/android/server/wm/KeyguardDisableHandler.java +++ b/services/core/java/com/android/server/wm/KeyguardDisableHandler.java @@ -29,7 +29,8 @@ import android.os.RemoteException; import android.os.TokenWatcher; import android.util.Log; import android.util.Pair; -import android.view.WindowManagerPolicy; + +import com.android.server.policy.WindowManagerPolicy; public class KeyguardDisableHandler extends Handler { private static final String TAG = TAG_WITH_CLASS_NAME ? "KeyguardDisableHandler" : TAG_WM; diff --git a/services/core/java/com/android/server/wm/PointerEventDispatcher.java b/services/core/java/com/android/server/wm/PointerEventDispatcher.java index 484987ec127e..ab8b8d472d9d 100644 --- a/services/core/java/com/android/server/wm/PointerEventDispatcher.java +++ b/services/core/java/com/android/server/wm/PointerEventDispatcher.java @@ -21,7 +21,7 @@ import android.view.InputDevice; import android.view.InputEvent; import android.view.InputEventReceiver; import android.view.MotionEvent; -import android.view.WindowManagerPolicy.PointerEventListener; +import android.view.WindowManagerPolicyConstants.PointerEventListener; import com.android.server.UiThread; diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 43dfccc66920..4008811b2dc8 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -59,10 +59,10 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE; import static android.view.WindowManager.LayoutParams.TYPE_DREAM; import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DISPLAY; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_KEEP_SCREEN_ON; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS; diff --git a/services/core/java/com/android/server/wm/SnapshotStartingData.java b/services/core/java/com/android/server/wm/SnapshotStartingData.java index 35f35db5ada3..c9e43c52b911 100644 --- a/services/core/java/com/android/server/wm/SnapshotStartingData.java +++ b/services/core/java/com/android/server/wm/SnapshotStartingData.java @@ -17,8 +17,8 @@ package com.android.server.wm; import android.app.ActivityManager.TaskSnapshot; -import android.graphics.GraphicBuffer; -import android.view.WindowManagerPolicy.StartingSurface; + +import com.android.server.policy.WindowManagerPolicy.StartingSurface; /** * Represents starting data for snapshot starting windows. diff --git a/services/core/java/com/android/server/wm/SplashScreenStartingData.java b/services/core/java/com/android/server/wm/SplashScreenStartingData.java index 4b14f867b381..f52ce3894e19 100644 --- a/services/core/java/com/android/server/wm/SplashScreenStartingData.java +++ b/services/core/java/com/android/server/wm/SplashScreenStartingData.java @@ -18,7 +18,8 @@ package com.android.server.wm; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; -import android.view.WindowManagerPolicy.StartingSurface; + +import com.android.server.policy.WindowManagerPolicy.StartingSurface; /** * Represents starting data for splash screens, i.e. "traditional" starting windows. diff --git a/services/core/java/com/android/server/wm/StartingData.java b/services/core/java/com/android/server/wm/StartingData.java index 8c564bb54114..eb5011f7778a 100644 --- a/services/core/java/com/android/server/wm/StartingData.java +++ b/services/core/java/com/android/server/wm/StartingData.java @@ -16,7 +16,7 @@ package com.android.server.wm; -import android.view.WindowManagerPolicy.StartingSurface; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; /** * Represents the model about how a starting window should be constructed. diff --git a/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java b/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java index a5080d57af2a..7c5bd43a7e7f 100644 --- a/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java +++ b/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java @@ -16,7 +16,13 @@ package com.android.server.wm; -import android.graphics.PixelFormat; +import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; +import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; + +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_BOTTOM; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_RIGHT; + import android.graphics.Rect; import android.graphics.Region; import android.os.IBinder; @@ -24,13 +30,6 @@ import android.os.Parcel; import android.view.Surface; import android.view.Surface.OutOfResourcesException; import android.view.SurfaceControl; -import android.view.SurfaceSession; - -import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; -import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; -import static android.view.WindowManagerPolicy.NAV_BAR_BOTTOM; -import static android.view.WindowManagerPolicy.NAV_BAR_LEFT; -import static android.view.WindowManagerPolicy.NAV_BAR_RIGHT; /** * SurfaceControl extension that has black background behind navigation bar area for fullscreen diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index 54ef0651ed8c..e6444179d13c 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -37,14 +37,14 @@ import android.view.DisplayListCanvas; import android.view.RenderNode; import android.view.ThreadedRenderer; import android.view.WindowManager.LayoutParams; -import android.view.WindowManagerPolicy.ScreenOffListener; -import android.view.WindowManagerPolicy.StartingSurface; - -import com.google.android.collect.Sets; import com.android.internal.annotations.VisibleForTesting; +import com.android.server.policy.WindowManagerPolicy.ScreenOffListener; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; import com.android.server.wm.TaskSnapshotSurface.SystemBarBackgroundPainter; +import com.google.android.collect.Sets; + import java.io.PrintWriter; /** diff --git a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java index 3ce090ace7b3..e3c7515a0179 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotSurface.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotSurface.java @@ -67,12 +67,12 @@ import android.view.View; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; import android.view.WindowManagerGlobal; -import android.view.WindowManagerPolicy.StartingSurface; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.DecorView; import com.android.internal.view.BaseIWindow; +import com.android.server.policy.WindowManagerPolicy.StartingSurface; /** * This class represents a starting window that shows a snapshot. diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 9186cf320b2e..8a930efea678 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -31,7 +31,7 @@ import static android.view.WindowManager.DOCKED_INVALID; import static android.view.WindowManager.DOCKED_LEFT; import static android.view.WindowManager.DOCKED_RIGHT; import static android.view.WindowManager.DOCKED_TOP; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_MOVEMENT; diff --git a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java index 42a2d9df5fb5..84ad5764025c 100644 --- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java +++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java @@ -20,7 +20,7 @@ import android.graphics.Rect; import android.graphics.Region; import android.hardware.input.InputManager; import android.view.MotionEvent; -import android.view.WindowManagerPolicy.PointerEventListener; +import android.view.WindowManagerPolicyConstants.PointerEventListener; import com.android.server.wm.WindowManagerService.H; diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 629cc868aeb7..3ae4549768ce 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -23,8 +23,8 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.AppTransition.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WALLPAPER; diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index 20bade67047e..7c56f00b64ee 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -30,10 +30,9 @@ import android.util.Slog; import android.util.SparseArray; import android.util.TimeUtils; import android.view.Choreographer; -import android.view.SurfaceControl; -import android.view.WindowManagerPolicy; import com.android.server.AnimationThread; +import com.android.server.policy.WindowManagerPolicy; import java.io.PrintWriter; diff --git a/core/java/android/view/WindowManagerInternal.java b/services/core/java/com/android/server/wm/WindowManagerInternal.java index d07b2ac980eb..036f7b0aea03 100644 --- a/core/java/android/view/WindowManagerInternal.java +++ b/services/core/java/com/android/server/wm/WindowManagerInternal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 The Android Open Source Project + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.view; +package com.android.server.wm; import android.annotation.NonNull; import android.annotation.Nullable; @@ -23,8 +23,14 @@ import android.graphics.Rect; import android.graphics.Region; import android.hardware.display.DisplayManagerInternal; import android.os.IBinder; +import android.view.IInputFilter; +import android.view.IWindow; +import android.view.MagnificationSpec; +import android.view.WindowInfo; import android.view.animation.Animation; +import com.android.server.policy.WindowManagerPolicy; + import java.util.List; /** diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index e123bef133d6..d88cf4dad14f 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -65,10 +65,10 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOICE_INTERACTION; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static android.view.WindowManagerGlobal.RELAYOUT_DEFER_SURFACE_DESTROY; import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.LockGuard.INDEX_WINDOW; import static com.android.server.LockGuard.installLock; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; import static com.android.server.wm.AppTransition.TRANSIT_UNSET; import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_END; import static com.android.server.wm.AppWindowAnimator.PROLONG_ANIMATION_AT_START; @@ -219,10 +219,7 @@ import android.view.WindowContentFrameStats; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.WindowManagerGlobal; -import android.view.WindowManagerInternal; -import android.view.WindowManagerPolicy; -import android.view.WindowManagerPolicy.PointerEventListener; -import android.view.WindowManagerPolicy.ScreenOffListener; +import android.view.WindowManagerPolicyConstants.PointerEventListener; import android.view.animation.Animation; import android.view.inputmethod.InputMethodManagerInternal; @@ -245,7 +242,8 @@ import com.android.server.LocalServices; import com.android.server.UiThread; import com.android.server.Watchdog; import com.android.server.input.InputManagerService; -import android.view.DisplayFrames; +import com.android.server.policy.WindowManagerPolicy; +import com.android.server.policy.WindowManagerPolicy.ScreenOffListener; import com.android.server.power.ShutdownThread; import com.android.server.utils.PriorityDump; diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 730ec3795ac0..e53fccf3e943 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -66,10 +66,10 @@ import static android.view.WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_DOCKED import static android.view.WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_FREEFORM; import static android.view.WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME; import static android.view.WindowManagerGlobal.RELAYOUT_RES_SURFACE_CHANGED; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; -import static android.view.WindowManagerPolicy.TRANSIT_ENTER; -import static android.view.WindowManagerPolicy.TRANSIT_EXIT; -import static android.view.WindowManagerPolicy.TRANSIT_PREVIEW_DONE; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER; +import static com.android.server.policy.WindowManagerPolicy.TRANSIT_ENTER; +import static com.android.server.policy.WindowManagerPolicy.TRANSIT_EXIT; +import static com.android.server.policy.WindowManagerPolicy.TRANSIT_PREVIEW_DONE; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; @@ -158,10 +158,10 @@ import android.view.View; import android.view.ViewTreeObserver; import android.view.WindowInfo; import android.view.WindowManager; -import android.view.WindowManagerPolicy; import com.android.internal.util.ToBooleanFunction; import com.android.server.input.InputWindowHandle; +import com.android.server.policy.WindowManagerPolicy; import java.io.PrintWriter; import java.lang.ref.WeakReference; @@ -2445,7 +2445,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP mPolicyVisibility = true; mPolicyVisibilityAfterAnim = true; if (doAnimation) { - mWinAnimator.applyAnimationLocked(WindowManagerPolicy.TRANSIT_ENTER, true); + mWinAnimator.applyAnimationLocked(TRANSIT_ENTER, true); } if (requestAnim) { mService.scheduleAnimationLocked(); @@ -2473,7 +2473,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP return false; } if (doAnimation) { - mWinAnimator.applyAnimationLocked(WindowManagerPolicy.TRANSIT_EXIT, false); + mWinAnimator.applyAnimationLocked(TRANSIT_EXIT, false); if (mWinAnimator.mAnimation == null) { doAnimation = false; } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 840cc40860ff..d11b0dbcc130 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -64,12 +64,13 @@ import android.view.Surface.OutOfResourcesException; import android.view.SurfaceControl; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; -import android.view.WindowManagerPolicy; import android.view.animation.Animation; import android.view.animation.AnimationSet; import android.view.animation.AnimationUtils; import android.view.animation.Transformation; +import com.android.server.policy.WindowManagerPolicy; + import java.io.PrintWriter; import java.io.FileDescriptor; diff --git a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java index 508186868c1c..169d0a3a6af3 100644 --- a/services/core/java/com/android/server/wm/WindowSurfacePlacer.java +++ b/services/core/java/com/android/server/wm/WindowSurfacePlacer.java @@ -20,8 +20,8 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.app.ActivityManagerInternal.APP_TRANSITION_SNAPSHOT; import static android.app.ActivityManagerInternal.APP_TRANSITION_SPLASH_SCREEN; import static android.app.ActivityManagerInternal.APP_TRANSITION_WINDOWS_DRAWN; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG; -import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_CONFIG; +import static com.android.server.policy.WindowManagerPolicy.FINISH_LAYOUT_REDO_LAYOUT; import static com.android.server.wm.AppTransition.TRANSIT_ACTIVITY_CLOSE; import static com.android.server.wm.AppTransition.TRANSIT_ACTIVITY_OPEN; import static com.android.server.wm.AppTransition.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java index d3a8deee799e..c14f74cf7183 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java @@ -35,7 +35,8 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.UserHandle; -import android.view.WindowManagerInternal; + +import com.android.server.wm.WindowManagerInternal; import org.junit.Before; import org.junit.BeforeClass; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java index 51e6bc90c947..1213e814b3fa 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/GlobalActionPerformerTest.java @@ -22,7 +22,8 @@ import static org.mockito.Mockito.when; import android.accessibilityservice.AccessibilityService; import android.app.StatusBarManager; import android.content.Context; -import android.view.WindowManagerInternal; + +import com.android.server.wm.WindowManagerInternal; import org.junit.Before; import org.junit.Test; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java index fc12edc7b62a..18193984dd19 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java @@ -44,8 +44,10 @@ import android.os.PowerManager; import android.os.RemoteException; import android.support.test.runner.AndroidJUnit4; import android.view.KeyEvent; -import android.view.WindowManagerPolicy; + import com.android.server.accessibility.KeyEventDispatcher.KeyEventFilter; +import com.android.server.policy.WindowManagerPolicy; + import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.junit.Before; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java index 5db397f85f1f..ceb3f9d23ce7 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyboardInterceptorTest.java @@ -45,8 +45,9 @@ import org.mockito.MockitoAnnotations; import android.os.Looper; import android.support.test.runner.AndroidJUnit4; import android.view.KeyEvent; -import android.view.WindowManagerPolicy; -import android.view.WindowManagerPolicy.WindowState; + +import com.android.server.policy.WindowManagerPolicy; +import com.android.server.policy.WindowManagerPolicy.WindowState; /** * Tests for KeyboardInterceptor diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java index 5887215257e3..d3a3090956a7 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java @@ -45,10 +45,10 @@ import android.os.Looper; import android.os.Message; import android.support.test.runner.AndroidJUnit4; import android.view.MagnificationSpec; -import android.view.WindowManagerInternal; -import android.view.WindowManagerInternal.MagnificationCallbacks; import com.android.internal.R; +import com.android.server.wm.WindowManagerInternal; +import com.android.server.wm.WindowManagerInternal.MagnificationCallbacks; import org.hamcrest.CoreMatchers; import org.hamcrest.Description; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java index ec99a9a2eb95..d286b3f7cfb6 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java @@ -18,7 +18,7 @@ package com.android.server.accessibility; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; -import static android.view.WindowManagerPolicy.FLAG_PASS_TO_USER; +import static android.view.WindowManagerPolicyConstants.FLAG_PASS_TO_USER; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.everyItem; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java index 6311d0009258..dbebd01e2460 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/UiAutomationManagerTest.java @@ -33,9 +33,10 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.IBinder; import android.os.Looper; -import android.view.WindowManagerInternal; import android.view.accessibility.AccessibilityEvent; +import com.android.server.wm.WindowManagerInternal; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java b/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java index 2b770acf59cc..d90e284d44a0 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityRecordTests.java @@ -21,10 +21,11 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManagerPolicy.NAV_BAR_BOTTOM; -import static android.view.WindowManagerPolicy.NAV_BAR_LEFT; -import static android.view.WindowManagerPolicy.NAV_BAR_RIGHT; import static com.android.server.am.ActivityStack.REMOVE_TASK_MODE_MOVING; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_BOTTOM; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_LEFT; +import static com.android.server.policy.WindowManagerPolicy.NAV_BAR_RIGHT; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java index 61df22ecda9c..1211f00b1252 100644 --- a/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/display/DisplayManagerServiceTest.java @@ -26,7 +26,6 @@ import android.os.IBinder; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.view.SurfaceControl; -import android.view.WindowManagerInternal; import com.android.server.LocalServices; import com.android.server.SystemService; @@ -34,6 +33,7 @@ import com.android.server.display.DisplayDeviceInfo; import com.android.server.display.DisplayManagerService.SyncRoot; import com.android.server.display.VirtualDisplayAdapter.SurfaceControlDisplayFactory; import com.android.server.lights.LightsManager; +import com.android.server.wm.WindowManagerInternal; import org.mockito.ArgumentCaptor; import org.mockito.Mock; diff --git a/services/tests/servicestests/src/com/android/server/wm/BoundsAnimationControllerTests.java b/services/tests/servicestests/src/com/android/server/wm/BoundsAnimationControllerTests.java index 0081214a24da..53a5899b2850 100644 --- a/services/tests/servicestests/src/com/android/server/wm/BoundsAnimationControllerTests.java +++ b/services/tests/servicestests/src/com/android/server/wm/BoundsAnimationControllerTests.java @@ -31,7 +31,8 @@ import android.support.test.InstrumentationRegistry; import android.support.test.annotation.UiThreadTest; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import android.view.WindowManagerInternal.AppTransitionListener; + +import com.android.server.wm.WindowManagerInternal.AppTransitionListener; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java index a45695ffb5be..c73534196f45 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -47,7 +47,6 @@ import android.view.IWindowManager; import android.view.InputChannel; import android.view.KeyEvent; import android.view.WindowManager; -import android.view.WindowManagerPolicy; import android.view.animation.Animation; import android.os.PowerManagerInternal; @@ -55,6 +54,7 @@ import com.android.internal.policy.IKeyguardDismissCallback; import com.android.internal.policy.IShortcutService; import com.android.server.input.InputManagerService; import com.android.server.LocalServices; +import com.android.server.policy.WindowManagerPolicy; import java.io.PrintWriter; |