Merge "Close the dialog activity when user click cancel or background" into udc-dev

This commit is contained in:
SongFerng Wang
2023-03-17 07:13:36 +00:00
committed by Android (Google) Code Review

View File

@@ -19,6 +19,7 @@ package com.android.settings.bluetooth;
import android.app.Dialog; import android.app.Dialog;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
@@ -27,6 +28,7 @@ import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.settings.R; import com.android.settings.R;
@@ -128,6 +130,12 @@ public class BluetoothBroadcastDialog extends InstrumentedDialogFragment {
return SettingsEnums.DIALOG_LE_AUDIO_BROADCAST; return SettingsEnums.DIALOG_LE_AUDIO_BROADCAST;
} }
@Override
public void onCancel(@NonNull DialogInterface dialog) {
dismiss();
getActivity().finish();
}
private void launchFindBroadcastsActivity() { private void launchFindBroadcastsActivity() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString(KEY_DEVICE_ADDRESS, mDeviceAddress); bundle.putString(KEY_DEVICE_ADDRESS, mDeviceAddress);