Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c583a79 authored by Christian Göllner's avatar Christian Göllner Committed by Automerger Merge Worker
Browse files

Merge "Split shade: fix lockscreen drag down happening on the wrong side" into...

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

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



Change-Id: If7e7f427f19b9f2c0fdda5990fe57c666765623a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5294870c 43b85fbb
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ class LockscreenShadeTransitionController @Inject constructor(

    fun setStackScroller(nsslController: NotificationStackScrollLayoutController) {
        this.nsslController = nsslController
        touchHelper.host = nsslController.view
        touchHelper.expandCallback = nsslController.expandHelperCallback
    }

@@ -736,14 +735,12 @@ class DragDownHelper(

    private var dragDownAmountOnStart = 0.0f
    lateinit var expandCallback: ExpandHelper.Callback
    lateinit var host: View

    private var minDragDistance = 0
    private var initialTouchX = 0f
    private var initialTouchY = 0f
    private var touchSlop = 0f
    private var slopMultiplier = 0f
    private val temp2 = IntArray(2)
    private var draggedFarEnough = false
    private var startingChild: ExpandableView? = null
    private var lastHeight = 0f
@@ -923,7 +920,6 @@ class DragDownHelper(
    }

    private fun findView(x: Float, y: Float): ExpandableView? {
        host.getLocationOnScreen(temp2)
        return expandCallback.getChildAtRawPosition(x + temp2[0], y + temp2[1])
        return expandCallback.getChildAtRawPosition(x, y)
    }
}