Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable group volume control bar in output switcher systemUI dialog" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-24 04:01:53 +00:00
committed by Android (Google) Code Review
parent 2a96e3f0fd 0ccbd4e52c
commit 3245ab133d
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/media_output_list_item.xml
View File

@@ -81,6 +81,7 @@
android:visibility="gone"/> android:visibility="gone"/>
<SeekBar <SeekBar
android:id="@+id/volume_seekbar" android:id="@+id/volume_seekbar"
style="@*android:style/Widget.DeviceDefault.SeekBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/> android:layout_alignParentBottom="true"/>

9
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseAdapter.java
View File

@@ -220,6 +220,9 @@ public abstract class MediaOutputBaseAdapter extends
} }
void initSeekbar(MediaDevice device) { void initSeekbar(MediaDevice device) {
if (!mController.isVolumeControlEnabled(device)) {
disableSeekBar();
}
mSeekBar.setMax(device.getMaxVolume()); mSeekBar.setMax(device.getMaxVolume());
mSeekBar.setMin(0); mSeekBar.setMin(0);
final int currentVolume = device.getCurrentVolume(); final int currentVolume = device.getCurrentVolume();
@@ -248,6 +251,7 @@ public abstract class MediaOutputBaseAdapter extends
} }
void initSessionSeekbar() { void initSessionSeekbar() {
disableSeekBar();
mSeekBar.setMax(mController.getSessionVolumeMax()); mSeekBar.setMax(mController.getSessionVolumeMax());
mSeekBar.setMin(0); mSeekBar.setMin(0);
final int currentVolume = mController.getSessionVolume(); final int currentVolume = mController.getSessionVolume();
@@ -336,5 +340,10 @@ public abstract class MediaOutputBaseAdapter extends
PorterDuff.Mode.SRC_IN)); PorterDuff.Mode.SRC_IN));
return BluetoothUtils.buildAdvancedDrawable(mContext, drawable); return BluetoothUtils.buildAdvancedDrawable(mContext, drawable);
} }
private void disableSeekBar() {
mSeekBar.setEnabled(false);
mSeekBar.setOnTouchListener((v, event) -> true);
}
} }
} }

4
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
View File

@@ -465,6 +465,10 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback {
|| features.contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK)); || features.contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK));
} }
boolean isVolumeControlEnabled(@NonNull MediaDevice device) {
return !device.getFeatures().contains(MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK);
}
private final MediaController.Callback mCb = new MediaController.Callback() { private final MediaController.Callback mCb = new MediaController.Callback() {
@Override @Override
public void onMetadataChanged(MediaMetadata metadata) { public void onMetadataChanged(MediaMetadata metadata) {