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

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

[Audiosharing] Rename CallsAndAlarms components

Bug: 305620450
Test: atest
Change-Id: I470bc3300fe385c6a2e03c4623204d58c697c89e
parent 1dc5bf02
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@
        android:key="calls_and_alarms"
        android:summary=""
        android:title="@string/audio_sharing_call_audio_title"
        settings:controller="com.android.settings.connecteddevice.audiosharing.CallsAndAlarmsPreferenceController" />
        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioSharingCallAudioPreferenceController" />

    <Preference
        android:icon="@drawable/ic_audio_play_sample"
+4 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.util.List;

/** Provides a dialog to choose the active device for calls and alarms. */
public class CallsAndAlarmsDialogFragment extends InstrumentedDialogFragment {
public class AudioSharingCallAudioDialogFragment extends InstrumentedDialogFragment {
    private static final String TAG = "CallsAndAlarmsDialog";
    private static final String BUNDLE_KEY_DEVICE_ITEMS = "bundle_key_device_items";

@@ -55,7 +55,7 @@ public class CallsAndAlarmsDialogFragment extends InstrumentedDialogFragment {
    }

    /**
     * Display the {@link CallsAndAlarmsDialogFragment} dialog.
     * Display the {@link AudioSharingCallAudioDialogFragment} dialog.
     *
     * @param host The Fragment this dialog will be hosted.
     * @param deviceItems The connected device items in audio sharing session.
@@ -71,7 +71,8 @@ public class CallsAndAlarmsDialogFragment extends InstrumentedDialogFragment {
        if (manager.findFragmentByTag(TAG) == null) {
            final Bundle bundle = new Bundle();
            bundle.putParcelableList(BUNDLE_KEY_DEVICE_ITEMS, deviceItems);
            final CallsAndAlarmsDialogFragment dialog = new CallsAndAlarmsDialogFragment();
            final AudioSharingCallAudioDialogFragment dialog =
                    new AudioSharingCallAudioDialogFragment();
            dialog.setArguments(bundle);
            dialog.show(manager, TAG);
        }
+7 −8
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
import com.android.settingslib.utils.ThreadUtils;

import com.google.common.collect.ImmutableList;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -60,7 +62,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;

/** PreferenceController to control the dialog to choose the active device for calls and alarms */
public class CallsAndAlarmsPreferenceController extends AudioSharingBasePreferenceController
public class AudioSharingCallAudioPreferenceController extends AudioSharingBasePreferenceController
        implements BluetoothCallback {
    private static final String TAG = "CallsAndAlarmsPreferenceController";
    private static final String PREF_KEY = "calls_and_alarms";
@@ -131,7 +133,7 @@ public class CallsAndAlarmsPreferenceController extends AudioSharingBasePreferen
                }
            };

    public CallsAndAlarmsPreferenceController(Context context) {
    public AudioSharingCallAudioPreferenceController(Context context) {
        super(context, PREF_KEY);
        mBtManager = Utils.getLocalBtManager(mContext);
        mProfileManager = mBtManager == null ? null : mBtManager.getProfileManager();
@@ -176,16 +178,13 @@ public class CallsAndAlarmsPreferenceController extends AudioSharingBasePreferen
                        }
                        updateDeviceItemsInSharingSession();
                        if (mDeviceItemsInSharingSession.size() >= 1) {
                            CallsAndAlarmsDialogFragment.show(
                            AudioSharingCallAudioDialogFragment.show(
                                    mFragment,
                                    mDeviceItemsInSharingSession,
                                    (AudioSharingDeviceItem item) -> {
                                        if (!mGroupedConnectedDevices.containsKey(
                                                item.getGroupId())) {
                                            return;
                                        }
                                        List<CachedBluetoothDevice> devices =
                                                mGroupedConnectedDevices.get(item.getGroupId());
                                                mGroupedConnectedDevices.getOrDefault(
                                                        item.getGroupId(), ImmutableList.of());
                                        @Nullable
                                        CachedBluetoothDevice lead =
                                                AudioSharingUtils.getLeadDevice(devices);
+5 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment
    SettingsMainSwitchBar mMainSwitchBar;
    private AudioSharingSwitchBarController mSwitchBarController;
    private AudioSharingDeviceVolumeGroupController mAudioSharingDeviceVolumeGroupController;
    private CallsAndAlarmsPreferenceController mCallsAndAlarmsPreferenceController;
    private AudioSharingCallAudioPreferenceController mAudioSharingCallAudioPreferenceController;
    private AudioSharingPlaySoundPreferenceController mAudioSharingPlaySoundPreferenceController;
    private AudioStreamsCategoryController mAudioStreamsCategoryController;

@@ -67,8 +67,9 @@ public class AudioSharingDashboardFragment extends DashboardFragment
        mAudioSharingDeviceVolumeGroupController =
                use(AudioSharingDeviceVolumeGroupController.class);
        mAudioSharingDeviceVolumeGroupController.init(this);
        mCallsAndAlarmsPreferenceController = use(CallsAndAlarmsPreferenceController.class);
        mCallsAndAlarmsPreferenceController.init(this);
        mAudioSharingCallAudioPreferenceController =
                use(AudioSharingCallAudioPreferenceController.class);
        mAudioSharingCallAudioPreferenceController.init(this);
        mAudioSharingPlaySoundPreferenceController =
                use(AudioSharingPlaySoundPreferenceController.class);
        mAudioStreamsCategoryController = use(AudioStreamsCategoryController.class);
@@ -100,7 +101,7 @@ public class AudioSharingDashboardFragment extends DashboardFragment

    private void updateVisibilityForAttachedPreferences() {
        mAudioSharingDeviceVolumeGroupController.updateVisibility();
        mCallsAndAlarmsPreferenceController.updateVisibility();
        mAudioSharingCallAudioPreferenceController.updateVisibility();
        mAudioSharingPlaySoundPreferenceController.updateVisibility();
        mAudioStreamsCategoryController.updateVisibility();
    }
+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import java.util.ArrayList;
            ShadowAlertDialogCompat.class,
            ShadowBluetoothAdapter.class,
        })
public class CallsAndAlarmsDialogFragmentTest {
public class AudioSharingCallAudioDialogFragmentTest {
    @Rule public final MockitoRule mocks = MockitoJUnit.rule();
    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

@@ -64,7 +64,7 @@ public class CallsAndAlarmsDialogFragmentTest {
            new AudioSharingDeviceItem(TEST_DEVICE_NAME2, /* groupId= */ 1, /* isActive= */ true);

    private Fragment mParent;
    private CallsAndAlarmsDialogFragment mFragment;
    private AudioSharingCallAudioDialogFragment mFragment;
    private ShadowBluetoothAdapter mShadowBluetoothAdapter;

    @Before
@@ -76,7 +76,7 @@ public class CallsAndAlarmsDialogFragmentTest {
                BluetoothStatusCodes.FEATURE_SUPPORTED);
        mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(
                BluetoothStatusCodes.FEATURE_SUPPORTED);
        mFragment = new CallsAndAlarmsDialogFragment();
        mFragment = new AudioSharingCallAudioDialogFragment();
        mParent = new Fragment();
        FragmentController.setupFragment(
                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);
Loading