Merge "Update KeyguardMonitor when UnlockMethod changes" into qt-dev am: 15e2d7e50b (92bee058) · Commits · e / os / android_frameworks_base

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

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1523,6 +1523,8 @@ public class StatusBar extends SystemUI implements DemoMode,

	@Override // UnlockMethodCache.OnUnlockMethodChangedListener		@Override // UnlockMethodCache.OnUnlockMethodChangedListener
	public void onUnlockMethodStateChanged() {		public void onUnlockMethodStateChanged() {
			// Unlock method state changed. Notify KeguardMonitor
			updateKeyguardState();
	logStateToEventlog();		logStateToEventlog();
	}		}

	@@ -3419,9 +3421,7 @@ public class StatusBar extends SystemUI implements DemoMode,
	checkBarModes();		checkBarModes();
	updateScrimController();		updateScrimController();
	mPresenter.updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);		mPresenter.updateMediaMetaData(false, mState != StatusBarState.KEYGUARD);
	mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),		updateKeyguardState();
	mUnlockMethodCache.isMethodSecure(),
	mStatusBarKeyguardViewManager.isOccluded());
	Trace.endSection();		Trace.endSection();
	}		}

	@@ -3460,6 +3460,12 @@ public class StatusBar extends SystemUI implements DemoMode,
	mStatusBarStateController.setIsDozing(dozing);		mStatusBarStateController.setIsDozing(dozing);
	}		}

			private void updateKeyguardState() {
			mKeyguardMonitor.notifyKeyguardState(mStatusBarKeyguardViewManager.isShowing(),
			mUnlockMethodCache.isMethodSecure(),
			mStatusBarKeyguardViewManager.isOccluded());
			}

	public void onActivationReset() {		public void onActivationReset() {
	mKeyguardIndicationController.hideTransientIndication();		mKeyguardIndicationController.hideTransientIndication();
	}		}