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

Commit 5ea28f5f authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Apply new string resid 

Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858921
Bug: 362858894
Change-Id: I4c80d834515e43bade5f2207dc013dc30c6ab7be
parent 7a91f6e7

src/com/android/settings/bluetooth/BluetoothDevicePairingDetailBase.java

+4 −4
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere 
            String aliasName = device.getAlias();

            String deviceName = TextUtils.isEmpty(aliasName) ? device.getAddress()

                    : aliasName;

            showConnectingDialog("Connecting to " + deviceName + "...");

            showConnectingDialog(deviceName);

            // Wait for AUTO_DISMISS_TIME_THRESHOLD_MS and check if the paired device supports audio

            // sharing.

            if (!mHandler.hasMessages(AUTO_DISMISS_MESSAGE_ID)) {
@@ -385,14 +385,15 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere 
    }



    // TODO: use DialogFragment

    private void showConnectingDialog(@NonNull String message) {

    private void showConnectingDialog(@NonNull String deviceName) {

        postOnMainThread(() -> {

            String message = getContext().getString(R.string.progress_dialog_connect_device_content,

                    deviceName);

            if (mProgressDialog != null) {

                Log.d(getLogTag(), "showConnectingDialog, is already showing");

                TextView textView = mProgressDialog.findViewById(R.id.message);

                if (textView != null && !message.equals(textView.getText().toString())) {

                    Log.d(getLogTag(), "showConnectingDialog, update message");

                    // TODO: use string res once finalized

                    textView.setText(message);

                }

                return;
@@ -405,7 +406,6 @@ public abstract class BluetoothDevicePairingDetailBase extends DeviceListPrefere 
                    null);

            TextView textView = customView.findViewById(R.id.message);

            if (textView != null) {

                // TODO: use string res once finalized

                textView.setText(message);

            }

            AlertDialog dialog = builder.setView(customView).setCancelable(false).create();

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,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) -> {})

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

                        .build();

        dialog.setCanceledOnTouchOutside(true);

        return dialog;

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

+5 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;



import com.android.settings.R;

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

import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -65,15 +66,13 @@ public class AudioSharingErrorDialogFragment extends InstrumentedDialogFragment 
    @Override

    @NonNull

    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

        // TODO: put strings to res till they are finalized

        AlertDialog dialog =

                AudioSharingDialogFactory.newBuilder(getActivity())

                        .setTitle("Couldn't share audio")

                        .setTitleIcon(com.android.settings.R.drawable.ic_warning_24dp)

                        .setTitle(R.string.audio_sharing_retry_dialog_title)

                        .setTitleIcon(R.drawable.ic_warning_24dp)

                        .setIsCustomBodyEnabled(true)

                        .setCustomMessage("Something went wrong. Please try again.")

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

                        })

                        .setCustomMessage(R.string.audio_sharing_retry_dialog_content)

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

                        .build();

        dialog.setCanceledOnTouchOutside(true);

        return dialog;

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

+6 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;



import com.android.settings.R;

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

import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -88,15 +89,14 @@ public class AudioSharingIncompatibleDialogFragment extends InstrumentedDialogFr 
    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

        Bundle arguments = requireArguments();

        String deviceName = arguments.getString(BUNDLE_KEY_DEVICE_NAME);

        // TODO: move strings to res once they are finalized

        AlertDialog dialog =

                AudioSharingDialogFactory.newBuilder(getActivity())

                        .setTitle("Can't share audio with " + deviceName)

                        .setTitleIcon(com.android.settings.R.drawable.ic_warning_24dp)

                        .setTitle(getString(R.string.audio_sharing_incompatible_dialog_title,

                                deviceName))

                        .setTitleIcon(R.drawable.ic_warning_24dp)

                        .setIsCustomBodyEnabled(true)

                        .setCustomMessage(

                                "Audio sharing only works with headphones that support LE Audio.")

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

                        .setCustomMessage(R.string.audio_sharing_incompatible_dialog_content)

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

                        .build();

        dialog.setCanceledOnTouchOutside(true);

        return dialog;

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

+4 −4
Original line number Diff line number Diff line
@@ -571,10 +571,10 @@ public class AudioSharingSwitchBarController extends BasePreferenceController 
        if (mBroadcast != null) {

            mBroadcast.startPrivateBroadcast();

            mSinksInAdding.clear();

            // TODO: use string res once finalized.

            AudioSharingUtils.postOnMainThread(mContext,

                    () -> AudioSharingProgressDialogFragment.show(mFragment,

                            "Starting audio stream..."));

                            mContext.getString(

                                    R.string.audio_sharing_progress_dialog_start_stream_content)));

            mMetricsFeatureProvider.action(

                    mContext,

                    SettingsEnums.ACTION_AUDIO_SHARING_MAIN_SWITCH_ON,
@@ -830,8 +830,8 @@ public class AudioSharingSwitchBarController extends BasePreferenceController 
    private void addSourceToTargetSinks(List<BluetoothDevice> targetActiveSinks,

            @NonNull String sinkName) {

        mSinksInAdding.addAll(targetActiveSinks);

        // TODO: move to res once finalized

        String progressMessage = "Sharing with " + sinkName + "...";

        String progressMessage = mContext.getString(

                R.string.audio_sharing_progress_dialog_add_source_content, sinkName);

        showProgressDialog(progressMessage);

        AudioSharingUtils.addSourceToTargetSinks(targetActiveSinks, mBtManager);

    }