Merge "PIP: Restore PIP size when PIP menu is gone" into nyc-dev

This commit is contained in:
Jaewan Kim
2016-02-26 06:13:26 +00:00
committed by Android (Google) Code Review

View File

@@ -93,6 +93,17 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
});
}
private void restorePipAndFinish() {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
finish();
}
@Override
public void onPause() {
super.onPause();
restorePipAndFinish();
}
@Override
protected void onDestroy() {
super.onDestroy();
@@ -103,8 +114,7 @@ public class PipMenuActivity extends Activity implements PipManager.Listener {
@Override
public void onBackPressed() {
mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
finish();
restorePipAndFinish();
}
@Override