Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ea3b4d authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Add audio sharing loggings (P1) 

Bug: 331515891
Test: atest
Change-Id: I7396f99538f36b47086e0c4f45ef775535f2f321
parent bce1511a

src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.connecteddevice; 


import static com.android.settingslib.Utils.isAudioModeOngoingCall;



import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothLeBroadcast;

import android.bluetooth.BluetoothLeBroadcastAssistant;
@@ -47,6 +48,7 @@ import com.android.settings.connecteddevice.audiosharing.AudioSharingDialogHandl 
import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.bluetooth.BluetoothCallback;

import com.android.settingslib.bluetooth.BluetoothUtils;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -279,6 +281,8 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle 
                ((BluetoothDevicePreference) preference).getBluetoothDevice();

        if (AudioSharingUtils.isFeatureEnabled() && mDialogHandler != null) {

            mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);

            FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()

                    .action(mContext, SettingsEnums.ACTION_MEDIA_DEVICE_CLICK);

        } else {

            cachedDevice.setActive();

        }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings.connecteddevice.audiosharing;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.util.Log;
@@ -70,6 +71,7 @@ public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
    @Override

    public boolean onPreferenceClick(Preference preference) {

        mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);

        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);

        return true;

    }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCallAudioDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class AudioSharingCallAudioDialogFragment extends InstrumentedDialogFragm 


    @Override

    public int getMetricsCategory() {

        return SettingsEnums.DIALOG_AUDIO_SHARING_SWITCH_ACTIVE;

        return SettingsEnums.DIALOG_AUDIO_SHARING_CALL_AUDIO;

    }



    /**

src/com/android/settings/connecteddevice/audiosharing/AudioSharingCompatibilityPreferenceController.java

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


package com.android.settings.connecteddevice.audiosharing;



import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothLeBroadcast;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.content.Context;
@@ -32,9 +33,11 @@ import androidx.preference.TwoStatePreference; 
import com.android.settings.R;

import com.android.settings.bluetooth.Utils;

import com.android.settings.core.TogglePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.utils.ThreadUtils;



import java.util.concurrent.Executor;
@@ -53,6 +56,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere 
    @Nullable private final LocalBluetoothLeBroadcast mBroadcast;

    @Nullable private TwoStatePreference mPreference;

    private final Executor mExecutor;

    private final MetricsFeatureProvider mMetricsFeatureProvider;

    private AtomicBoolean mCallbacksRegistered = new AtomicBoolean(false);



    private final BluetoothLeBroadcast.Callback mBroadcastCallback =
@@ -108,6 +112,7 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere 
        mProfileManager = mBtManager == null ? null : mBtManager.getProfileManager();

        mBroadcast = mProfileManager == null ? null : mProfileManager.getLeAudioBroadcastProfile();

        mExecutor = Executors.newSingleThreadExecutor();

        mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();

    }



    @Override
@@ -178,6 +183,8 @@ public class AudioSharingCompatibilityPreferenceController extends TogglePrefere 
        }

        mBroadcast.setImproveCompatibility(isChecked);

        // TODO: call updateBroadcast once framework change ready.

        mMetricsFeatureProvider.action(

                mContext, SettingsEnums.ACTION_AUDIO_SHARING_IMPROVE_COMPATIBILITY, isChecked);

        return true;

    }

src/com/android/settings/connecteddevice/audiosharing/AudioSharingConfirmDialogFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.connecteddevice.audiosharing;



import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.os.Bundle;

import android.util.Log;
@@ -33,8 +34,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen 


    @Override

    public int getMetricsCategory() {

        // TODO: add metrics category.

        return 0;

        return SettingsEnums.DIALOG_AUDIO_SHARING_CONFIRMATION;

    }



    /**
@@ -63,7 +63,7 @@ public class AudioSharingConfirmDialogFragment extends InstrumentedDialogFragmen 
                        .setTitleIcon(com.android.settingslib.R.drawable.ic_bt_le_audio_sharing)

                        .setIsCustomBodyEnabled(true)

                        .setCustomMessage(R.string.audio_sharing_comfirm_dialog_content)

                        .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> dismiss())

                        .setPositiveButton(com.android.settings.R.string.okay, (d, w) -> {})

                        .build();

        dialog.setCanceledOnTouchOutside(true);

        return dialog;