commit 97a60d9d00240949b9642c28a34be118469eb727
author Winson Chung <winsonc@google.com> Wed Jan 18 16:01:53 2017 -0800
committer Winson Chung <winsonc@google.com> Thu Jan 19 09:16:31 2017 -0800
tree cfbbc08eab5b5031eb995bc954264dd22e85de9a
parent 3535df26e36df067b8704443e4a660526fe11e22

Falling back to media session controls.

- If there are no specific actions set by the current PiP activity,
  then fall back to actions provided by the current media session.

Test: Start PiP activity with a media session

Change-Id: Iabb33606eec682fa2fa4d1ba065c8b2763023de7

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

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
index c828ede..3103267 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java
@@ -55,6 +55,7 @@
     private final PinnedStackListener mPinnedStackListener = new PinnedStackListener();
 
     private PipMenuActivityController mMenuController;
+    private PipMediaController mMediaController;
     private PipTouchHandler mTouchHandler;
 
     /**
@@ -67,6 +68,7 @@
                 return;
             }
             mTouchHandler.onActivityPinned();
+            mMediaController.onActivityPinned();
         }
 
         @Override
@@ -84,17 +86,9 @@
             // another package than the top activity in the stack
             boolean expandPipToFullscreen = true;
             if (sourceComponent != null) {
-                try {
-                    StackInfo pinnedStackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
-                    if (pinnedStackInfo != null && pinnedStackInfo.taskIds != null &&
-                            pinnedStackInfo.taskIds.length > 0) {
-                        expandPipToFullscreen =
-                                !pinnedStackInfo.topActivity.getPackageName().equals(
-                                        sourceComponent.getPackageName());
-                    }
-                } catch (RemoteException e) {
-                    Log.w(TAG, "Unable to get pinned stack.");
-                }
+                ComponentName topActivity = PipUtils.getTopPinnedActivity(mActivityManager);
+                expandPipToFullscreen = topActivity != null && topActivity.getPackageName().equals(
+                        sourceComponent.getPackageName());
             }
             if (expandPipToFullscreen) {
                 mTouchHandler.expandPinnedStackToFullscreen();
@@ -124,7 +118,7 @@
         @Override
         public void onActionsChanged(ParceledListSlice actions) {
             mHandler.post(() -> {
-                mMenuController.setActions(actions);
+                mMenuController.setAppActions(actions);
             });
         }
 
@@ -160,7 +154,9 @@
         }
         SystemServicesProxy.getInstance(mContext).registerTaskStackListener(mTaskStackListener);
 
-        mMenuController = new PipMenuActivityController(context, mActivityManager, mWindowManager);
+        mMediaController = new PipMediaController(context, mActivityManager);
+        mMenuController = new PipMenuActivityController(context, mActivityManager, mWindowManager,
+                mMediaController);
         mTouchHandler = new PipTouchHandler(context, mMenuController, mActivityManager,
                 mWindowManager);
     }