Merge "Remove pieces of device entry flag" into main (aa4718c8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import com.android.compose.animation.scene.SceneTransitionLayout
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.keyguard.KeyguardStatusView
		import com.android.keyguard.KeyguardStatusViewController
		import com.android.keyguard.LegacyLockIconViewController
		import com.android.keyguard.LockIconView
		import com.android.keyguard.dagger.KeyguardStatusViewComponent
		import com.android.systemui.CoreStartable
		import com.android.systemui.biometrics.ui.binder.DeviceEntryUnlockTrackerViewBinder
		@@ -39,7 +37,6 @@ import com.android.systemui.common.ui.ConfigurationState
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
		import com.android.systemui.keyguard.shared.model.LockscreenSceneBlueprint
		import com.android.systemui.keyguard.ui.binder.KeyguardBlueprintViewBinder
		@@ -94,7 +91,6 @@ constructor(
		private val configuration: ConfigurationState,
		private val context: Context,
		private val keyguardIndicationController: KeyguardIndicationController,
		private val lockIconViewController: Lazy<LegacyLockIconViewController>,
		private val shadeInteractor: ShadeInteractor,
		private val interactionJankMonitor: InteractionJankMonitor,
		private val deviceEntryHapticsInteractor: DeviceEntryHapticsInteractor,
		@@ -171,10 +167,6 @@ constructor(
		private fun initializeViews() {
		val indicationArea = KeyguardIndicationArea(context, null)
		keyguardIndicationController.setIndicationArea(indicationArea)

		if (!DeviceEntryUdfpsRefactor.isEnabled) {
		lockIconViewController.get().setLockIconView(LockIconView(context, null))
		}
		}

		private fun bindKeyguardRootView() {

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -139,7 +139,6 @@ import com.android.systemui.classifier.FalsingCollector;
		import com.android.systemui.communal.ui.viewmodel.CommunalTransitionViewModel;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.dagger.qualifiers.UiBackground;
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dreams.ui.viewmodel.DreamViewModel;
		import com.android.systemui.dump.DumpManager;
		@@ -3569,9 +3568,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
		}

		// Ensure that keyguard becomes visible if the going away animation is canceled
		if (showKeyguard && !KeyguardWmStateRefactor.isEnabled()
		&& (MigrateClocksToBlueprint.isEnabled()
		\|\| DeviceEntryUdfpsRefactor.isEnabled())) {
		if (showKeyguard && !KeyguardWmStateRefactor.isEnabled()) {
		mKeyguardInteractor.showKeyguard();
		}
		}

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.view.View
		import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.app.tracing.coroutines.launch
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
		import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewModel
		import com.android.systemui.lifecycle.repeatWhenAttached
		@@ -34,13 +33,7 @@ object AlternateBouncerUdfpsViewBinder {

		/** Updates UI for the UDFPS icon on the alternate bouncer. */
		@JvmStatic
		fun bind(
		view: DeviceEntryIconView,
		viewModel: AlternateBouncerUdfpsIconViewModel,
		) {
		if (DeviceEntryUdfpsRefactor.isUnexpectedlyInLegacyMode()) {
		return
		}
		fun bind(view: DeviceEntryIconView, viewModel: AlternateBouncerUdfpsIconViewModel) {
		val fgIconView = view.iconView
		val bgView = view.bgView

		@@ -66,7 +59,7 @@ object AlternateBouncerUdfpsViewBinder {
		viewModel.fgViewModel.collect { fgViewModel ->
		fgIconView.setImageState(
		view.getIconState(fgViewModel.type, fgViewModel.useAodVariant),
		/* merge */ false
		/* merge */ false,
		)
		fgIconView.imageTintList = ColorStateList.valueOf(fgViewModel.tint)
		fgIconView.setPadding(

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

+6 −17

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import com.android.app.tracing.coroutines.launch
		import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.deviceentry.ui.binder.UdfpsAccessibilityOverlayBinder
		import com.android.systemui.deviceentry.ui.view.UdfpsAccessibilityOverlay
		import com.android.systemui.deviceentry.ui.viewmodel.AlternateBouncerUdfpsAccessibilityOverlayViewModel
		@@ -95,7 +94,7 @@ constructor(
		private var alternateBouncerView: ConstraintLayout? = null

		override fun start() {
		if (!DeviceEntryUdfpsRefactor.isEnabled \|\| SceneContainerFlag.isEnabled) {
		if (SceneContainerFlag.isEnabled) {
		return
		}

		@@ -182,14 +181,7 @@ constructor(
		}

		/** Binds the view to the view-model, continuing to update the former based on the latter. */
		fun bind(
		view: ConstraintLayout,
		alternateBouncerDependencies: AlternateBouncerDependencies,
		) {
		if (DeviceEntryUdfpsRefactor.isUnexpectedlyInLegacyMode()) {
		return
		}

		fun bind(view: ConstraintLayout, alternateBouncerDependencies: AlternateBouncerDependencies) {
		optionallyAddUdfpsViews(
		view = view,
		logger = alternateBouncerDependencies.logger,
		@@ -287,10 +279,7 @@ constructor(
		)
		}
		view.addView(udfpsView)
		AlternateBouncerUdfpsViewBinder.bind(
		udfpsView,
		udfpsIconViewModel,
		)
		AlternateBouncerUdfpsViewBinder.bind(udfpsView, udfpsIconViewModel)
		}

		val constraintSet = ConstraintSet().apply { clone(view) }
		@@ -310,17 +299,17 @@ constructor(
		ConstraintSet.START,
		ConstraintSet.PARENT_ID,
		ConstraintSet.START,
		iconLocation.left
		iconLocation.left,
		)

		// udfpsA11yOverlayView:
		constrainWidth(
		udfpsA11yOverlayViewId,
		ViewGroup.LayoutParams.MATCH_PARENT
		ViewGroup.LayoutParams.MATCH_PARENT,
		)
		constrainHeight(
		udfpsA11yOverlayViewId,
		ViewGroup.LayoutParams.MATCH_PARENT
		ViewGroup.LayoutParams.MATCH_PARENT,
		)
		}
		constraintSet.applyTo(view)

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

+4 −9

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.lifecycle.Lifecycle
		import androidx.lifecycle.repeatOnLifecycle
		import com.android.app.tracing.coroutines.launch
		import com.android.systemui.common.ui.view.LongPressHandlingView
		import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.keyguard.ui.view.DeviceEntryIconView
		import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryBackgroundViewModel
		import com.android.systemui.keyguard.ui.viewmodel.DeviceEntryForegroundViewModel
		@@ -68,7 +67,6 @@ object DeviceEntryIconViewBinder {
		vibratorHelper: VibratorHelper,
		overrideColor: Color? = null,
		): DisposableHandle {
		DeviceEntryUdfpsRefactor.isUnexpectedlyInLegacyMode()
		val disposables = DisposableHandles()
		val longPressHandlingView = view.longPressHandlingView
		val fgIconView = view.iconView
		@@ -79,7 +77,7 @@ object DeviceEntryIconViewBinder {
		view: View,
		x: Int,
		y: Int,
		isA11yAction: Boolean
		isA11yAction: Boolean,
		) {
		if (
		!isA11yAction && falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)
		@@ -87,14 +85,11 @@ object DeviceEntryIconViewBinder {
		Log.d(
		TAG,
		"Long press rejected because it is not a11yAction " +
		"and it is a falseLongTap"
		"and it is a falseLongTap",
		)
		return
		}
		vibratorHelper.performHapticFeedback(
		view,
		HapticFeedbackConstants.CONFIRM,
		)
		vibratorHelper.performHapticFeedback(view, HapticFeedbackConstants.CONFIRM)
		applicationScope.launch {
		view.clearFocus()
		view.clearAccessibilityFocus()
		@@ -192,7 +187,7 @@ object DeviceEntryIconViewBinder {
		fgViewModel.viewModel.collect { viewModel ->
		fgIconView.setImageState(
		view.getIconState(viewModel.type, viewModel.useAodVariant),
		/* merge */ false
		/* merge */ false,
		)
		if (viewModel.type.contentDescriptionResId != -1) {
		fgIconView.contentDescription =