diff options
10 files changed, 136 insertions, 79 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java index 09aa286874b9..ca23228459e4 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManagerTest.java @@ -17,11 +17,11 @@ package com.android.systemui.accessibility.hearingaid; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothDevice; import android.testing.TestableLooper; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -51,6 +51,8 @@ public class HearingDevicesDialogManagerTest extends SysuiTestCase { @Rule public MockitoRule mockito = MockitoJUnit.rule(); + private static final int TEST_LAUNCH_SOURCE_ID = 1; + private final FakeExecutor mMainExecutor = new FakeExecutor(new FakeSystemClock()); private final FakeExecutor mBackgroundExecutor = new FakeExecutor(new FakeSystemClock()); @Mock @@ -70,7 +72,7 @@ public class HearingDevicesDialogManagerTest extends SysuiTestCase { @Before public void setUp() { - when(mDialogFactory.create(anyBoolean())).thenReturn(mDialogDelegate); + when(mDialogFactory.create(anyBoolean(), anyInt())).thenReturn(mDialogDelegate); when(mDialogDelegate.createDialog()).thenReturn(mDialog); mManager = new HearingDevicesDialogManager( @@ -86,21 +88,22 @@ public class HearingDevicesDialogManagerTest extends SysuiTestCase { public void showDialog_existHearingDevice_showPairNewDeviceFalse() { when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(true); - mManager.showDialog(mExpandable); + mManager.showDialog(mExpandable, TEST_LAUNCH_SOURCE_ID); mBackgroundExecutor.runAllReady(); mMainExecutor.runAllReady(); - verify(mDialogFactory).create(eq(/* showPairNewDevice= */ false)); + verify(mDialogFactory).create(eq(/* showPairNewDevice= */ false), + eq(TEST_LAUNCH_SOURCE_ID)); } @Test public void showDialog_noHearingDevice_showPairNewDeviceTrue() { when(mDevicesChecker.isAnyPairedHearingDevice()).thenReturn(false); - mManager.showDialog(mExpandable); + mManager.showDialog(mExpandable, TEST_LAUNCH_SOURCE_ID); mBackgroundExecutor.runAllReady(); mMainExecutor.runAllReady(); - verify(mDialogFactory).create(eq(/* showPairNewDevice= */ true)); + verify(mDialogFactory).create(eq(/* showPairNewDevice= */ true), eq(TEST_LAUNCH_SOURCE_ID)); } } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java index d08653c3cf1b..60edaae21bc0 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java @@ -52,7 +52,6 @@ import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.android.internal.logging.UiEventLogger; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HapClientProfile; @@ -105,7 +104,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, private final AudioManager mAudioManager; private final LocalBluetoothProfileManager mProfileManager; private final HapClientProfile mHapClientProfile; - private final UiEventLogger mUiEventLogger; + private final HearingDevicesUiEventLogger mUiEventLogger; + private final int mLaunchSourceId; private HearingDevicesListAdapter mDeviceListAdapter; private HearingDevicesPresetsController mPresetsController; private Context mApplicationContext; @@ -153,20 +153,22 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, public interface Factory { /** Create a {@link HearingDevicesDialogDelegate} instance */ HearingDevicesDialogDelegate create( - boolean showPairNewDevice); + boolean showPairNewDevice, + @HearingDevicesUiEventLogger.LaunchSourceId int launchSource); } @AssistedInject public HearingDevicesDialogDelegate( @Application Context applicationContext, @Assisted boolean showPairNewDevice, + @Assisted @HearingDevicesUiEventLogger.LaunchSourceId int launchSourceId, SystemUIDialog.Factory systemUIDialogFactory, ActivityStarter activityStarter, DialogTransitionAnimator dialogTransitionAnimator, @Nullable LocalBluetoothManager localBluetoothManager, @Main Handler handler, AudioManager audioManager, - UiEventLogger uiEventLogger) { + HearingDevicesUiEventLogger uiEventLogger) { mApplicationContext = applicationContext; mShowPairNewDevice = showPairNewDevice; mSystemUIDialogFactory = systemUIDialogFactory; @@ -178,6 +180,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, mProfileManager = localBluetoothManager.getProfileManager(); mHapClientProfile = mProfileManager.getHapClientProfile(); mUiEventLogger = uiEventLogger; + mLaunchSourceId = launchSourceId; } @Override @@ -191,7 +194,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, @Override public void onDeviceItemGearClicked(@NonNull DeviceItem deviceItem, @NonNull View view) { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_GEAR_CLICK); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_GEAR_CLICK, mLaunchSourceId); dismissDialogIfExists(); Intent intent = new Intent(ACTION_BLUETOOTH_DEVICE_DETAILS); Bundle bundle = new Bundle(); @@ -207,15 +210,17 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, CachedBluetoothDevice cachedBluetoothDevice = deviceItem.getCachedBluetoothDevice(); switch (deviceItem.getType()) { case ACTIVE_MEDIA_BLUETOOTH_DEVICE, CONNECTED_BLUETOOTH_DEVICE -> { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_DISCONNECT); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_DISCONNECT, + mLaunchSourceId); cachedBluetoothDevice.disconnect(); } case AVAILABLE_MEDIA_BLUETOOTH_DEVICE -> { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_SET_ACTIVE); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_SET_ACTIVE, + mLaunchSourceId); cachedBluetoothDevice.setActive(); } case SAVED_BLUETOOTH_DEVICE -> { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_CONNECT); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_CONNECT, mLaunchSourceId); cachedBluetoothDevice.connect(); } } @@ -275,7 +280,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, if (mLocalBluetoothManager == null) { return; } - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_DIALOG_SHOW); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_DIALOG_SHOW, mLaunchSourceId); mPairButton = dialog.requireViewById(R.id.pair_new_device_button); mDeviceList = dialog.requireViewById(R.id.device_list); mPresetSpinner = dialog.requireViewById(R.id.preset_spinner); @@ -363,7 +368,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, mPresetSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_PRESET_SELECT); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_PRESET_SELECT, + mLaunchSourceId); mPresetsController.selectPreset( mPresetsController.getAllPresetInfo().get(position).getIndex()); } @@ -381,7 +387,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, private void setupPairNewDeviceButton(SystemUIDialog dialog, @Visibility int visibility) { if (visibility == VISIBLE) { mPairButton.setOnClickListener(v -> { - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_PAIR); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_PAIR, mLaunchSourceId); dismissDialogIfExists(); final Intent intent = new Intent(Settings.ACTION_HEARING_DEVICE_PAIRING_SETTINGS); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); @@ -485,7 +491,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, final String name = intent.getComponent() != null ? intent.getComponent().flattenToString() : intent.getPackage() + "/" + intent.getAction(); - mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_RELATED_TOOL_CLICK, 0, name); + mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_RELATED_TOOL_CLICK, + mLaunchSourceId, name); dismissDialogIfExists(); mActivityStarter.postStartActivityDismissingKeyguard(intent, /* delay= */ 0, mDialogTransitionAnimator.createActivityTransitionController(view)); diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java index bc4cb45582ff..3d24177a8029 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogManager.java @@ -70,8 +70,10 @@ public class HearingDevicesDialogManager { * Shows the dialog. * * @param expandable {@link Expandable} from which the dialog is shown. + * @param launchSourceId the id indicates where the dialog is launched from. */ - public void showDialog(Expandable expandable) { + public void showDialog(Expandable expandable, + @HearingDevicesUiEventLogger.LaunchSourceId int launchSourceId) { if (mDialog != null) { if (DEBUG) { Log.d(TAG, "HearingDevicesDialog already showing. Destroy it first."); @@ -91,7 +93,8 @@ public class HearingDevicesDialogManager { }); pairedHearingDeviceCheckTask.addListener(() -> { try { - mDialog = mDialogFactory.create(!pairedHearingDeviceCheckTask.get()).createDialog(); + mDialog = mDialogFactory.create(!pairedHearingDeviceCheckTask.get(), + launchSourceId).createDialog(); if (expandable != null) { DialogTransitionAnimator.Controller controller = diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java index 6a34d1969fe5..02e65fd9031b 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogReceiver.java @@ -16,6 +16,8 @@ package com.android.systemui.accessibility.hearingaid; +import static com.android.systemui.accessibility.hearingaid.HearingDevicesUiEventLogger.LAUNCH_SOURCE_A11Y; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -46,7 +48,7 @@ public class HearingDevicesDialogReceiver extends BroadcastReceiver { } if (ACTION.equals(intent.getAction())) { - mDialogManager.showDialog(/* view= */ null); + mDialogManager.showDialog(/* expandable= */ null, LAUNCH_SOURCE_A11Y); } } } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.java deleted file mode 100644 index 3fbe56eccef2..000000000000 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.accessibility.hearingaid; - -import com.android.internal.logging.UiEvent; -import com.android.internal.logging.UiEventLogger; - -public enum HearingDevicesUiEvent implements UiEventLogger.UiEventEnum { - - @UiEvent(doc = "Hearing devices dialog is shown") - HEARING_DEVICES_DIALOG_SHOW(1848), - @UiEvent(doc = "Pair new device") - HEARING_DEVICES_PAIR(1849), - @UiEvent(doc = "Connect to the device") - HEARING_DEVICES_CONNECT(1850), - @UiEvent(doc = "Disconnect from the device") - HEARING_DEVICES_DISCONNECT(1851), - @UiEvent(doc = "Set the device as active device") - HEARING_DEVICES_SET_ACTIVE(1852), - @UiEvent(doc = "Click on the device gear to enter device detail page") - HEARING_DEVICES_GEAR_CLICK(1853), - @UiEvent(doc = "Select a preset from preset spinner") - HEARING_DEVICES_PRESET_SELECT(1854), - @UiEvent(doc = "Click on related tool") - HEARING_DEVICES_RELATED_TOOL_CLICK(1856); - - private final int mId; - - HearingDevicesUiEvent(int id) { - mId = id; - } - - @Override - public int getId() { - return mId; - } -} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.kt b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.kt new file mode 100644 index 000000000000..9e77b02be495 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEvent.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid + +import com.android.internal.logging.UiEvent +import com.android.internal.logging.UiEventLogger + +enum class HearingDevicesUiEvent(private val id: Int) : UiEventLogger.UiEventEnum { + + @UiEvent(doc = "Hearing devices dialog is shown") HEARING_DEVICES_DIALOG_SHOW(1848), + @UiEvent(doc = "Pair new device") HEARING_DEVICES_PAIR(1849), + @UiEvent(doc = "Connect to the device") HEARING_DEVICES_CONNECT(1850), + @UiEvent(doc = "Disconnect from the device") HEARING_DEVICES_DISCONNECT(1851), + @UiEvent(doc = "Set the device as active device") HEARING_DEVICES_SET_ACTIVE(1852), + @UiEvent(doc = "Click on the device gear to enter device detail page") + HEARING_DEVICES_GEAR_CLICK(1853), + @UiEvent(doc = "Select a preset from preset spinner") HEARING_DEVICES_PRESET_SELECT(1854), + @UiEvent(doc = "Click on related tool") HEARING_DEVICES_RELATED_TOOL_CLICK(1856); + + override fun getId(): Int = this.id +} diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEventLogger.kt b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEventLogger.kt new file mode 100644 index 000000000000..0b32cfc9742b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesUiEventLogger.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.accessibility.hearingaid + +import android.annotation.IntDef +import com.android.internal.logging.UiEventLogger +import com.android.systemui.dagger.SysUISingleton +import javax.inject.Inject + +@SysUISingleton +class HearingDevicesUiEventLogger @Inject constructor(private val uiEventLogger: UiEventLogger) { + + /** Logs the given event */ + fun log(event: UiEventLogger.UiEventEnum, launchSourceId: Int) { + log(event, launchSourceId, null) + } + + fun log(event: UiEventLogger.UiEventEnum, launchSourceId: Int, pkgName: String?) { + uiEventLogger.log(event, launchSourceId, pkgName) + } + + /** + * The possible launch source of hearing devices dialog + * + * @hide + */ + @IntDef(LAUNCH_SOURCE_UNKNOWN, LAUNCH_SOURCE_A11Y, LAUNCH_SOURCE_QS_TILE) + annotation class LaunchSourceId + + companion object { + const val LAUNCH_SOURCE_UNKNOWN = 0 + const val LAUNCH_SOURCE_A11Y = 1 // launch from AccessibilityManagerService + const val LAUNCH_SOURCE_QS_TILE = 2 + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java index b96e83d43e32..f723ff264e0c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java @@ -16,6 +16,8 @@ package com.android.systemui.qs.tiles; +import static com.android.systemui.accessibility.hearingaid.HearingDevicesUiEventLogger.LAUNCH_SOURCE_QS_TILE; + import android.content.Intent; import android.os.Handler; import android.os.Looper; @@ -96,7 +98,7 @@ public class HearingDevicesTile extends QSTileImpl<BooleanState> { @Override protected void handleClick(@Nullable Expandable expandable) { - mUiHandler.post(() -> mDialogManager.showDialog(expandable)); + mUiHandler.post(() -> mDialogManager.showDialog(expandable, LAUNCH_SOURCE_QS_TILE)); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java index d3b7d2207854..662815ee7cbe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java @@ -52,7 +52,6 @@ import android.widget.Spinner; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; -import com.android.internal.logging.UiEventLogger; import com.android.settingslib.bluetooth.BluetoothEventManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; @@ -92,6 +91,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Rule public MockitoRule mockito = MockitoJUnit.rule(); + private static final int TEST_LAUNCH_SOURCE_ID = 1; private static final String DEVICE_ADDRESS = "AA:BB:CC:DD:EE:FF"; private static final String DEVICE_NAME = "test_name"; private static final String TEST_PKG = "pkg"; @@ -124,7 +124,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Mock private AudioManager mAudioManager; @Mock - private UiEventLogger mUiEventLogger; + private HearingDevicesUiEventLogger mUiEventLogger; @Mock private CachedBluetoothDevice mCachedDevice; @Mock @@ -182,7 +182,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { anyInt(), any()); assertThat(intentCaptor.getValue().getAction()).isEqualTo( Settings.ACTION_HEARING_DEVICE_PAIRING_SETTINGS); - verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_PAIR); + verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_PAIR, + TEST_LAUNCH_SOURCE_ID); } @Test @@ -196,7 +197,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { anyInt(), any()); assertThat(intentCaptor.getValue().getAction()).isEqualTo( HearingDevicesDialogDelegate.ACTION_BLUETOOTH_DEVICE_DETAILS); - verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_GEAR_CLICK); + verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_GEAR_CLICK, + TEST_LAUNCH_SOURCE_ID); } @Test @@ -207,7 +209,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mDialogDelegate.onDeviceItemClicked(mHearingDeviceItem, new View(mContext)); verify(mCachedDevice).disconnect(); - verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_DISCONNECT); + verify(mUiEventLogger).log(HearingDevicesUiEvent.HEARING_DEVICES_DISCONNECT, + TEST_LAUNCH_SOURCE_ID); } @Test @@ -304,6 +307,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mDialogDelegate = new HearingDevicesDialogDelegate( mContext, true, + TEST_LAUNCH_SOURCE_ID, mDialogFactory, mActivityStarter, mDialogTransitionAnimator, @@ -327,6 +331,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mDialogDelegate = new HearingDevicesDialogDelegate( mContext, false, + TEST_LAUNCH_SOURCE_ID, mDialogFactory, mActivityStarter, mDialogTransitionAnimator, diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java index 76c8cf081262..7d41a20e628f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/HearingDevicesTileTest.java @@ -16,6 +16,8 @@ package com.android.systemui.qs.tiles; +import static com.android.systemui.accessibility.hearingaid.HearingDevicesUiEventLogger.LAUNCH_SOURCE_QS_TILE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -151,7 +153,7 @@ public class HearingDevicesTileTest extends SysuiTestCase { mTile.handleClick(expandable); mTestableLooper.processAllMessages(); - verify(mHearingDevicesDialogManager).showDialog(expandable); + verify(mHearingDevicesDialogManager).showDialog(expandable, LAUNCH_SOURCE_QS_TILE); } @Test |