diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fdd3836473ba7..07feb44efea91 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -952,6 +952,22 @@ public final class Settings { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_LOCKSCREEN_SETTINGS = "android.settings.LOCK_SCREEN_SETTINGS"; + /** + * Activity Action: Show settings to allow pairing bluetooth devices. + *
+ * In some cases, a matching Activity may not exist, so ensure you + * safeguard against this. + *
+ * Input: Nothing. + *
+ * Output: Nothing. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_BLUETOOTH_PAIRING_SETTINGS = + "android.settings.BLUETOOTH_PAIRING_SETTINGS"; + /** * Activity Action: Show settings to configure input methods, in particular * allowing the user to enable input methods. diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java index 6da4d4811ac92..ad6901f40d6b2 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java @@ -16,6 +16,8 @@ package com.android.systemui.media.dialog; +import static android.provider.Settings.ACTION_BLUETOOTH_PAIRING_SETTINGS; + import android.app.Notification; import android.content.Context; import android.content.Intent; @@ -30,6 +32,7 @@ import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; import android.os.UserHandle; import android.os.UserManager; +import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -46,7 +49,6 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.media.InfoMediaManager; import com.android.settingslib.media.LocalMediaManager; import com.android.settingslib.media.MediaDevice; -import com.android.settingslib.media.MediaOutputConstants; import com.android.settingslib.utils.ThreadUtils; import com.android.systemui.R; import com.android.systemui.animation.DialogLaunchAnimator; @@ -69,7 +71,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { private static final String TAG = "MediaOutputController"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); - + private static final String PAGE_CONNECTED_DEVICES_KEY = + "top_level_connected_devices"; private final String mPackageName; private final Context mContext; private final MediaSessionManager mMediaSessionManager; @@ -451,14 +454,24 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback { mDialogLaunchAnimator.disableAllCurrentDialogsExitAnimations(); mCallback.dismissDialog(); - final ActivityStarter.OnDismissAction postKeyguardAction = () -> { - mContext.sendBroadcast(new Intent() - .setAction(MediaOutputConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING) - .setPackage(MediaOutputConstants.SETTINGS_PACKAGE_NAME)); - mShadeController.animateCollapsePanels(); - return true; - }; - mActivityStarter.dismissKeyguardThenExecute(postKeyguardAction, null, true); + Intent launchIntent = + new Intent(ACTION_BLUETOOTH_PAIRING_SETTINGS) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); + final Intent deepLinkIntent = + new Intent(Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY); + if (deepLinkIntent.resolveActivity(mContext.getPackageManager()) != null) { + Log.d(TAG, "Device support split mode, launch page with deep link"); + deepLinkIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + deepLinkIntent.putExtra( + Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI, + launchIntent.toUri(Intent.URI_INTENT_SCHEME)); + deepLinkIntent.putExtra( + Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, + PAGE_CONNECTED_DEVICES_KEY); + mActivityStarter.startActivity(deepLinkIntent, true); + return; + } + mActivityStarter.startActivity(launchIntent, true); } void launchMediaOutputGroupDialog(View mediaOutputDialog) {