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

Merge "Split shade: fix lockscreen drag down happening on the wrong side" into tm-qpr-dev

Browse Source
This commit is contained in:
Christian Göllner
2023-02-15 11:55:22 +00:00
committed by Android (Google) Code Review
parent 9d37599d16 e9b966ce19
commit 43b85fbb01
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/LockscreenShadeTransitionController.kt
View File

@@ -262,7 +262,6 @@ class LockscreenShadeTransitionController @Inject constructor(
fun setStackScroller(nsslController: NotificationStackScrollLayoutController) { fun setStackScroller(nsslController: NotificationStackScrollLayoutController) {
this.nsslController = nsslController this.nsslController = nsslController
touchHelper.host = nsslController.view
touchHelper.expandCallback = nsslController.expandHelperCallback touchHelper.expandCallback = nsslController.expandHelperCallback
} }
@@ -736,14 +735,12 @@ class DragDownHelper(
private var dragDownAmountOnStart = 0.0f private var dragDownAmountOnStart = 0.0f
lateinit var expandCallback: ExpandHelper.Callback lateinit var expandCallback: ExpandHelper.Callback
lateinit var host: View
private var minDragDistance = 0 private var minDragDistance = 0
private var initialTouchX = 0f private var initialTouchX = 0f
private var initialTouchY = 0f private var initialTouchY = 0f
private var touchSlop = 0f private var touchSlop = 0f
private var slopMultiplier = 0f private var slopMultiplier = 0f
private val temp2 = IntArray(2)
private var draggedFarEnough = false private var draggedFarEnough = false
private var startingChild: ExpandableView? = null private var startingChild: ExpandableView? = null
private var lastHeight = 0f private var lastHeight = 0f
@@ -923,7 +920,6 @@ class DragDownHelper(
} }
private fun findView(x: Float, y: Float): ExpandableView? { private fun findView(x: Float, y: Float): ExpandableView? {
host.getLocationOnScreen(temp2) return expandCallback.getChildAtRawPosition(x, y)
return expandCallback.getChildAtRawPosition(x + temp2[0], y + temp2[1])
} }
} }