Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac6756b authored Sep 22, 2014 by John Spurlock Committed by Android Git Automerger Sep 22, 2014

am 34dfd6bb: am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze...

am 34dfd6bb: am d613437b: am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev

* commit '34dfd6bbbd7453cf9426c179818e200251315fe1':
  Doze: Ensure a doze reset happens after leaving keyguard.

parents 2e65058d 5f60e022

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1738,6 +1738,10 @@ public class NotificationPanelView extends PanelView implements
		updateKeyguardStatusBarVisibility();
		}

		public boolean isDozing() {
		return mDozing;
		}

		private static void setBackgroundColorAlpha(final View target, int rgb, int targetAlpha,
		boolean animate) {
		int currentAlpha = getBackgroundAlpha(target);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3641,7 +3641,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		private void updateDozingState() {
		if (mState != StatusBarState.KEYGUARD) {
		if (mState != StatusBarState.KEYGUARD && !mNotificationPanel.isDozing()) {
		return;
		}
		mNotificationPanel.setDozing(mDozing);