From 9c23b28a2283359eb79fd18a2994c91be63cbf22 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Thu, 25 Feb 2016 20:04:12 -0800
Subject: [PATCH] PIP: Restore PIP size when PIP menu is gone

Change-Id: Ifb1bf992b875dc2cf10a3e9e05ca0b1fe6bd535b
---
 .../android/systemui/tv/pip/PipMenuActivity.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
index 4171dbcc43725..a392becbcf981 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
@@ -93,6 +93,17 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
         });
     }
 
+    private void restorePipAndFinish() {
+        mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
+        finish();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        restorePipAndFinish();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -103,8 +114,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
 
     @Override
     public void onBackPressed() {
-        mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
-        finish();
+        restorePipAndFinish();
     }
 
     @Override