am 699a5376: am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev (9902b3bc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -312,6 +312,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	boolean mLeaveOpenOnKeyguardHide;		boolean mLeaveOpenOnKeyguardHide;
	KeyguardIndicationController mKeyguardIndicationController;		KeyguardIndicationController mKeyguardIndicationController;

			// Keyguard is going away soon.
			private boolean mKeyguardGoingAway;
			// Keyguard is actually fading away now.
	private boolean mKeyguardFadingAway;		private boolean mKeyguardFadingAway;
	private long mKeyguardFadingAwayDelay;		private long mKeyguardFadingAwayDelay;
	private long mKeyguardFadingAwayDuration;		private long mKeyguardFadingAwayDuration;
	@@ -3558,6 +3561,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,

	// Treat Keyguard exit animation as an app transition to achieve nice transition for status		// Treat Keyguard exit animation as an app transition to achieve nice transition for status
	// bar.		// bar.
			mKeyguardGoingAway = true;
	mIconController.appTransitionPending();		mIconController.appTransitionPending();
	}		}

	@@ -3589,6 +3593,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	*/		*/
	public void finishKeyguardFadingAway() {		public void finishKeyguardFadingAway() {
	mKeyguardFadingAway = false;		mKeyguardFadingAway = false;
			mKeyguardGoingAway = false;
	}		}

	public void stopWaitingForKeyguardExit() {		public void stopWaitingForKeyguardExit() {
	@@ -4079,9 +4084,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
	public void appTransitionStarting(long startTime, long duration) {		public void appTransitionStarting(long startTime, long duration) {

	// Use own timings when Keyguard is going away, see keyguardGoingAway and		// Use own timings when Keyguard is going away, see keyguardGoingAway and
	// setKeyguardFadingAway. When duration is 0, skip this one because no animation is really		// setKeyguardFadingAway.
	// playing.		if (!mKeyguardGoingAway) {
	if (!mKeyguardFadingAway && duration > 0) {
	mIconController.appTransitionStarting(startTime, duration);		mIconController.appTransitionStarting(startTime, duration);
	}		}
	if (mIconPolicy != null) {		if (mIconPolicy != null) {