Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Duplicate call of logTapAction from merge" into tm-dev

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-04-06 17:04:56 +00:00
committed by Android (Google) Code Review
parent e3c41047b4 7985b4ab02
commit b409918269
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -680,7 +680,6 @@ public class MediaControlPanel {
button.setEnabled(true); button.setEnabled(true);
button.setOnClickListener(v -> { button.setOnClickListener(v -> {
if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) { if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {
mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);
mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId); mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);
logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT); logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);
action.run(); action.run();

5
packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
View File

@@ -105,6 +105,7 @@ public class MediaControlPanelTest : SysuiTestCase() {
@Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory @Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory
@Mock private lateinit var mediaCarouselController: MediaCarouselController @Mock private lateinit var mediaCarouselController: MediaCarouselController
@Mock private lateinit var falsingManager: FalsingManager @Mock private lateinit var falsingManager: FalsingManager
@Mock private lateinit var transitionParent: ViewGroup
private lateinit var appIcon: ImageView private lateinit var appIcon: ImageView
private lateinit var albumView: ImageView private lateinit var albumView: ImageView
private lateinit var titleText: TextView private lateinit var titleText: TextView
@@ -242,6 +243,10 @@ public class MediaControlPanelTest : SysuiTestCase() {
whenever(viewHolder.seamlessText).thenReturn(seamlessText) whenever(viewHolder.seamlessText).thenReturn(seamlessText)
whenever(viewHolder.seekBar).thenReturn(seekBar) whenever(viewHolder.seekBar).thenReturn(seekBar)
// Transition View
whenever(view.parent).thenReturn(transitionParent)
whenever(view.rootView).thenReturn(transitionParent)
// Action buttons // Action buttons
whenever(viewHolder.actionPlayPause).thenReturn(actionPlayPause) whenever(viewHolder.actionPlayPause).thenReturn(actionPlayPause)
whenever(viewHolder.getAction(R.id.actionPlayPause)).thenReturn(actionPlayPause) whenever(viewHolder.getAction(R.id.actionPlayPause)).thenReturn(actionPlayPause)