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

Commit 130c8937 authored Jun 17, 2016 by Danesh M Committed by Gerrit Code Review Sep 08, 2016

Revert "Revert "Only show keyguard panel if on lockscreen + no activity on top""

CYNGNOS-2980

This reverts commit 226797c8.

Change-Id: I0440faf2dd07b427f639277eec2f3cfa89a7de6e

parent d2569fc3

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -4538,6 +4538,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isSecure();
		}

		public boolean isKeyguardInputRestricted() {
		return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isInputRestricted();
		}

		public long calculateGoingToFullShadeDelay() {
		return mKeyguardFadingAwayDelay + mKeyguardFadingAwayDuration;
		}

packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,10 +102,10 @@ public class LiveLockScreenController {
		}
		}
		} else {
		if (isShowingLiveLockScreenView()) {
		if (isShowingLiveLockScreenView() && !mBar.isKeyguardInputRestricted()) {
		mPanelView.removeView(mLiveLockScreenView);
		mLlsHasFocus = false;
		}
		mLlsHasFocus = false;
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,9 @@ public class WindowAnimator {
		// Show SHOW_WHEN_LOCKED windows that turn on the screen
		allowWhenLocked \|= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.mTurnOnScreen;
		// Show windows that use TYPE_STATUS_BAR_SUB_PANEL when locked
		allowWhenLocked \|= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL;
		allowWhenLocked \|= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL &&
		winShowWhenLocked == null;


		if (appShowWhenLocked != null) {
		allowWhenLocked \|= appShowWhenLocked == win.mAppToken