From 8e90d0ab6e7baa29b1ceb66f13bb6dca411f04a4 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Wed, 26 Feb 2020 14:57:14 -0800
Subject: Allow menu to hide upon pressing ESC.

Bug: 126619417
Test: Press ESC
Change-Id: I8f1550b45742e7f2055004fa805a8e2f97387144
---
 .../src/com/android/systemui/pip/phone/PipMenuActivity.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 81e8a0b91211..fc04f795c056 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -60,6 +60,7 @@ import android.os.RemoteException;
 import android.os.UserHandle;
 import android.util.Log;
 import android.util.Pair;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -225,6 +226,15 @@ public class PipMenuActivity extends Activity {
         getWindow().setExitTransition(null);
     }
 
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_ESCAPE) {
+            hideMenu();
+            return true;
+        }
+        return super.onKeyUp(keyCode, event);
+    }
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-- 
cgit v1.2.3-59-g8ed1b