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

Commit 79028d1c authored by Yiyi Shen's avatar Yiyi Shen Committed by Android (Google) Code Review
Browse files

Merge "[Audiosharing] Refine sharing disconnect dialog." into main

parents 90844f35 16b78546

res/layout/dialog_audio_sharing_disconnect.xml

+11 −9
Original line number Diff line number Diff line
@@ -19,29 +19,31 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="24dp"

    android:orientation="vertical">

    android:orientation="vertical"

    android:paddingHorizontal="?android:dialogPreferredPadding"

    android:paddingBottom="?android:dialogPreferredPadding">



    <TextView

        android:id="@+id/share_audio_disconnect_description"

        style="@style/DeviceAudioSharingText"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAlignment="center"

        android:layout_gravity="center"/>

        android:layout_gravity="center"

        android:paddingBottom="24dp" />



    <com.android.internal.widget.RecyclerView

        android:visibility="visible"

        android:id="@+id/device_btn_list"

        android:nestedScrollingEnabled="false"

        android:overScrollMode="never"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center" />



    <Button

        android:id="@+id/cancel_btn"

        style="@style/SettingsLibActionButton"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:layout_marginTop="4dp"

        android:background="@drawable/audio_sharing_rounded_bg_ripple"

        android:text="@string/cancel" />

</LinearLayout>
 
 No newline at end of file

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

+11 −9
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.os.Bundle; 
import android.view.LayoutInflater;

import android.view.View;

import android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;



import androidx.appcompat.app.AlertDialog;
@@ -90,17 +91,18 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag 
        Bundle arguments = requireArguments();

        ArrayList<AudioSharingDeviceItem> deviceItems =

                arguments.getParcelableArrayList(BUNDLE_KEY_DEVICE_TO_DISCONNECT_ITEMS);

        String newDeviceName = arguments.getString(BUNDLE_KEY_NEW_DEVICE_NAME);

        final AlertDialog.Builder builder =

                new AlertDialog.Builder(getActivity())

                        .setTitle("Choose headphone to disconnect")

                        .setCancelable(false);

                new AlertDialog.Builder(getActivity()).setCancelable(false);

        LayoutInflater inflater = LayoutInflater.from(builder.getContext());

        View customTitle = inflater.inflate(R.layout.dialog_custom_title_audio_sharing, null);

        ImageView icon = customTitle.findViewById(R.id.title_icon);

        icon.setImageResource(R.drawable.ic_bt_audio_sharing);

        TextView title = customTitle.findViewById(R.id.title_text);

        title.setText("Choose a device to disconnect");

        View rootView =

                LayoutInflater.from(builder.getContext())

                        .inflate(R.layout.dialog_audio_sharing_disconnect, /* parent= */ null);

                inflater.inflate(R.layout.dialog_audio_sharing_disconnect, /* parent= */ null);

        TextView subTitle = rootView.findViewById(R.id.share_audio_disconnect_description);

        subTitle.setText(

                "To share audio with " + newDeviceName + ", disconnect another pair of headphone");

        subTitle.setText("Only 2 devices can share audio at a time");

        RecyclerView recyclerView = rootView.findViewById(R.id.device_btn_list);

        recyclerView.setAdapter(

                new AudioSharingDeviceAdapter(
@@ -116,7 +118,7 @@ public class AudioSharingDisconnectDialogFragment extends InstrumentedDialogFrag 
                v -> {

                    dismiss();

                });

        AlertDialog dialog = builder.setView(rootView).create();

        AlertDialog dialog = builder.setCustomTitle(customTitle).setView(rootView).create();

        dialog.setCanceledOnTouchOutside(false);

        return dialog;

    }

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDisconnectDialogFragmentTest.java

0 → 100644
+130 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.settings.connecteddevice.audiosharing;



import static com.google.common.truth.Truth.assertThat;



import static org.robolectric.shadows.ShadowLooper.shadowMainLooper;



import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothStatusCodes;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.view.View;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;



import com.android.internal.widget.RecyclerView;

import com.android.settings.R;

import com.android.settings.flags.Flags;

import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.androidx.fragment.FragmentController;



import java.util.ArrayList;



@RunWith(RobolectricTestRunner.class)

@Config(

        shadows = {

            ShadowAlertDialogCompat.class,

            ShadowBluetoothAdapter.class,

        })

public class AudioSharingDisconnectDialogFragmentTest {



    @Rule public final MockitoRule mocks = MockitoJUnit.rule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private static final String TEST_DEVICE_NAME1 = "test1";

    private static final String TEST_DEVICE_NAME2 = "test2";

    private static final String TEST_DEVICE_NAME3 = "test3";

    private static final AudioSharingDeviceItem TEST_DEVICE_ITEM1 =

            new AudioSharingDeviceItem(TEST_DEVICE_NAME1, /* groupId= */ 1, /* isActive= */ true);

    private static final AudioSharingDeviceItem TEST_DEVICE_ITEM2 =

            new AudioSharingDeviceItem(TEST_DEVICE_NAME2, /* groupId= */ 2, /* isActive= */ false);



    private Fragment mParent;

    private AudioSharingDisconnectDialogFragment mFragment;

    private ShadowBluetoothAdapter mShadowBluetoothAdapter;



    @Before

    public void setUp() {

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mShadowBluetoothAdapter.setEnabled(true);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastSourceSupported(

                BluetoothStatusCodes.FEATURE_SUPPORTED);

        mShadowBluetoothAdapter.setIsLeAudioBroadcastAssistantSupported(

                BluetoothStatusCodes.FEATURE_SUPPORTED);

        mFragment = new AudioSharingDisconnectDialogFragment();

        mParent = new Fragment();

        FragmentController.setupFragment(

                mParent, FragmentActivity.class, /* containerViewId= */ 0, /* bundle= */ null);

        ArrayList<AudioSharingDeviceItem> list = new ArrayList<>();

        list.add(TEST_DEVICE_ITEM1);

        list.add(TEST_DEVICE_ITEM2);

        mFragment.show(mParent, list, TEST_DEVICE_NAME3, (item) -> {});

        shadowMainLooper().idle();

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        assertThat(dialog).isNotNull();

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOn_dialogShowBtnForTwoDevices() {

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

        RecyclerView view = rootView.findViewById(R.id.device_btn_list);

        assertThat(view.getAdapter().getItemCount()).isEqualTo(2);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_clickCancel_dialogDismiss() {

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

        rootView.findViewById(R.id.cancel_btn).performClick();

        assertThat(dialog.isShowing()).isFalse();

    }

}