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

Commit 579b382b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PIP: Start consulting TaskOrganizer for bounds instead of framework."... 

Merge "PIP: Start consulting TaskOrganizer for bounds instead of framework." into rvc-dev am: 127d9b63

Change-Id: I7b68aa7d6ef63bf9b14e12906a2c3a83790f5c24
parents afc0a2e7 127d9b63

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+1 −1
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ public class PipTaskOrganizer extends TaskOrganizer { 
        @Override

        public void onPipAnimationEnd(SurfaceControl.Transaction tx,

                PipAnimationController.PipTransitionAnimator animator) {

            finishResize(tx, animator.getDestinationBounds(), animator.getTransitionDirection());

            mMainHandler.post(() -> {

                for (int i = mPipTransitionCallbacks.size() - 1; i >= 0; i--) {

                    final PipTransitionCallback callback = mPipTransitionCallbacks.get(i);
@@ -110,7 +111,6 @@ public class PipTaskOrganizer extends TaskOrganizer { 
                            animator.getTransitionDirection());

                }

            });

            finishResize(tx, animator.getDestinationBounds(), animator.getTransitionDirection());

        }



        @Override

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

+1 −11
Original line number Diff line number Diff line
@@ -16,12 +16,10 @@ 


package com.android.systemui.pip.phone;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager.StackInfo;

import android.app.IActivityTaskManager;

import android.content.Context;

import android.graphics.Rect;
@@ -169,15 +167,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback, 
     */

    void synchronizePinnedStackBounds() {

        cancelAnimations();

        try {

            StackInfo stackInfo = mActivityTaskManager.getStackInfo(

                    WINDOWING_MODE_PINNED, ACTIVITY_TYPE_UNDEFINED);

            if (stackInfo != null) {

                mBounds.set(stackInfo.bounds);

            }

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to get pinned stack bounds");

        }

        mBounds.set(mPipTaskOrganizer.getLastReportedBounds());

    }



    /**