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

Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 am: fd4448ac32 am: 6e7b0d96e6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: Ia7c9d430b9a647713b8533e7d03fb8033892eb0e
This commit is contained in:
TreeHugger Robot
2020-06-18 22:00:31 +00:00
committed by Automerger Merge Worker
parent 86bd9e4096 6e7b0d96e6
commit 94bd5bb34a
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/controls/ui/ControlViewHolder.kt
View File

@@ -128,6 +128,8 @@ class ControlViewHolder(
val controlTemplate: ControlTemplate val controlTemplate: ControlTemplate
get() = cws.control?.let { it.controlTemplate } ?: ControlTemplate.NO_TEMPLATE get() = cws.control?.let { it.controlTemplate } ?: ControlTemplate.NO_TEMPLATE
var userInteractionInProgress = false
init { init {
val ld = layout.getBackground() as LayerDrawable val ld = layout.getBackground() as LayerDrawable
ld.mutate() ld.mutate()
@@ -139,6 +141,11 @@ class ControlViewHolder(
} }
fun bindData(cws: ControlWithState) { fun bindData(cws: ControlWithState) {
// If an interaction is in progress, the update may visually interfere with the action the
// action the user wants to make. Don't apply the update, and instead assume a new update
// will coming from when the user interaction is complete.
if (userInteractionInProgress) return
this.cws = cws this.cws = cws
cancelUpdate?.run() cancelUpdate?.run()

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

@@ -216,6 +216,7 @@ class ToggleRangeBehavior : Behavior {
} }
fun beginUpdateRange() { fun beginUpdateRange() {
cvh.userInteractionInProgress = true
cvh.setStatusTextSize(context.getResources() cvh.setStatusTextSize(context.getResources()
.getDimensionPixelSize(R.dimen.control_status_expanded).toFloat()) .getDimensionPixelSize(R.dimen.control_status_expanded).toFloat())
} }
@@ -296,6 +297,7 @@ class ToggleRangeBehavior : Behavior {
cvh.setStatusText("$currentStatusText $currentRangeValue", /* immediately */ true) cvh.setStatusText("$currentStatusText $currentRangeValue", /* immediately */ true)
cvh.controlActionCoordinator.setValue(cvh, rangeTemplate.getTemplateId(), cvh.controlActionCoordinator.setValue(cvh, rangeTemplate.getTemplateId(),
findNearestStep(levelToRangeValue(clipLayer.getLevel()))) findNearestStep(levelToRangeValue(clipLayer.getLevel())))
cvh.userInteractionInProgress = false
} }
fun findNearestStep(value: Float): Float { fun findNearestStep(value: Float): Float {