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

Merge "PIP: Apply the comment from the previous commit" into nyc-dev

Browse Source 
am: 26f7ec69de

* commit '26f7ec69de2a8ad30092058629f337ba297c2f6c':
  PIP: Apply the comment from the previous commit
This commit is contained in:
Jaewan Kim
2016-03-04 06:32:29 +00:00
committed by android-build-merger
parent bbfcd350bf 26f7ec69de
commit ff296f98ae
1 changed files with 4 additions and 4 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,7 +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 boolean mPipMovedToFullscreen;
private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() { private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() {
@Override @Override
@@ -70,7 +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; mPipMovedToFullscreen = true;
finish(); finish();
} }
}); });
@@ -169,7 +169,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
} }
private void restorePipAndFinish() { private void restorePipAndFinish() {
if (!mMovePipToFullscreen) { if (!mPipMovedToFullscreen) {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY); mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
} }
finish(); finish();
@@ -225,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() && !mMovePipToFullscreen) { if (mPipManager.isRecentsShown() && !mPipMovedToFullscreen) {
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) {