commit bcc2fdeb69a91682181159c4ff3c5c2628420082
author Winson Chung <winsonc@google.com> Fri May 07 00:52:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 00:52:32 2021 +0000
tree 567d090f8fa8ff49830538d58f88c891f408b5a1
parent 043072e3bfb6551e4bf2e72559fa63d3f3ac22fa
parent 45849e22c971d0f343f961e12fd1f48445154342

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

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

Change-Id: I43d3cd3cd9523051491de7e9d3b2ae8fb80639a5

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);
         }
     }