Keyguard: Pass keyguard events to KeyguardExternalView (f068b9f0) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -1090,9 +1090,6 @@ public class NotificationPanelView extends PanelView implements
		if (mKeyguardExternalView == null) {
		mKeyguardExternalView =
		getExternalKeyguardView(mThirdPartyKeyguardViewComponent);
		} else {
		// resume the external view
		mKeyguardExternalView.onActivityResumed(null);
		}
		if (mKeyguardExternalView != null && !mKeyguardExternalView.isAttachedToWindow()) {
		addView(mKeyguardExternalView, 0, EXTERNAL_KEYGUARD_VIEW_PARAMS);
		@@ -1101,8 +1098,6 @@ public class NotificationPanelView extends PanelView implements
		} else {
		if (mKeyguardExternalView != null && mKeyguardExternalView.isAttachedToWindow()) {
		removeView(mKeyguardExternalView);
		// pause the external view since we are no longer showing the keyguard
		mKeyguardExternalView.onActivityPaused(null);
		}
		}
		resetVerticalPanelPosition();
		@@ -2586,6 +2581,10 @@ public class NotificationPanelView extends PanelView implements
		return mKeyguardExternalView != null && mKeyguardExternalView.isAttachedToWindow();
		}

		public KeyguardExternalView getExternalKeyguardView() {
		return mKeyguardExternalView;
		}

		private KeyguardExternalView getExternalKeyguardView(ComponentName componentName) {
		try {
		return new KeyguardExternalView(getContext(), null, componentName);

+16 −0

Original line number	Diff line number	Diff line
		@@ -4126,6 +4126,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mDraggedDownRow = null;
		}
		mAssistManager.onLockscreenShown();
		if (mNotificationPanel.hasExternalKeyguardView()) {
		mNotificationPanel.getExternalKeyguardView().onKeyguardShowing(
		mStatusBarKeyguardViewManager.isScreenTurnedOn());
		}
		}

		private void onLaunchTransitionFadingEnded() {
		@@ -4276,6 +4280,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mNotificationPanel.onAffordanceLaunchEnded();
		mNotificationPanel.animate().cancel();
		mNotificationPanel.setAlpha(1f);
		if ( mNotificationPanel.getExternalKeyguardView() != null) {
		mNotificationPanel.getExternalKeyguardView().onKeyguardDismissed();
		}
		return staying;
		}

		@@ -4715,6 +4722,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mScreenTurningOn = false;
		mDozeScrimController.onScreenTurnedOn();
		mVisualizerView.setVisible(true);
		if (mNotificationPanel.hasExternalKeyguardView()) {
		mNotificationPanel.getExternalKeyguardView().onScreenTurnedOn();
		}
		}

		public void onScreenTurnedOff() {
		if (mNotificationPanel.hasExternalKeyguardView()) {
		mNotificationPanel.getExternalKeyguardView().onScreenTurnedOff();
		}
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,7 @@ public class StatusBarKeyguardViewManager {

		public void onScreenTurnedOff() {
		mScreenTurnedOn = false;
		mPhoneStatusBar.onScreenTurnedOff();
		}

		public void notifyDeviceWakeUpRequested() {