PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Redirect user to original pairing page from pair dialog" into main

Browse Source
This commit is contained in:
Angela Wang
2023-09-05 07:08:16 +00:00
committed by Android (Google) Code Review
parent 4f4a1e3037 175c73b316
commit 873936451c
7 changed files with 72 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/bluetooth/HearingAidPairingDialogFragment.java
View File

@@ -28,6 +28,7 @@ import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.accessibility.HearingDevicePairingDetail;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -41,6 +42,8 @@ public class HearingAidPairingDialogFragment extends InstrumentedDialogFragment
CachedBluetoothDevice.Callback {
public static final String TAG = "HearingAidPairingDialogFragment";
private static final String KEY_DEVICE_ADDRESS = "device_address";
private static final String KEY_LAUNCH_PAGE = "launch_page";
private LocalBluetoothManager mLocalBluetoothManager;
private CachedBluetoothDevice mDevice;
@@ -50,11 +53,17 @@ public class HearingAidPairingDialogFragment extends InstrumentedDialogFragment
*
* @param deviceAddress The remote Bluetooth device address, that needs to be a hearing aid
* device.
* @param launchPage The id of the page where this dialog launch from. Should be one of
* {@link SettingsEnums#ACCESSIBILITY},
* {@link SettingsEnums#ACCESSIBILITY_HEARING_AID_SETTINGS}, or
* {@link SettingsEnums#SETTINGS_CONNECTED_DEVICE_CATEGORY}
* @return a DialogFragment
*/
public static HearingAidPairingDialogFragment newInstance(String deviceAddress) {
public static HearingAidPairingDialogFragment newInstance(String deviceAddress,
int launchPage) {
Bundle args = new Bundle(1);
args.putString(KEY_DEVICE_ADDRESS, deviceAddress);
args.putInt(KEY_LAUNCH_PAGE, launchPage);
final HearingAidPairingDialogFragment fragment = new HearingAidPairingDialogFragment();
fragment.setArguments(args);
return fragment;
@@ -111,8 +120,14 @@ public class HearingAidPairingDialogFragment extends InstrumentedDialogFragment
}
private void positiveButtonListener() {
final int launchPage = getArguments().getInt(KEY_LAUNCH_PAGE);
final boolean launchFromA11y = (launchPage == SettingsEnums.ACCESSIBILITY)
|| (launchPage == SettingsEnums.ACCESSIBILITY_HEARING_AID_SETTINGS);
final String destination = launchFromA11y
? HearingDevicePairingDetail.class.getName()
: BluetoothPairingDetail.class.getName();
new SubSettingLauncher(getActivity())
.setDestination(BluetoothPairingDetail.class.getName())
.setDestination(destination)
.setSourceMetricsCategory(getMetricsCategory())
.launch();
}