From ccc470cae7afc1fa4c59cd403260fee5d68b7e41 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 21 Mar 2017 23:50:28 +0000
Subject: Revert "Fixing issue with IME not showing after PiP menu is shown."

This reverts commit d703c63c5f7a7caf1f71515da71276ae90bcbef0.

Reason for revert: Causing b/36466104
Test: Revert

Change-Id: I04823cc4294ac5da32908a79da1c8da592d71e34
---
 .../src/com/android/systemui/pip/phone/PipMenuActivity.java         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 db3cc6c93693..2597ce10077f 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -248,7 +248,6 @@ public class PipMenuActivity extends Activity {
 
     private void showMenu(Rect stackBounds, Rect movementBounds) {
         if (!mMenuVisible) {
-            setVisible(true);
             updateActionViews(stackBounds);
             if (mMenuContainerAnimator != null) {
                 mMenuContainerAnimator.cancel();
@@ -295,8 +294,8 @@ public class PipMenuActivity extends Activity {
                     if (animationFinishedRunnable != null) {
                         animationFinishedRunnable.run();
                     }
-                    if (!isDestroyed()) {
-                        setVisible(false);
+                    if (getSystemService(AccessibilityManager.class).isEnabled()) {
+                        finish();
                     }
                 }
             });
@@ -407,7 +406,6 @@ public class PipMenuActivity extends Activity {
     }
 
     private void updateDismissFraction(float fraction) {
-        setVisible(true);
         int alpha;
         if (mMenuVisible) {
             mMenuContainer.setAlpha(1-fraction);
-- 
cgit v1.2.3-59-g8ed1b