commit d4c6a31b5ed8dffdfc1f5ea2dfc60c75a2058c27
author Winson Chung <winsonc@google.com> Fri May 07 01:11:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 01:11:23 2021 +0000
tree 567d090f8fa8ff49830538d58f88c891f408b5a1
parent 98b11f2eaf1e84c683c4cdf40bb94516de0a5546
parent 1e018374a0af7d4e6be9a2c0edc64866e80a7bf6

Merge "Handle volume key events while in overview" into sc-dev am: 45849e22c9 am: 1e018374a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14456869

Change-Id: I2e01e6ff3ba951b3659e5c8c6fa99018f719638b

quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
index fa9e0ec..4af6338 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/OverviewInputConsumer.java
@@ -18,6 +18,8 @@
 import static com.android.quickstep.util.NavigationModeFeatureFlag.LIVE_TILE;
 import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
 
+import android.media.AudioManager;
+import android.media.session.MediaSessionManager;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 
@@ -101,6 +103,17 @@
     @Override
     public void onKeyEvent(KeyEvent ev) {
         if (LIVE_TILE.get()) {
+            switch (ev.getKeyCode()) {
+                case KeyEvent.KEYCODE_VOLUME_DOWN:
+                case KeyEvent.KEYCODE_VOLUME_UP:
+                case KeyEvent.KEYCODE_VOLUME_MUTE:
+                    MediaSessionManager mgr = mActivity.getSystemService(MediaSessionManager.class);
+                    mgr.dispatchVolumeKeyEventAsSystemService(ev,
+                            AudioManager.USE_DEFAULT_STREAM_TYPE);
+                    break;
+                default:
+                    break;
+            }
             mActivity.dispatchKeyEvent(ev);
         }
     }