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

PIP: Fix move to full screen

Browse Source 
Change-Id: I6aeb230f77aef2c16c7a93a767b9a810407dfac3
This commit is contained in:
Jaewan Kim
2016-03-03 19:03:18 +09:00
parent 8316fac9c0
commit 32686b6da5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
View File

@@ -50,6 +50,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
private TextView mPlayPauseDescriptionTextView;
private View mCloseButtonView;
private View mCloseDescriptionView;
private boolean mMovePipToFullscreen;
private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() {
@Override
@@ -69,6 +70,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
@Override
public void onClick(View v) {
mPipManager.movePipToFullscreen();
mMovePipToFullscreen = true;
finish();
}
});
@@ -167,7 +169,9 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
}
private void restorePipAndFinish() {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
if (!mMovePipToFullscreen) {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
}
finish();
}
@@ -221,7 +225,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
@Override
public void finish() {
super.finish();
if (mPipManager.isRecentsShown()) {
if (mPipManager.isRecentsShown() && !mMovePipToFullscreen) {
SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();
for (int i = services.length - 1; i >= 0; i--) {
if (services[i] instanceof Recents) {