am 4279a61b: am 9ccc082c: am d69417d2: Merge "Reduce jank on incoming phone... (6c9138f4) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -3524,7 +3524,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		\| FINISH_LAYOUT_REDO_CONFIG
		\| FINISH_LAYOUT_REDO_WALLPAPER;
		}
		if (!mShowingDream) {
		mKeyguardDelegate.setHidden(true);
		}
		} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
		// This is the case of keyguard isSecure() and not mHideLockScreen.
		if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
		@@ -3565,9 +3567,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		public boolean allowAppAnimationsLw() {
		if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) {
		// If keyguard is currently visible, no reason to animate
		// behind it.
		if (mKeyguard != null && mKeyguard.isVisibleLw() \|\| mShowingDream) {
		// If keyguard or dreams is currently visible, no reason to animate behind it.
		return false;
		}
		return true;

+4 −3

Original line number	Diff line number	Diff line
		@@ -8502,6 +8502,8 @@ public class WindowManagerService extends IWindowManager.Stub
		// example, when this transition is being done behind
		// the lock screen.
		if (!mPolicy.allowAppAnimationsLw()) {
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
		"Animations disallowed by keyguard or dream.");
		animLp = null;
		}

		@@ -8544,8 +8546,7 @@ public class WindowManagerService extends IWindowManager.Stub
		NN = mClosingApps.size();
		for (i=0; i<NN; i++) {
		AppWindowToken wtoken = mClosingApps.get(i);
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
		"Now closing app " + wtoken);
		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now closing app " + wtoken);
		wtoken.mAppAnimator.clearThumbnail();
		wtoken.inPendingTransaction = false;
		wtoken.mAppAnimator.animation = null;

+1 −1

File changed.

Contains only whitespace changes.