Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 837e9e32 authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

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

am: 99c1d934

* commit '99c1d934':
  PIP: Fix move to full screen
parents 6e470ae3 99c1d934

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -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() {

        if (!mMovePipToFullscreen) {

            mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);

            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) {