VolumePanel: Add upstream changes

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Change-Id: Ie9afa6802872cb0142ff74b552efe40b455b3763
Signed-off-by: Joey Huab <joey@evolution-x.org>

4 files changed, 28 insertions, 12 deletions

diff --git a/AospPanel/src/com/android/plugin/volume/aosp/VolumeDialogImpl.java b/AospPanel/src/com/android/plugin/volume/aosp/VolumeDialogImpl.java
index a76564f..78ede09 100644
--- a/AospPanel/src/com/android/plugin/volume/aosp/VolumeDialogImpl.java
+++ b/AospPanel/src/com/android/plugin/volume/aosp/VolumeDialogImpl.java
@@ -386,10 +386,10 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
         int[] dialogLocation = new int[2];
         mDialogView.getLocationInWindow(dialogLocation);
         internalInsetsInfo.touchableRegion.set(new Region(
-            mainLocation[0] - main.getWidth(),
-            dialogLocation[1],
-            mainLocation[0] + main.getWidth(),
-            dialogLocation[1] + mDialogView.getHeight()
+                mainLocation[0] - main.getWidth(),
+                dialogLocation[1],
+                mainLocation[0] + main.getWidth(),
+                dialogLocation[1] + mDialogView.getHeight()
         ));
     };
 
@@ -435,10 +435,10 @@ public class VolumeDialogImpl extends PanelSideAware 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 (!isAudioPanelOnLeftSide()) {
-            mDialogRowsView.addView(row.view, 0);
-        } else {
+        if(!isAudioPanelOnLeftSide()) {
             mDialogRowsView.addView(row.view);
+        } else {
+            mDialogRowsView.addView(row.view, 0);
         }
         mRows.add(row);
     }
@@ -602,7 +602,7 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
         }
         if (mExpandRows != null) {
             mExpandRows.setOnLongClickListener(v -> {
-                Events.writeEvent(mContext, Events.EVENT_SETTINGS_CLICK);
+                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
                 Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);
                 dismissH(DISMISS_REASON_SETTINGS_CLICKED);
                 PluginDependency.get(this, ActivityStarter.class).startActivity(intent,
@@ -942,7 +942,7 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
                 .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
                 .withEndAction(() -> mHandler.postDelayed(() -> {
                     mIsAnimatingDismiss = false;
-                    if (mDialog.isShown()){
+                    if (mDialog.isShown()) {
                         mWindowManager.removeViewImmediate(mDialog);
                     }
                     cleanExpandedRows();
@@ -1318,6 +1318,10 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
         updateVolumeRowSliderH(row, enableSlider, vlevel, maxChanged);
     }
 
+    private boolean isStreamMuted(final StreamState streamState) {
+        return (mAutomute && streamState.level == streamState.levelMin) || streamState.muted;
+    }
+
     private void updateVolumeRowTintH(VolumeRow row, boolean isActive) {
         if (isActive) {
             row.slider.requestFocus();
diff --git a/CompactPanel/src/com/android/plugin/volume/compact/VolumeDialogImpl.java b/CompactPanel/src/com/android/plugin/volume/compact/VolumeDialogImpl.java
index 34ea672..e5d2edd 100644
--- a/CompactPanel/src/com/android/plugin/volume/compact/VolumeDialogImpl.java
+++ b/CompactPanel/src/com/android/plugin/volume/compact/VolumeDialogImpl.java
@@ -592,7 +592,7 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
 
         if (mExpandRows != null) {
             mExpandRows.setOnLongClickListener(v -> {
-                Events.writeEvent(mContext, Events.EVENT_SETTINGS_CLICK);
+                Events.writeEvent(Events.EVENT_SETTINGS_CLICK);
                 Intent intent = new Intent(Settings.Panel.ACTION_VOLUME);
                 dismissH(DISMISS_REASON_SETTINGS_CLICKED);
                 PluginDependency.get(this, ActivityStarter.class).startActivity(intent,
@@ -1017,7 +1017,7 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
                 .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
                 .withEndAction(() -> mHandler.postDelayed(() -> {
                     mIsAnimatingDismiss = false;
-                    if (mDialog.isShown()){
+                    if (mDialog.isShown()) {
                         mWindowManager.removeViewImmediate(mDialog);
                     }
                     cleanExpandedRows();
@@ -1381,6 +1381,10 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
         updateVolumeRowSliderH(row, enableSlider, vlevel, maxChanged);
     }
 
+    private boolean isStreamMuted(final StreamState streamState) {
+        return (mAutomute && streamState.level == streamState.levelMin) || streamState.muted;
+    }
+
     private void updateVolumeRowTintH(VolumeRow row, boolean isActive) {
         if (isActive) {
             row.slider.requestFocus();
diff --git a/OreoPanel/src/com/android/plugin/volume/oreo/VolumeDialogImpl.java b/OreoPanel/src/com/android/plugin/volume/oreo/VolumeDialogImpl.java
index 8a219da..ba897a6 100644
--- a/OreoPanel/src/com/android/plugin/volume/oreo/VolumeDialogImpl.java
+++ b/OreoPanel/src/com/android/plugin/volume/oreo/VolumeDialogImpl.java
@@ -1030,6 +1030,10 @@ public class VolumeDialogImpl implements VolumeDialog {
         updateVolumeRowSliderH(row, enableSlider, vlevel, maxChanged);
     }
 
+    private boolean isStreamMuted(final StreamState streamState) {
+        return (mAutomute && streamState.level == streamState.levelMin) || streamState.muted;
+    }
+
     private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) {
         if (isActive && mExpanded) {
             row.slider.requestFocus();
diff --git a/TiledPanel/src/com/android/plugin/volume/tiled/VolumeDialogImpl.java b/TiledPanel/src/com/android/plugin/volume/tiled/VolumeDialogImpl.java
index 9f484b8..b1acc2c 100644
--- a/TiledPanel/src/com/android/plugin/volume/tiled/VolumeDialogImpl.java
+++ b/TiledPanel/src/com/android/plugin/volume/tiled/VolumeDialogImpl.java
@@ -1007,7 +1007,7 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
                 .setInterpolator(new SystemUIInterpolators.LogAccelerateInterpolator())
                 .withEndAction(() -> mHandler.postDelayed(() -> {
                     mIsAnimatingDismiss = false;
-                    if (mDialog.isShown()){
+                    if (mDialog.isShown()) {
                         mWindowManager.removeViewImmediate(mDialog);
                     }
                     mActiveStreamManuallyModified = false;
@@ -1383,6 +1383,10 @@ public class VolumeDialogImpl extends PanelSideAware implements VolumeDialog {
         updateVolumeRowSliderH(row, enableSlider, vlevel, maxChanged);
     }
 
+    private boolean isStreamMuted(final StreamState streamState) {
+        return (mAutomute && streamState.level == streamState.levelMin) || streamState.muted;
+    }
+
     private void updateVolumeRowTintH(VolumeRow row, boolean isActive) {
         if (isActive) {
             row.slider.requestFocus();