Merge "Shortcuts missing from keyguard preview renderer" into main (97e488d4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+16 −12

Original line number	Diff line number	Diff line
		@@ -77,6 +77,22 @@ object KeyguardRootViewBinder {
		}
		}

		if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		launch { viewModel.alpha.collect { alpha -> view.alpha = alpha } }
		}

		if (featureFlags.isEnabled(Flags.MIGRATE_KEYGUARD_STATUS_VIEW)) {
		launch {
		viewModel.translationY.collect {
		val statusView =
		view.requireViewById<View>(R.id.keyguard_status_view)
		statusView.translationY = it
		}
		}
		}
		}

		repeatOnLifecycle(Lifecycle.State.STARTED) {
		if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {
		launch {
		viewModel.keyguardRootViewVisibilityState.collect { visibilityState ->
		@@ -111,18 +127,6 @@ object KeyguardRootViewBinder {
		}
		}
		}

		launch { viewModel.alpha.collect { alpha -> view.alpha = alpha } }
		}

		if (featureFlags.isEnabled(Flags.MIGRATE_KEYGUARD_STATUS_VIEW)) {
		launch {
		viewModel.translationY.collect {
		val statusView =
		view.requireViewById<View>(R.id.keyguard_status_view)
		statusView.translationY = it
		}
		}
		}
		}
		}