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

Merge "Show media stream with remote streams" into pi-dev

Browse Source 
am: aeb22ce3c3

Change-Id: I0dd53319f8e7ad2e0088486f272ea5eea772207a
This commit is contained in:
Julia Reynolds
2018-04-10 19:53:14 -07:00
committed by android-build-merger
parent f4bf387e9d aeb22ce3c3
commit a34134c991
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -301,15 +301,8 @@ public class VolumeDialogImpl implements VolumeDialog {
if (D.BUG) Slog.d(TAG, "Adding row for stream " + stream);
VolumeRow row = new VolumeRow();
initRow(row, stream, iconRes, iconMuteRes, important, defaultStream);
if (dynamic && mRows.size() > 2) {
// Dynamic Streams should be the first in the list, so they're shown to start of
// everything except a11y
mDialogRowsView.addView(row.view, 1);
mRows.add(1, row);
} else {
mDialogRowsView.addView(row.view);
mRows.add(row);
}
mDialogRowsView.addView(row.view);
mRows.add(row);
}
private void addExistingRows() {
@@ -603,7 +596,8 @@ public class VolumeDialogImpl implements VolumeDialog {
return activeRow.stream == STREAM_RING
|| activeRow.stream == STREAM_ALARM
|| activeRow.stream == STREAM_VOICE_CALL
|| activeRow.stream == STREAM_ACCESSIBILITY;
|| activeRow.stream == STREAM_ACCESSIBILITY
|| mDynamic.get(activeRow.stream);
}
return false;