commit a018afd7d247bf95885d96eaf51a43968a78d3bd
author Jaewan Kim <jaewan@google.com> Fri Apr 29 06:03:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 29 06:03:45 2016 +0000
tree 8caadbb30c53d87a077ca2f533ccd783ef84b576
parent 060676de3ef764a3a38c2d281a97eca32757d08b
parent cbb128a5d8f8e6c028239603139d17b6b6cbd885

Merge "PIP: Prevent PIP icons in Recents from blinking when PIP is closed" into nyc-dev
am: cbb128a5d8

* commit 'cbb128a5d8f8e6c028239603139d17b6b6cbd885':
  PIP: Prevent PIP icons in Recents from blinking when PIP is closed

Change-Id: I1fb86d062f082d7be9d4b8a10c7d61ae04ccfbbf

packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java

diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
index dd12360..fe5d8bce 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
@@ -134,7 +134,8 @@
      */
     public void requestFocus(boolean allowRecentsFocusable) {
         mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE);
-        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) {
+        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent
+                || !mPipManager.isPipShown()) {
             return;
         }
         mIsPipFocusedInRecent = true;
@@ -153,7 +154,8 @@
      * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}.
      */
     public void clearFocus() {
-        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) {
+        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent
+                || !mPipManager.isPipShown()) {
             return;
         }
         if (!mRecentsView.hasFocus()) {