Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Close PIP if media session is gone" into nyc-dev

Browse Source 
am: 1ea8722f93

* commit '1ea8722f933b761ef791813968ff0cc202a2f8b9':
  PIP: Close PIP if media session is gone
This commit is contained in:
Jaewan Kim
2016-03-10 01:05:40 +00:00
committed by android-build-merger
parent af2d5fb699 1ea8722f93
commit 9f624deb42
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java
View File

@@ -68,6 +68,9 @@ public class PipManager {
public static final int SUSPEND_PIP_RESIZE_REASON_WAITING_FOR_MENU_ACTIVITY_FINISH = 0x1;
public static final int SUSPEND_PIP_RESIZE_REASON_WAITING_FOR_OVERLAY_ACTIVITY_FINISH = 0x2;
private static final int CLOSE_PIP_WHEN_MEDIA_SESSION_GONE_TIMEOUT_MS = 3000;
private int mSuspendPipResizingReason;
private static final float SCALE_FACTOR = 1.1f;
@@ -172,6 +175,12 @@ public class PipManager {
resizePinnedStack(mState);
}
};
private final Runnable mClosePipRunnable = new Runnable() {
@Override
public void run() {
closePip();
}
};
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
@@ -283,6 +292,7 @@ public class PipManager {
for (int i = mListeners.size() - 1; i >= 0; --i) {
mListeners.get(i).onPipActivityClosed();
}
mHandler.removeCallbacks(mClosePipRunnable);
}
/**
@@ -545,6 +555,12 @@ public class PipManager {
for (int i = mListeners.size() - 1; i >= 0; i--) {
mListeners.get(i).onMediaControllerChanged();
}
if (mPipMediaController == null) {
mHandler.postDelayed(mClosePipRunnable,
CLOSE_PIP_WHEN_MEDIA_SESSION_GONE_TIMEOUT_MS);
} else {
mHandler.removeCallbacks(mClosePipRunnable);
}
}
}