Merge "[Flexiglass] Reset the tracked HUN row at the end of the touch" into main (61bfd25e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpTouchHelper.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.systemui.statusbar.notification.headsup;		package com.android.systemui.statusbar.notification.headsup;

			import android.annotation.Nullable;
	import android.content.Context;		import android.content.Context;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	@@ -210,10 +211,12 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
	if (mHeadsUpManager.shouldSwallowClick(		if (mHeadsUpManager.shouldSwallowClick(
	mPickedChild.getEntry().getSbn().getKey())) {		mPickedChild.getEntry().getSbn().getKey())) {
	endMotion();		endMotion();
			setTrackingHeadsUp(false);
	return true;		return true;
	}		}
	}		}
	endMotion();		endMotion();
			setTrackingHeadsUp(false);
	return false;		return false;
	}		}
	return false;		return false;
	@@ -258,7 +261,7 @@ public class HeadsUpTouchHelper implements Gefingerpoken {
	void setHeadsUpDraggingStartingHeight(int startHeight);		void setHeadsUpDraggingStartingHeight(int startHeight);

	/** Sets notification that is being expanded. */		/** Sets notification that is being expanded. */
	void setTrackedHeadsUp(ExpandableNotificationRow expandableNotificationRow);		void setTrackedHeadsUp(@Nullable ExpandableNotificationRow expandableNotificationRow);

	/** Called when a MotionEvent is about to trigger expansion. */		/** Called when a MotionEvent is about to trigger expansion. */
	void startExpand(float newX, float newY, boolean startTracking, float expandedHeight);		void startExpand(float newX, float newY, boolean startTracking, float expandedHeight);

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3644,6 +3644,9 @@ public class NotificationStackScrollLayout
	mScrollViewFields.sendCurrentGestureInGuts(false);		mScrollViewFields.sendCurrentGestureInGuts(false);
	mScrollViewFields.sendCurrentGestureOverscroll(false);		mScrollViewFields.sendCurrentGestureOverscroll(false);
	setIsBeingDragged(false);		setIsBeingDragged(false);
			// dispatch to touchHandlers, so they can still finalize a previously started
			// motion, while the shade is being dragged
			return super.dispatchTouchEvent(ev);
	}		}
	return false;		return false;
	}		}