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

Merge "Merge "Controls UI - Haptics updates" into rvc-dev am: b86ab6ef33 am: 54209841db" into rvc-d1-dev-plus-aosp am: a30c4397f5 am: 5a131e8777 am: 3f22823bd5

Browse Source 
Change-Id: I654c7f050dbc0dcc5ba41110893fe98c0f057285
This commit is contained in:
Automerger Merge Worker
2020-05-19 18:09:07 +00:00
parent 2e69b94bda 3f22823bd5
commit 16292127d1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
View File

@@ -58,7 +58,7 @@ class ControlActionCoordinatorImpl @Inject constructor(
override fun toggle(cvh: ControlViewHolder, templateId: String, isChecked: Boolean) {
bouncerOrRun {
val effect = if (isChecked) Vibrations.toggleOnEffect else Vibrations.toggleOffEffect
val effect = if (!isChecked) Vibrations.toggleOnEffect else Vibrations.toggleOffEffect
vibrate(effect)
cvh.action(BooleanAction(templateId, !isChecked))
}

5
packages/SystemUI/src/com/android/systemui/controls/ui/Vibrations.kt
View File

@@ -20,7 +20,7 @@ import android.os.VibrationEffect
import android.os.VibrationEffect.Composition.PRIMITIVE_TICK
object Vibrations {
private const val TOGGLE_TICK_COUNT = 12
private const val TOGGLE_TICK_COUNT = 40
val toggleOnEffect = initToggleOnEffect()
val toggleOffEffect = initToggleOffEffect()
@@ -29,6 +29,7 @@ object Vibrations {
private fun initToggleOnEffect(): VibrationEffect {
val composition = VibrationEffect.startComposition()
composition.addPrimitive(PRIMITIVE_TICK, 0.05f, 200)
var i = 0
while (i++ < TOGGLE_TICK_COUNT) {
composition.addPrimitive(PRIMITIVE_TICK, 0.05f, 0)
@@ -43,7 +44,7 @@ object Vibrations {
composition.addPrimitive(PRIMITIVE_TICK, 0.05f, 100)
var i = 0
while (i++ < TOGGLE_TICK_COUNT) {
composition?.addPrimitive(PRIMITIVE_TICK, 0.05f, 0)
composition.addPrimitive(PRIMITIVE_TICK, 0.05f, 0)
}
return composition.compose()
}