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

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

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

parents eeec2a70 13d09c97

res/drawable/audio_sharing_guidance.png

0 → 100644
+3.04 KiB
Loading image diff...

res/layout/dialog_audio_sharing.xml

+37 −11
Original line number Diff line number Diff line
@@ -19,38 +19,64 @@ 
    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

        style="@style/DeviceAudioSharingText"

        android:id="@+id/share_audio_subtitle1"

        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="14dp"

        android:textFontWeight="500"

        android:visibility="gone" />



    <TextView

        style="@style/DeviceAudioSharingText"

        android:id="@+id/share_audio_subtitle2"

        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"

        android:textFontWeight="400" />



    <ImageView

        android:id="@+id/share_audio_guidance"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:src="@drawable/audio_sharing_guidance"

        android:visibility="gone" />



    <com.android.internal.widget.RecyclerView

        android:visibility="visible"

        android:id="@+id/btn_list"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:nestedScrollingEnabled="false"

        android:overScrollMode="never"

        android:visibility="gone" />



    <Button

        android:id="@+id/share_btn"

        style="@style/SettingsLibActionButton"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"/>

        android:layout_gravity="center"

        android:layout_marginTop="4dp"

        android:background="@drawable/audio_sharing_rounded_bg_ripple"

        android:visibility="gone" />



    <Button

        android:id="@+id/cancel_btn"

        style="@style/SettingsLibActionButton"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

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

        android:layout_marginTop="4dp"

        android:background="@drawable/audio_sharing_rounded_bg_ripple"

        android:text="Not now"

        android:visibility="gone" />

</LinearLayout>
 
 No newline at end of file

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

+55 −32
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;
@@ -33,8 +34,10 @@ import com.android.internal.widget.RecyclerView; 
import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;



import com.google.common.collect.Iterables;



import java.util.ArrayList;

import java.util.Locale;

import java.util.stream.Collectors;



public class AudioSharingDialogFragment extends InstrumentedDialogFragment {

    private static final String TAG = "AudioSharingDialog";
@@ -54,8 +57,6 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment { 


    private static DialogEventListener sListener;



    private View mRootView;



    @Override

    public int getMetricsCategory() {

        return SettingsEnums.DIALOG_START_AUDIO_SHARING;
@@ -90,28 +91,48 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment { 
        ArrayList<AudioSharingDeviceItem> deviceItems =

                arguments.getParcelableArrayList(BUNDLE_KEY_DEVICE_ITEMS);

        final AlertDialog.Builder builder =

                new AlertDialog.Builder(getActivity()).setTitle("Share audio").setCancelable(false);

        mRootView =

                LayoutInflater.from(builder.getContext())

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

        TextView subTitle1 = mRootView.findViewById(R.id.share_audio_subtitle1);

        TextView subTitle2 = mRootView.findViewById(R.id.share_audio_subtitle2);

                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);

        View rootView = inflater.inflate(R.layout.dialog_audio_sharing, /* parent= */ null);

        TextView subTitle1 = rootView.findViewById(R.id.share_audio_subtitle1);

        TextView subTitle2 = rootView.findViewById(R.id.share_audio_subtitle2);

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

        Button shareBtn = rootView.findViewById(R.id.share_btn);

        Button cancelBtn = rootView.findViewById(R.id.cancel_btn);

        if (deviceItems.isEmpty()) {

            subTitle1.setVisibility(View.INVISIBLE);

            title.setText("Share your audio");

            subTitle2.setText(

                    "To start sharing audio, connect additional headphones that support LE audio");

        } else {

                    "To start sharing audio, "

                            + "connect two pairs of headphones that support LE Audio");

            ImageView image = rootView.findViewById(R.id.share_audio_guidance);

            image.setVisibility(View.VISIBLE);

            builder.setNegativeButton("Close", null);

        } else if (deviceItems.size() == 1) {

            title.setText("Share your audio");

            subTitle1.setText(

                    String.format(

                            Locale.US,

                            "%d additional device%s connected",

                            deviceItems.size(),

                            deviceItems.size() > 1 ? "" : "s"));

                    deviceItems.stream()

                            .map(AudioSharingDeviceItem::getName)

                            .collect(Collectors.joining(" and ")));

            subTitle2.setText(

                    "The headphones you share audio with will hear videos and music playing on this"

                            + " phone");

        }

        RecyclerView recyclerView = mRootView.findViewById(R.id.btn_list);

                    "This device's music and videos will play on both pairs of headphones");

            shareBtn.setText("Share audio");

            shareBtn.setOnClickListener(

                    v -> {

                        sListener.onItemClick(Iterables.getOnlyElement(deviceItems));

                        dismiss();

                    });

            cancelBtn.setOnClickListener(v -> dismiss());

            subTitle1.setVisibility(View.VISIBLE);

            shareBtn.setVisibility(View.VISIBLE);

            cancelBtn.setVisibility(View.VISIBLE);

        } else {

            title.setText("Share audio with another device");

            subTitle2.setText(

                    "This device's music and videos will play on the headphones you connect");

            recyclerView.setAdapter(

                    new AudioSharingDeviceAdapter(

                            deviceItems,
@@ -121,9 +142,11 @@ public class AudioSharingDialogFragment extends InstrumentedDialogFragment { 
                            }));

            recyclerView.setLayoutManager(

                    new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));

        Button cancelBtn = mRootView.findViewById(R.id.cancel_btn);

            recyclerView.setVisibility(View.VISIBLE);

            cancelBtn.setOnClickListener(v -> dismiss());

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

            cancelBtn.setVisibility(View.VISIBLE);

        }

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

        dialog.setCanceledOnTouchOutside(false);

        return dialog;

    }

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

