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

Commit 58c6e603 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Ensure profile-specific PiP notification is shown." into oc-mr1-dev 

am: 66f2d565

Change-Id: I9145bce7131e695a696e50b3e46e5c4a30a8e669
parents 2c786b63 66f2d565

core/java/android/app/ITaskStackListener.aidl

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ oneway interface ITaskStackListener { 
    void onTaskStackChanged();



    /** Called whenever an Activity is moved to the pinned stack from another stack. */

    void onActivityPinned(String packageName, int taskId);

    void onActivityPinned(String packageName, int userId, int taskId);



    /** Called whenever an Activity is moved from the pinned stack to another stack. */

    void onActivityUnpinned();

core/java/android/app/TaskStackListener.java

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onActivityPinned(String packageName, int taskId) throws RemoteException {

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

            throws RemoteException {

    }



    @Override

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

+12 −9
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.RemoteException;

import android.util.Log;

import android.util.Pair;

import android.view.IPinnedStackController;

import android.view.IPinnedStackListener;

import android.view.IWindowManager;
@@ -70,11 +71,11 @@ public class PipManager implements BasePipManager { 
     */

    TaskStackListener mTaskStackListener = new TaskStackListener() {

        @Override

        public void onActivityPinned(String packageName, int taskId) {

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

            mTouchHandler.onActivityPinned();

            mMediaController.onActivityPinned();

            mMenuController.onActivityPinned();

            mNotificationController.onActivityPinned(packageName,

            mNotificationController.onActivityPinned(packageName, userId,

                    true /* deferUntilAnimationEnds */);



            SystemServicesProxy.getInstance(mContext).setPipVisibility(true);
@@ -82,13 +83,15 @@ public class PipManager implements BasePipManager { 


        @Override

        public void onActivityUnpinned() {

            ComponentName topPipActivity = PipUtils.getTopPinnedActivity(mContext,

                    mActivityManager);

            mMenuController.onActivityUnpinned(topPipActivity);

            mTouchHandler.onActivityUnpinned(topPipActivity);

            mNotificationController.onActivityUnpinned(topPipActivity);



            SystemServicesProxy.getInstance(mContext).setPipVisibility(topPipActivity != null);

            final Pair<ComponentName, Integer> topPipActivityInfo = PipUtils.getTopPinnedActivity(

                    mContext, mActivityManager);

            final ComponentName topActivity = topPipActivityInfo.first;

            final int userId = topActivity != null ? topPipActivityInfo.second : 0;

            mMenuController.onActivityUnpinned();

            mTouchHandler.onActivityUnpinned(topActivity);

            mNotificationController.onActivityUnpinned(topActivity, userId);



            SystemServicesProxy.getInstance(mContext).setPipVisibility(topActivity != null);

        }



        @Override

packages/SystemUI/src/com/android/systemui/pip/phone/PipMediaController.java

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ public class PipMediaController { 
    private void resolveActiveMediaController(List<MediaController> controllers) {

        if (controllers != null) {

            final ComponentName topActivity = PipUtils.getTopPinnedActivity(mContext,

                    mActivityManager);

                    mActivityManager).first;

            if (topActivity != null) {

                for (int i = 0; i < controllers.size(); i++) {

                    final MediaController controller = controllers.get(i);

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivityController.java

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class PipMenuActivityController { 
        }

    }



    public void onActivityUnpinned(ComponentName topPipActivity) {

    public void onActivityUnpinned() {

        hideMenu();

        setStartActivityRequested(false);

    }