Merge "Add falsing to Long Clicks on UMO" into tm-qpr-dev (6a983b1e) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -373,6 +373,7 @@ public class MediaControlPanel {
	mMediaViewController.attach(player, MediaViewController.TYPE.PLAYER);		mMediaViewController.attach(player, MediaViewController.TYPE.PLAYER);

	vh.getPlayer().setOnLongClickListener(v -> {		vh.getPlayer().setOnLongClickListener(v -> {
			if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;
	if (!mMediaViewController.isGutsVisible()) {		if (!mMediaViewController.isGutsVisible()) {
	openGuts();		openGuts();
	return true;		return true;
	@@ -423,6 +424,7 @@ public class MediaControlPanel {
	mMediaViewController.attach(recommendations, MediaViewController.TYPE.RECOMMENDATION);		mMediaViewController.attach(recommendations, MediaViewController.TYPE.RECOMMENDATION);

	mRecommendationViewHolder.getRecommendations().setOnLongClickListener(v -> {		mRecommendationViewHolder.getRecommendations().setOnLongClickListener(v -> {
			if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;
	if (!mMediaViewController.isGutsVisible()) {		if (!mMediaViewController.isGutsVisible()) {
	openGuts();		openGuts();
	return true;		return true;
	@@ -1191,6 +1193,7 @@ public class MediaControlPanel {
	setSmartspaceRecItemOnClickListener(mediaCoverContainer, recommendation, itemIndex);		setSmartspaceRecItemOnClickListener(mediaCoverContainer, recommendation, itemIndex);
	// Bubble up the long-click event to the card.		// Bubble up the long-click event to the card.
	mediaCoverContainer.setOnLongClickListener(v -> {		mediaCoverContainer.setOnLongClickListener(v -> {
			if (mFalsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)) return true;
	View parent = (View) v.getParent();		View parent = (View) v.getParent();
	if (parent != null) {		if (parent != null) {
	parent.performLongClick();		parent.performLongClick();

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaControlPanelTest.kt

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1136,6 +1136,19 @@ public class MediaControlPanelTest : SysuiTestCase() {

	/* *** Guts tests for the player *** */		/* *** Guts tests for the player *** */

			@Test
			fun player_longClick_isFalse() {
			whenever(falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)).thenReturn(true)
			player.attachPlayer(viewHolder)

			val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)
			verify(viewHolder.player).onLongClickListener = captor.capture()

			captor.value.onLongClick(viewHolder.player)
			verify(mediaViewController, never()).openGuts()
			verify(mediaViewController, never()).closeGuts()
			}

	@Test		@Test
	fun player_longClickWhenGutsClosed_gutsOpens() {		fun player_longClickWhenGutsClosed_gutsOpens() {
	player.attachPlayer(viewHolder)		player.attachPlayer(viewHolder)
	@@ -1315,6 +1328,20 @@ public class MediaControlPanelTest : SysuiTestCase() {

	/* *** Guts tests for the recommendations *** */		/* *** Guts tests for the recommendations *** */

			@Test
			fun recommendations_longClick_isFalse() {
			whenever(falsingManager.isFalseLongTap(FalsingManager.LOW_PENALTY)).thenReturn(true)
			player.attachRecommendation(recommendationViewHolder)
			player.bindRecommendation(smartspaceData)

			val captor = ArgumentCaptor.forClass(View.OnLongClickListener::class.java)
			verify(viewHolder.player).onLongClickListener = captor.capture()

			captor.value.onLongClick(viewHolder.player)
			verify(mediaViewController, never()).openGuts()
			verify(mediaViewController, never()).closeGuts()
			}

	@Test		@Test
	fun recommendations_longClickWhenGutsClosed_gutsOpens() {		fun recommendations_longClickWhenGutsClosed_gutsOpens() {
	player.attachRecommendation(recommendationViewHolder)		player.attachRecommendation(recommendationViewHolder)