0 → 100644
+229 −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 android.widget.Button;

import android.widget.ImageView;

import android.widget.TextView;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentActivity;



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;

import java.util.concurrent.atomic.AtomicBoolean;



@RunWith(RobolectricTestRunner.class)

@Config(

        shadows = {

            ShadowAlertDialogCompat.class,

            ShadowBluetoothAdapter.class,

        })

public class AudioSharingDialogFragmentTest {



    @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= */ false);

    private static final AudioSharingDeviceItem TEST_DEVICE_ITEM2 =

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

    private static final AudioSharingDeviceItem TEST_DEVICE_ITEM3 =

            new AudioSharingDeviceItem(TEST_DEVICE_NAME3, /* groupId= */ 3, /* isActive= */ false);



    private Fragment mParent;

    private AudioSharingDialogFragment 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 AudioSharingDialogFragment();

        mParent = new Fragment();

        FragmentController.setupFragment(

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

    }



    @After

    public void tearDown() {

        ShadowAlertDialogCompat.reset();

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOff_dialogNotExist() {

        mFragment.show(mParent, new ArrayList<>(), (item) -> {});

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        assertThat(dialog).isNull();

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOn_noConnectedDevice() {

        mFragment.show(mParent, new ArrayList<>(), (item) -> {});

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

        TextView subtitle1 = rootView.findViewById(R.id.share_audio_subtitle1);

        ImageView guidance = rootView.findViewById(R.id.share_audio_guidance);

        Button shareBtn = rootView.findViewById(R.id.share_btn);

        assertThat(dialog.isShowing()).isTrue();

        assertThat(subtitle1.getVisibility()).isEqualTo(View.GONE);

        assertThat(guidance.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(shareBtn.getVisibility()).isEqualTo(View.GONE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_noConnectedDevice_dialogDismiss() {

        mFragment.show(mParent, new ArrayList<>(), (item) -> {});

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        dialog.findViewById(android.R.id.button2).performClick();

        shadowMainLooper().idle();

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

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOn_singleConnectedDevice() {

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

        list.add(TEST_DEVICE_ITEM1);

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

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

        TextView subtitle1 = rootView.findViewById(R.id.share_audio_subtitle1);

        ImageView guidance = rootView.findViewById(R.id.share_audio_guidance);

        Button shareBtn = rootView.findViewById(R.id.share_btn);

        assertThat(dialog.isShowing()).isTrue();

        assertThat(subtitle1.getVisibility()).isEqualTo(View.VISIBLE);

        assertThat(TEST_DEVICE_NAME1).isEqualTo(subtitle1.getText());

        assertThat(guidance.getVisibility()).isEqualTo(View.GONE);

        assertThat(shareBtn.getVisibility()).isEqualTo(View.VISIBLE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_singleConnectedDevice_dialogDismiss() {

        mFragment.show(mParent, new ArrayList<>(), (item) -> {});

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

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

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

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_singleConnectedDevice_shareClicked() {

        AtomicBoolean isShareBtnClicked = new AtomicBoolean(false);

        mFragment.show(

                mParent,

                new ArrayList<>(),

                (item) -> {

                    isShareBtnClicked.set(true);

                });

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

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

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

        assertThat(isShareBtnClicked.get()).isTrue();

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_flagOn_multipleConnectedDevice() {

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

        list.add(TEST_DEVICE_ITEM1);

        list.add(TEST_DEVICE_ITEM2);

        list.add(TEST_DEVICE_ITEM3);

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

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

        TextView subtitle1 = rootView.findViewById(R.id.share_audio_subtitle1);

        ImageView guidance = rootView.findViewById(R.id.share_audio_guidance);

        Button shareBtn = rootView.findViewById(R.id.share_btn);

        assertThat(dialog.isShowing()).isTrue();

        assertThat(subtitle1.getVisibility()).isEqualTo(View.GONE);

        assertThat(guidance.getVisibility()).isEqualTo(View.GONE);

        assertThat(shareBtn.getVisibility()).isEqualTo(View.GONE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_LE_AUDIO_SHARING)

    public void onCreateDialog_multipleConnectedDevice_dialogDismiss() {

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

        list.add(TEST_DEVICE_ITEM1);

        list.add(TEST_DEVICE_ITEM2);

        list.add(TEST_DEVICE_ITEM3);

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

        shadowMainLooper().idle();

        AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);

        View rootView = shadowDialog.getView();

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

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

    }

}