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

Merge "PIP: Fix move to full screen" into nyc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2016-03-03 16:57:31 +00:00
committed by Android (Google) Code Review
parent b94df9db50 32686b6da5
commit 2cca0a930b
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 TextView mPlayPauseDescriptionTextView;
private View mCloseButtonView; private View mCloseButtonView;
private View mCloseDescriptionView; private View mCloseDescriptionView;
private boolean mMovePipToFullscreen;
private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() { private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() {
@Override @Override
@@ -69,6 +70,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mPipManager.movePipToFullscreen(); mPipManager.movePipToFullscreen();
mMovePipToFullscreen = true;
finish(); finish();
} }
}); });
@@ -167,7 +169,9 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
} }
private void restorePipAndFinish() { private void restorePipAndFinish() {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY); if (!mMovePipToFullscreen) {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
}
finish(); finish();
} }
@@ -221,7 +225,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
@Override @Override
public void finish() { public void finish() {
super.finish(); super.finish();
if (mPipManager.isRecentsShown()) { if (mPipManager.isRecentsShown() && !mMovePipToFullscreen) {
SystemUI[] services = ((SystemUIApplication) getApplication()).getServices(); SystemUI[] services = ((SystemUIApplication) getApplication()).getServices();
for (int i = services.length - 1; i >= 0; i--) { for (int i = services.length - 1; i >= 0; i--) {
if (services[i] instanceof Recents) { if (services[i] instanceof Recents) {