Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When quick affordance enabled and device screen turns on or off, vibration always happens" into tm-qpr-dev

Browse Source
This commit is contained in:
Brad Hinegardner
2023-01-11 18:21:11 +00:00
committed by Android (Google) Code Review
parent af40c7894c b3349228c3
commit 7d8b12a206
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBottomAreaViewBinder.kt
View File

@@ -45,7 +45,6 @@ import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordanceViewMod
import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.lifecycle.repeatWhenAttached
import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.FalsingManager
import com.android.systemui.statusbar.VibratorHelper import com.android.systemui.statusbar.VibratorHelper
import com.android.systemui.util.kotlin.pairwise
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.sqrt import kotlin.math.sqrt
import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.milliseconds
@@ -128,18 +127,6 @@ object KeyguardBottomAreaViewBinder {
} }
} }
launch {
viewModel.startButton
.map { it.isActivated }
.pairwise()
.collect { (prev, next) ->
when {
!prev && next -> vibratorHelper?.vibrate(Vibrations.Activated)
prev && !next -> vibratorHelper?.vibrate(Vibrations.Deactivated)
}
}
}
launch { launch {
viewModel.endButton.collect { buttonModel -> viewModel.endButton.collect { buttonModel ->
updateButton( updateButton(
@@ -152,18 +139,6 @@ object KeyguardBottomAreaViewBinder {
} }
} }
launch {
viewModel.endButton
.map { it.isActivated }
.pairwise()
.collect { (prev, next) ->
when {
!prev && next -> vibratorHelper?.vibrate(Vibrations.Activated)
prev && !next -> vibratorHelper?.vibrate(Vibrations.Deactivated)
}
}
}
launch { launch {
viewModel.isOverlayContainerVisible.collect { isVisible -> viewModel.isOverlayContainerVisible.collect { isVisible ->
overlayContainer.visibility = overlayContainer.visibility =
@@ -383,6 +358,13 @@ object KeyguardBottomAreaViewBinder {
.setDuration(longPressDurationMs) .setDuration(longPressDurationMs)
.withEndAction { .withEndAction {
view.setOnClickListener { view.setOnClickListener {
vibratorHelper?.vibrate(
if (viewModel.isActivated) {
Vibrations.Activated
} else {
Vibrations.Deactivated
}
)
viewModel.onClicked( viewModel.onClicked(
KeyguardQuickAffordanceViewModel.OnClickedParameters( KeyguardQuickAffordanceViewModel.OnClickedParameters(
configKey = viewModel.configKey, configKey = viewModel.configKey,