Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I3b5b0b8198f160c69439dce280b40efc9c997063
This commit is contained in:
TreeHugger Robot
2020-04-08 23:23:29 +00:00
committed by Automerger Merge Worker
parent 8518663ff3 127d9b632f
commit 593eddca33
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -103,6 +103,7 @@ public class PipTaskOrganizer extends TaskOrganizer {
@Override @Override
public void onPipAnimationEnd(SurfaceControl.Transaction tx, public void onPipAnimationEnd(SurfaceControl.Transaction tx,
PipAnimationController.PipTransitionAnimator animator) { PipAnimationController.PipTransitionAnimator animator) {
finishResize(tx, animator.getDestinationBounds(), animator.getTransitionDirection());
mMainHandler.post(() -> { mMainHandler.post(() -> {
for (int i = mPipTransitionCallbacks.size() - 1; i >= 0; i--) { for (int i = mPipTransitionCallbacks.size() - 1; i >= 0; i--) {
final PipTransitionCallback callback = mPipTransitionCallbacks.get(i); final PipTransitionCallback callback = mPipTransitionCallbacks.get(i);
@@ -110,7 +111,6 @@ public class PipTaskOrganizer extends TaskOrganizer {
animator.getTransitionDirection()); animator.getTransitionDirection());
} }
}); });
finishResize(tx, animator.getDestinationBounds(), animator.getTransitionDirection());
} }
@Override @Override

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

@@ -16,12 +16,10 @@
package com.android.systemui.pip.phone; package com.android.systemui.pip.phone;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.ActivityManager.StackInfo;
import android.app.IActivityTaskManager; import android.app.IActivityTaskManager;
import android.content.Context; import android.content.Context;
import android.graphics.Rect; import android.graphics.Rect;
@@ -169,15 +167,7 @@ public class PipMotionHelper implements PipAppOpsListener.Callback,
*/ */
void synchronizePinnedStackBounds() { void synchronizePinnedStackBounds() {
cancelAnimations(); cancelAnimations();
try { mBounds.set(mPipTaskOrganizer.getLastReportedBounds());
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");
}
} }
/** /**