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

Merge "[Audiosharing] Refresh the dialog handling onNewIntent" into main

Browse Source
This commit is contained in:
Yiyi Shen
2025-03-03 01:13:47 -08:00
committed by Android (Google) Code Review
parent dc78ca78e8 f23bda264a
commit 351fca09f9
4 changed files with 95 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerActivity.java
View File

@@ -16,7 +16,9 @@
package com.android.settings.connecteddevice.audiosharing;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.android.settings.SettingsActivity;
import com.android.settingslib.bluetooth.BluetoothUtils;
@@ -34,6 +36,23 @@ public class AudioSharingJoinHandlerActivity extends SettingsActivity {
}
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
if (!Flags.promoteAudioSharingForSecondAutoConnectedLeaDevice()
|| !BluetoothUtils.isAudioSharingUIAvailable(this)) {
finish();
}
if (intent != null) {
Log.d(TAG, "onNewIntent = " + intent);
getSupportFragmentManager().getFragments().stream().filter(
frag -> frag instanceof AudioSharingJoinHandlerDashboardFragment)
.findFirst().ifPresent(
frag -> ((AudioSharingJoinHandlerDashboardFragment) frag)
.handleDeviceConnectedFromIntent(intent));
}
}
@Override
protected boolean isToolbarEnabled() {
return false;

24
src/com/android/settings/connecteddevice/audiosharing/AudioSharingJoinHandlerDashboardFragment.java
View File

@@ -17,11 +17,16 @@
package com.android.settings.connecteddevice.audiosharing;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.utils.ThreadUtils;
public class AudioSharingJoinHandlerDashboardFragment extends DashboardFragment {
private static final String TAG = "AudioSharingJoinHandlerFrag";
@@ -49,7 +54,26 @@ public class AudioSharingJoinHandlerDashboardFragment extends DashboardFragment
super.onAttach(context);
mController = use(AudioSharingJoinHandlerController.class);
if (mController != null) {
Log.d(TAG, "onAttach, init controller");
mController.init(this);
}
}
/** Handle just connected device via intent. */
public void handleDeviceConnectedFromIntent(@NonNull Intent intent) {
var unused =
ThreadUtils.postOnBackgroundThread(
() -> {
if (mController != null) {
Log.d(TAG, "handleDeviceConnectedFromIntent");
mController.handleDeviceConnectedFromIntent(intent);
}
});
}
/** Test only: set mock controllers for the {@link AudioSharingJoinHandlerDashboardFragment} */
@VisibleForTesting
void setController(AudioSharingJoinHandlerController controller) {
mController = controller;
}
}