VolumeDialog: Hide the music row if there is an ally stream

- Introduce the concept of tracking ally streams, useful
  when you are still on a call, for instance, but you also
  want to change the media volume for a future use. When
  you tap on the media row the calling row will disappear
  because of AOSP logic. With this patch, we hide the music
  row if there is a "special" row, like the voice call volume
  row, and show it on the expanded panel like our other custom
  rows. After collapsing the expanded panel we set active
  stream back to this "special" row.

Change-Id: I23792369cf1fd8e0b4d6913c67d02bd4c09f1ac7
Co-authored-by: Arian <arian.kulmer@web.de>
Signed-off-by: Jesse Chan <jc@lineageos.org>

Author: 2 people

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

@@ -173,8 +173,10 @@ public class VolumeDialogImpl implements VolumeDialog,
     private boolean mShowA11yStream;
 
     private int mActiveStream;
+    private int mAllyStream;
     private int mPrevActiveStream;
     private boolean mAutomute = VolumePrefs.DEFAULT_ENABLE_AUTOMUTE;
+    private boolean mMusicHidden;
     private boolean mSilentMode = VolumePrefs.DEFAULT_ENABLE_SILENT_MODE;
     private State mState;
     private SafetyWarningDialog mSafetyWarning;
@@ -351,6 +353,9 @@ private void initDialog() {
         initRingerH();
         initSettingsH();
         initODICaptionsH();
+
+        mAllyStream = -1;
+        mMusicHidden = false;
     }
 
     private final OnComputeInternalInsetsListener mInsetsListener = internalInsetsInfo -> {
@@ -583,6 +588,10 @@ public void initSettingsH() {
             });
         }
 
+        if (mAllyStream == -1) {
+            mAllyStream = mActiveStream;
+        }
+
         if (mExpandRowsView != null) {
             mExpandRowsView.setVisibility(
                     mDeviceProvisionedController.isCurrentUserSetup() &&
@@ -592,14 +601,18 @@ public void initSettingsH() {
         if (mExpandRows != null) {
             mExpandRows.setOnClickListener(v -> {
                 rescheduleTimeoutH();
+                if (mMusicHidden) {
+                    Util.setVisOrGone(findRow(AudioManager.STREAM_MUSIC).view,
+                            !mExpanded);
+                }
                 Util.setVisOrGone(findRow(AudioManager.STREAM_RING).view, !mExpanded);
                 Util.setVisOrGone(findRow(STREAM_ALARM).view, !mExpanded);
                 if (!isNotificationVolumeLinked()) {
                     Util.setVisOrGone(
                             findRow(AudioManager.STREAM_NOTIFICATION).view, !mExpanded);
                 }
 
-                if (mExpanded) mController.setActiveStream(AudioManager.STREAM_MUSIC);
+                if (mExpanded) mController.setActiveStream(mAllyStream);
                 mExpandRows.setExpanded(!mExpanded);
                 mExpanded = !mExpanded;
             });
@@ -917,6 +930,8 @@ protected void dismissH(int reason) {
                     }
                     mExpanded = false;
                     mExpandRows.setExpanded(mExpanded);
+                    mAllyStream = -1;
+                    mMusicHidden = false;
                     tryToRemoveCaptionsTooltip();
                     mController.notifyVisible(false);
                 }, 50));
@@ -939,6 +954,12 @@ private boolean showActiveStreamOnly() {
     private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
         boolean isActive = row.stream == activeRow.stream;
 
+        if (row.stream == AudioSystem.STREAM_MUSIC &&
+                activeRow.stream != AudioSystem.STREAM_MUSIC && !mExpanded) {
+            mMusicHidden = true;
+            return false;
+        }
+
         if (isActive) {
             return true;
         }