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

Merge "Use media switcher dialog to control routing during call" into main

Browse Source
This commit is contained in:
Wenyu Zhang
2024-10-11 22:07:26 +00:00
committed by Android (Google) Code Review
parent 276c3dfc3a 830654aa85
commit 59dd884069
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/sound/MediaOutputPreferenceController.java
View File

@@ -41,6 +41,7 @@ import com.android.settingslib.bluetooth.HearingAidProfile;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.media.MediaOutputConstants;
import com.android.settingslib.media.PhoneMediaDevice;
import java.util.List;
@@ -132,6 +133,12 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
// Always use media switcher to control routing in desktop.
if (PhoneMediaDevice.inputRoutingEnabledAndIsDesktop(mContext)) {
mPreference.setVisible(true);
return;
}
mPreference.setVisible(!Utils.isAudioModeOngoingCall(mContext)
&& (enableOutputSwitcherForSystemRouting() ? true : mMediaController != null));
}
@@ -153,8 +160,10 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro
}
mPreference.setEnabled(true);
if (Utils.isAudioModeOngoingCall(mContext)) {
// Ongoing call status, switch entry for media will be disabled.
if (Utils.isAudioModeOngoingCall(mContext) &&
!PhoneMediaDevice.inputRoutingEnabledAndIsDesktop(mContext)) {
// Ongoing call status, switch entry for media will be disabled, unless input routing is
// enabled in desktop.
mPreference.setVisible(false);
preference.setSummary(
mContext.getText(R.string.media_out_summary_ongoing_call_state));