Merge "Determine if NPVC is intercepting touches from footer" into tm-dev (9fe2f5c6) · Commits · e / os / android_frameworks_base

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

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,8 @@ import android.graphics.drawable.Drawable
	import android.graphics.drawable.RippleDrawable		import android.graphics.drawable.RippleDrawable
	import android.os.UserManager		import android.os.UserManager
	import android.util.AttributeSet		import android.util.AttributeSet
			import android.util.Log
			import android.view.MotionEvent
	import android.view.View		import android.view.View
	import android.widget.ImageView		import android.widget.ImageView
	import android.widget.LinearLayout		import android.widget.LinearLayout
	@@ -101,4 +103,18 @@ class FooterActionsView(context: Context?, attrs: AttributeSet?) : LinearLayout(
	}		}
	multiUserAvatar.setImageDrawable(pictureToSet)		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

+5 −0

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

	@Override		@Override
	public boolean onInterceptTouchEvent(MotionEvent event) {		public boolean onInterceptTouchEvent(MotionEvent event) {
			if (SPEW_LOGCAT) {
			Log.v(TAG,
			"NPVC onInterceptTouchEvent (" + event.getId() + "): (" + event.getX()
			+ "," + event.getY() + ")");
			}
	if (mBlockTouches \|\| mQs.disallowPanelTouches()) {		if (mBlockTouches \|\| mQs.disallowPanelTouches()) {
	return false;		return false;
	}		}