Merge "Merge "Not bypassing while the camera is being launched" into qt-r1-dev... (d16afdfd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt

+4 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ class KeyguardBypassController {
		private set

		var bouncerShowing: Boolean = false
		var launchingAffordance: Boolean = false
		var qSExpanded = false
		set(value) {
		val changed = field != value
		@@ -106,6 +107,9 @@ class KeyguardBypassController {
		// to unlock
		return false
		}
		if (launchingAffordance) {
		return false
		}
		if (isPulseExpanding \|\| qSExpanded) {
		pendingUnlockType = biometricSourceType
		return false

+2 −2

Original line number	Diff line number	Diff line
		@@ -2913,7 +2913,6 @@ public class NotificationPanelView extends PanelView implements
		// nor setting these flags, since the occluded state doesn't change anymore, hence it's
		// never reset.
		if (!isFullyCollapsed()) {
		mLaunchingAffordance = true;
		setLaunchingAffordance(true);
		} else {
		animate = false;
		@@ -2923,7 +2922,6 @@ public class NotificationPanelView extends PanelView implements
		}

		public void onAffordanceLaunchEnded() {
		mLaunchingAffordance = false;
		setLaunchingAffordance(false);
		}

		@@ -2932,8 +2930,10 @@ public class NotificationPanelView extends PanelView implements
		* launched via a camera gesture.
		*/
		private void setLaunchingAffordance(boolean launchingAffordance) {
		mLaunchingAffordance = launchingAffordance;
		getLeftIcon().setLaunchingAffordance(launchingAffordance);
		getRightIcon().setLaunchingAffordance(launchingAffordance);
		mKeyguardBypassController.setLaunchingAffordance(launchingAffordance);
		if (mAffordanceLaunchListener != null) {
		mAffordanceLaunchListener.accept(launchingAffordance);
		}