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

Commit 918d002a authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb0 am: 4e11a712 

am: 3b38be29

Change-Id: Iecad54744e7491279f886305a03050be98d5c8a4
parents 893832bd 3b38be29

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

+4 −12
Original line number Original line Diff line number Diff line
@@ -625,9 +625,7 @@ public class PipManager implements BasePipManager { 
        @Override

        @Override

        public void onTaskStackChanged() {

        public void onTaskStackChanged() {

            if (DEBUG) Log.d(TAG, "onTaskStackChanged()");

            if (DEBUG) Log.d(TAG, "onTaskStackChanged()");

            if (!checkCurrentUserId(mContext, DEBUG)) {



                return;

            }

            if (getState() != STATE_NO_PIP) {

            if (getState() != STATE_NO_PIP) {

                boolean hasPip = false;

                boolean hasPip = false;
@@ -662,9 +660,7 @@ public class PipManager implements BasePipManager { 
        @Override

        @Override

        public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {

        public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {

            if (DEBUG) Log.d(TAG, "onActivityPinned()");

            if (DEBUG) Log.d(TAG, "onActivityPinned()");

            if (!checkCurrentUserId(mContext, DEBUG)) {



                return;

            }

            StackInfo stackInfo = getPinnedStackInfo();

            StackInfo stackInfo = getPinnedStackInfo();

            if (stackInfo == null) {

            if (stackInfo == null) {

                Log.w(TAG, "Cannot find pinned stack");

                Log.w(TAG, "Cannot find pinned stack");
@@ -690,9 +686,7 @@ public class PipManager implements BasePipManager { 
        @Override

        @Override

        public void onPinnedActivityRestartAttempt(boolean clearedTask) {

        public void onPinnedActivityRestartAttempt(boolean clearedTask) {

            if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()");

            if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()");

            if (!checkCurrentUserId(mContext, DEBUG)) {



                return;

            }

            // If PIPed activity is launched again by Launcher or intent, make it fullscreen.

            // If PIPed activity is launched again by Launcher or intent, make it fullscreen.

            movePipToFullscreen();

            movePipToFullscreen();

        }

        }
@@ -700,9 +694,7 @@ public class PipManager implements BasePipManager { 
        @Override

        @Override

        public void onPinnedStackAnimationEnded() {

        public void onPinnedStackAnimationEnded() {

            if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");

            if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");

            if (!checkCurrentUserId(mContext, DEBUG)) {



                return;

            }

            switch (getState()) {

            switch (getState()) {

                case STATE_PIP_MENU:

                case STATE_PIP_MENU:

                    showPipMenu();

                    showPipMenu();