Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ac7143 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Allow menu to hide upon pressing ESC." into rvc-dev am: 00b43361 am: 4afdc0da 

Change-Id: Ic0aca1488135f0481f4d0e5428305887a010542b
parents c1e60d59 4afdc0da

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -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);