From f2fd0294a96306f2e539621c09927ca6947407b2 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Mon, 8 Feb 2021 18:43:30 +0000
Subject: [PATCH] Revert "Add an invisible layer to trap focus"

This reverts commit cb98114abd40b645245bbf9d60195b662b6eba37.

Reason for revert: Not needed once ag/13507782 is merged

Bug: 169372603
Change-Id: I52d4344f6f2f3fb973f3f20e7d6f1ec2844d7567
Test: manually enter PiP
---
 libs/WindowManager/Shell/res/layout/pip_menu.xml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/libs/WindowManager/Shell/res/layout/pip_menu.xml b/libs/WindowManager/Shell/res/layout/pip_menu.xml
index 93a6e7b70c54a..b581f555c234c 100644
--- a/libs/WindowManager/Shell/res/layout/pip_menu.xml
+++ b/libs/WindowManager/Shell/res/layout/pip_menu.xml
@@ -97,14 +97,4 @@
         android:padding="@dimen/pip_resize_handle_padding"
         android:src="@drawable/pip_resize_handle"
         android:background="?android:selectableItemBackgroundBorderless" />
-
-    <!-- invisible layer to trap the focus, b/169372603 -->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:defaultFocusHighlightEnabled="false"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:focusedByDefault="true" />
-t </FrameLayout>
+</FrameLayout>