am a1b9e3d7: Merge "Animate starting windows when keyguard dismissed." into lmp-mr1-dev (ec5f374f) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -136,8 +136,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		static final String TAG = "WindowManager";
		static final boolean DEBUG = false;
		static final boolean localLOGV = false;
		static final boolean DEBUG_LAYOUT = false;
		static final boolean DEBUG_INPUT = false;
		static final boolean DEBUG_KEYGUARD = false;
		static final boolean DEBUG_LAYOUT = false;
		static final boolean DEBUG_STARTING_WINDOW = false;
		static final boolean DEBUG_WAKEUP = false;
		static final boolean SHOW_STARTING_ANIMATIONS = true;
		@@ -4981,6 +4982,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		@Override
		public void dismissKeyguardLw() {
		if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "PWM.dismissKeyguardLw");
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		@@ -5012,6 +5014,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		@Override
		public void startKeyguardExitAnimation(long startTime, long fadeoutDuration) {
		if (mKeyguardDelegate != null) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "PWM.startKeyguardExitAnimation");
		mKeyguardDelegate.startKeyguardExitAnimation(startTime, fadeoutDuration);
		}
		}

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -444,10 +444,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		return mService.startHomeActivityLocked(mCurrentUser);
		}

		void keyguardWaitingForActivityDrawn() {
		mWindowManager.keyguardWaitingForActivityDrawn();
		}

		TaskRecord anyTaskForIdLocked(int id) {
		int numDisplays = mActivityDisplays.size();
		for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) {

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

+18 −7

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ 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.PRIVATE_FLAG_KEYGUARD;
		import static com.android.server.wm.WindowManagerService.DEBUG_KEYGUARD;
		import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION;
		import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE;
		import static com.android.server.wm.WindowManagerService.LayoutFields.SET_FORCE_HIDING_CHANGED;
		@@ -29,7 +30,6 @@ import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPA
		import android.content.Context;
		import android.os.Debug;
		import android.os.SystemClock;
		import android.util.Log;
		import android.util.Slog;
		import android.util.SparseArray;
		import android.util.SparseIntArray;
		@@ -233,12 +233,17 @@ public class WindowAnimator {
		final WindowStateAnimator winAnimator = win.mWinAnimator;
		if ((win.mAttrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {
		if (!winAnimator.mAnimating) {
		if (DEBUG_KEYGUARD) Slog.d(TAG,
		"updateWindowsLocked: creating delay animation");

		// Create a new animation to delay until keyguard is gone on its own.
		winAnimator.mAnimation = new AlphaAnimation(1.0f, 1.0f);
		winAnimator.mAnimation.setDuration(KEYGUARD_ANIM_TIMEOUT_MS);
		winAnimator.mAnimationIsEntrance = false;
		}
		} else {
		if (DEBUG_KEYGUARD) Slog.d(TAG,
		"updateWindowsLocked: StatusBar is no longer keyguard");
		mKeyguardGoingAway = false;
		winAnimator.clearAnimation();
		}
		@@ -282,7 +287,7 @@ public class WindowAnimator {

		if (mPolicy.isForceHiding(win.mAttrs)) {
		if (!wasAnimating && nowAnimating) {
		if (WindowManagerService.DEBUG_ANIM \|\|
		if (DEBUG_KEYGUARD \|\| WindowManagerService.DEBUG_ANIM \|\|
		WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
		"Animation started that could impact force hide: " + win);
		mBulkUpdateParams \|= SET_FORCE_HIDING_CHANGED;
		@@ -310,7 +315,7 @@ public class WindowAnimator {
		mForceHiding = win.isDrawnLw() ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN;
		}
		}
		if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
		if (DEBUG_KEYGUARD \|\| WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
		"Force hide " + forceHidingToString()
		+ " hasSurface=" + win.mHasSurface
		+ " policyVis=" + win.mPolicyVisibility
		@@ -327,12 +332,12 @@ public class WindowAnimator {
		&& (!winAnimator.isAnimating() \|\| hideWhenLocked))
		\|\| ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
		changed = win.hideLw(false, false);
		if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
		"Now policy hidden: " + win);
		if ((DEBUG_KEYGUARD \|\| WindowManagerService.DEBUG_VISIBILITY)
		&& changed) Slog.v(TAG, "Now policy hidden: " + win);
		} else {
		changed = win.showLw(false, false);
		if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
		"Now policy shown: " + win);
		if ((DEBUG_KEYGUARD \|\| WindowManagerService.DEBUG_VISIBILITY)
		&& changed) Slog.v(TAG, "Now policy shown: " + win);
		if (changed) {
		if ((mBulkUpdateParams & SET_FORCE_HIDING_CHANGED) != 0
		&& win.isVisibleNow() /w.isReadyForDisplay()/) {
		@@ -404,6 +409,11 @@ public class WindowAnimator {
		if (!mKeyguardGoingAwayDisableWindowAnimations) {
		a = mPolicy.createForceHideEnterAnimation(wallpaperInUnForceHiding,
		mKeyguardGoingAwayToNotificationShade);
		if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: created anim=" + a
		+ " for win=" + unForceHiding.get(i));
		} else {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: skipping anim for win="
		+ unForceHiding.get(i));
		}
		if (a != null) {
		final WindowStateAnimator winAnimator = unForceHiding.get(i);
		@@ -422,6 +432,7 @@ public class WindowAnimator {
		// Wallpaper is going away in un-force-hide motion, animate it as well.
		if (!wallpaperInUnForceHiding && wallpaper != null
		&& !mKeyguardGoingAwayDisableWindowAnimations) {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "updateWindowsLocked: wallpaper animating away");
		Animation a = mPolicy.createForceHideWallpaperExitAnimation(
		mKeyguardGoingAwayToNotificationShade);
		if (a != null) {

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ public class WindowManagerService extends IWindowManager.Stub
		static final boolean DEBUG_FOCUS = false;
		static final boolean DEBUG_FOCUS_LIGHT = DEBUG_FOCUS \|\| false;
		static final boolean DEBUG_ANIM = false;
		static final boolean DEBUG_KEYGUARD = false;
		static final boolean DEBUG_LAYOUT = false;
		static final boolean DEBUG_RESIZE = false;
		static final boolean DEBUG_LAYERS = false;
		@@ -5363,6 +5364,8 @@ public class WindowManagerService extends IWindowManager.Stub
		!= PackageManager.PERMISSION_GRANTED) {
		throw new SecurityException("Requires DISABLE_KEYGUARD permission");
		}
		if (DEBUG_KEYGUARD) Slog.d(TAG, "keyguardGoingAway: disableWinAnim="
		+ disableWindowAnimations + " kgToNotifShade=" + keyguardGoingToNotificationShade);
		synchronized (mWindowMap) {
		mAnimator.mKeyguardGoingAway = true;
		mAnimator.mKeyguardGoingAwayToNotificationShade = keyguardGoingToNotificationShade;
		@@ -5372,12 +5375,15 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		public void keyguardWaitingForActivityDrawn() {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "keyguardWaitingForActivityDrawn");
		synchronized (mWindowMap) {
		mKeyguardWaitingForActivityDrawn = true;
		}
		}

		public void notifyActivityDrawnForKeyguard() {
		if (DEBUG_KEYGUARD) Slog.d(TAG, "notifyActivityDrawnForKeyguard: waiting="
		+ mKeyguardWaitingForActivityDrawn);
		synchronized (mWindowMap) {
		if (mKeyguardWaitingForActivityDrawn) {
		mPolicy.notifyActivityDrawnForKeyguardLw();

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
		import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG;
		import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;
		import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;

		import android.app.AppOpsManager;
		@@ -902,7 +903,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		*/
		boolean isVisibleNow() {
		return mHasSurface && mPolicyVisibility && !mAttachedHidden
		&& !mRootToken.hidden && !mExiting && !mDestroying;
		&& (!mRootToken.hidden \|\| mAttrs.type == TYPE_APPLICATION_STARTING)
		&& !mExiting && !mDestroying;
		}

		/**