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

Commit 1c3a16c4 authored by Haijie Hong's avatar Haijie Hong Committed by Android (Google) Code Review
Browse files

Merge "Use androidx alertdialog in audio sharing" into main

parents fdc069e0 18318854

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AddSourceWaitForResponseState.java

+1 −1
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.settings.connecteddevice.audiosharing.audiostreams;



import android.app.AlertDialog;

import android.app.settings.SettingsEnums;

import android.content.Context;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;



import com.android.settings.R;

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.connecteddevice.audiosharing.audiostreams;



import android.app.AlertDialog;

import android.app.Dialog;

import android.app.settings.SettingsEnums;

import android.content.Context;
@@ -29,6 +28,7 @@ import android.widget.TextView; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsProgressCategoryController.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssista 


import static java.util.stream.Collectors.toMap;



import android.app.AlertDialog;

import android.app.settings.SettingsEnums;

import android.bluetooth.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;
@@ -39,6 +38,7 @@ import android.util.Log; 
import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.DefaultLifecycleObserver;

import androidx.lifecycle.LifecycleOwner;

src/com/android/settings/connecteddevice/audiosharing/audiostreams/SyncedState.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.connecteddevice.audiosharing.audiostreams;



import android.app.AlertDialog;

import android.bluetooth.BluetoothLeBroadcastMetadata;

import android.text.Editable;

import android.text.TextWatcher;
@@ -28,6 +27,7 @@ import android.widget.EditText; 
import android.widget.TextView;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AlertDialog;

import androidx.preference.Preference;



import com.android.settings.R;

src/com/android/settings/connecteddevice/audiosharing/audiostreams/WaitForSyncState.java

+1 −1
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ package com.android.settings.connecteddevice.audiosharing.audiostreams; 


import static com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsScanQrCodeController.REQUEST_SCAN_BT_BROADCAST_QR_CODE;



import android.app.AlertDialog;

import android.app.settings.SettingsEnums;

import android.content.Context;



import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.Fragment;



import com.android.settings.R;