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

Commit 4ee32384 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Determine if NPVC is intercepting touches from footer" into tm-dev am:... 

Merge "Determine if NPVC is intercepting touches from footer" into tm-dev am: 9fe2f5c6 am: a5ee8828

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



Change-Id: Icee92ba9a37d4c51d71ff29daf5d4d50839c4634
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08d33fd7 a5ee8828

packages/SystemUI/src/com/android/systemui/qs/FooterActionsView.kt

+17 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.graphics.drawable.Drawable 
import android.graphics.drawable.RippleDrawable

import android.os.UserManager

import android.util.AttributeSet

import android.util.Log

import android.view.MotionEvent

import android.view.View

import android.widget.ImageView

import android.widget.LinearLayout
@@ -101,4 +103,18 @@ class FooterActionsView(context: Context?, attrs: AttributeSet?) : LinearLayout( 
        }

        multiUserAvatar.setImageDrawable(pictureToSet)

    }



    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {

        if (VERBOSE) Log.d(TAG, "FooterActionsView onInterceptTouchEvent ${ev?.string}")

        return super.onInterceptTouchEvent(ev)

    }



    override fun onTouchEvent(event: MotionEvent?): Boolean {

        if (VERBOSE) Log.d(TAG, "FooterActionsView onTouchEvent ${event?.string}")

        return super.onTouchEvent(event)

    }

}

private const val TAG = "FooterActionsView"

private val VERBOSE = Log.isLoggable(TAG, Log.VERBOSE)

private val MotionEvent.string

    get() = "($id): ($x,$y)"
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+5 −0
Original line number Diff line number Diff line
@@ -4142,6 +4142,11 @@ public class NotificationPanelViewController extends PanelViewController { 


            @Override

            public boolean onInterceptTouchEvent(MotionEvent event) {

                if (SPEW_LOGCAT) {

                    Log.v(TAG,

                            "NPVC onInterceptTouchEvent (" + event.getId() + "): (" + event.getX()

                                    + "," + event.getY() + ")");

                }

                if (mBlockTouches || mQs.disallowPanelTouches()) {

                    return false;

                }