From f32c27f7736df48f3618fa05639c88fee7c795a2 Mon Sep 17 00:00:00 2001 From: Ikram Gabiyev Date: Thu, 15 Feb 2024 11:13:01 -0800 Subject: [PATCH] Move IPip and IPipAnimationListener to common Move IPip.aidl and IPipAnimationListener.aidl to common.pip package as a part of PiP2 refactoring. Make sure users of these Binder interfaces in Launcher also reference the updated classname and package. The plan is to use these interfaces to implement PiP2 <-> Launcher IPC to facilitate transitions and animations for gesture nav and auto-enter PiP for instance. Note: this CL shouldn't yield any behavioral changes. Flag: NA Bug: 325481148 Test: mp droid Change-Id: I065334f6777cd1489c739d95abf0fab8285860ed --- quickstep/src/com/android/quickstep/SystemUiProxy.java | 4 ++-- .../src/com/android/quickstep/TouchInteractionService.java | 2 +- quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 52f9d8d8ec..72f67fc544 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -82,13 +82,13 @@ import com.android.systemui.unfold.progress.IUnfoldTransitionListener; import com.android.wm.shell.back.IBackAnimation; import com.android.wm.shell.bubbles.IBubbles; import com.android.wm.shell.bubbles.IBubblesListener; +import com.android.wm.shell.common.pip.IPip; +import com.android.wm.shell.common.pip.IPipAnimationListener; import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; import com.android.wm.shell.desktopmode.IDesktopMode; import com.android.wm.shell.desktopmode.IDesktopTaskListener; import com.android.wm.shell.draganddrop.IDragAndDrop; import com.android.wm.shell.onehanded.IOneHanded; -import com.android.wm.shell.pip.IPip; -import com.android.wm.shell.pip.IPipAnimationListener; import com.android.wm.shell.recents.IRecentTasks; import com.android.wm.shell.recents.IRecentTasksListener; import com.android.wm.shell.splitscreen.ISplitScreen; diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java index b6b7d58e30..2aad327ff2 100644 --- a/quickstep/src/com/android/quickstep/TouchInteractionService.java +++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java @@ -134,10 +134,10 @@ import com.android.systemui.shared.system.smartspace.ISysuiUnlockAnimationContro import com.android.systemui.unfold.progress.IUnfoldAnimation; import com.android.wm.shell.back.IBackAnimation; import com.android.wm.shell.bubbles.IBubbles; +import com.android.wm.shell.common.pip.IPip; import com.android.wm.shell.desktopmode.IDesktopMode; import com.android.wm.shell.draganddrop.IDragAndDrop; import com.android.wm.shell.onehanded.IOneHanded; -import com.android.wm.shell.pip.IPip; import com.android.wm.shell.recents.IRecentTasks; import com.android.wm.shell.splitscreen.ISplitScreen; import com.android.wm.shell.startingsurface.IStartingWindow; diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index f6afaf0043..79dfa19e36 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -214,7 +214,7 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; -import com.android.wm.shell.pip.IPipAnimationListener; +import com.android.wm.shell.common.pip.IPipAnimationListener; import java.util.ArrayList; import java.util.Arrays;