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

Commit 6f4e2719 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add displayId for WMS override pending transition APIs."

parents 18439804 a483f31c

config/boot-image-profile.txt

+2 −2
Original line number Diff line number Diff line
@@ -32940,8 +32940,8 @@ HSPLandroid/view/IWindowManager;->isViewServerRunning()Z 
HSPLandroid/view/IWindowManager;->isWindowTraceEnabled()Z

HSPLandroid/view/IWindowManager;->lockNow(Landroid/os/Bundle;)V

HSPLandroid/view/IWindowManager;->openSession(Landroid/view/IWindowSessionCallback;Lcom/android/internal/view/IInputMethodClient;Lcom/android/internal/view/IInputContext;)Landroid/view/IWindowSession;

HSPLandroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V

HSPLandroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V

HSPLandroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z;I)V

HSPLandroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;I)V

HSPLandroid/view/IWindowManager;->prepareAppTransition(IZ)V

HSPLandroid/view/IWindowManager;->reenableKeyguard(Landroid/os/IBinder;)V

HSPLandroid/view/IWindowManager;->refreshScreenCaptureDisabled(I)V

config/hiddenapi-vendor-list.txt

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ Landroid/view/IWindowManager;->createInputConsumer(Landroid/os/IBinder;Ljava/lan 
Landroid/view/IWindowManager;->destroyInputConsumer(Ljava/lang/String;I)Z

Landroid/view/IWindowManager;->endProlongedAnimations()V

Landroid/view/IWindowManager;->getStableInsets(ILandroid/graphics/Rect;)V

Landroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V

Landroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V

Landroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;ZI)V

Landroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;I)V

Landroid/view/IWindowManager;->setNavBarVirtualKeyHapticFeedbackEnabled(Z)V

Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V

Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V

core/java/android/view/IWindowManager.aidl

+3 −2
Original line number Diff line number Diff line
@@ -96,8 +96,9 @@ interface IWindowManager 
     */

    void overridePendingAppTransitionMultiThumbFuture(

            IAppTransitionAnimationSpecsFuture specsFuture, IRemoteCallback startedCallback,

            boolean scaleUp);

    void overridePendingAppTransitionRemote(in RemoteAnimationAdapter remoteAnimationAdapter);

            boolean scaleUp, int displayId);

    void overridePendingAppTransitionRemote(in RemoteAnimationAdapter remoteAnimationAdapter,

            int displayId);

    void executeAppTransition();



    /**

packages/SystemUI/legacy/recents/src/com/android/systemui/recents/views/RecentsView.java

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ public class RecentsView extends FrameLayout { 
                    }

                };

                WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture(

                        future, animStartedListener, getHandler(), true /* scaleUp */);

                        future, animStartedListener, getHandler(), true /* scaleUp */,

                        getContext().getDisplayId());

                MetricsLogger.action(mContext, MetricsEvent.ACTION_WINDOW_DOCK_DRAG_DROP,

                        event.task.getTopComponent().flattenToShortString());

            } else {

packages/SystemUI/shared/src/com/android/systemui/shared/system/WindowManagerWrapper.java

+5 −5
Original line number Diff line number Diff line
@@ -100,23 +100,23 @@ public class WindowManagerWrapper { 
     * Overrides a pending app transition.

     */

    public void overridePendingAppTransitionMultiThumbFuture(

            AppTransitionAnimationSpecsFuture animationSpecFuture,

            Runnable animStartedCallback, Handler animStartedCallbackHandler, boolean scaleUp) {

            AppTransitionAnimationSpecsFuture animationSpecFuture, Runnable animStartedCallback,

            Handler animStartedCallbackHandler, boolean scaleUp, int displayId) {

        try {

            WindowManagerGlobal.getWindowManagerService()

                    .overridePendingAppTransitionMultiThumbFuture(animationSpecFuture.getFuture(),

                            RecentsTransition.wrapStartedListener(animStartedCallbackHandler,

                                    animStartedCallback), scaleUp);

                                    animStartedCallback), scaleUp, displayId);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to override pending app transition (multi-thumbnail future): ", e);

        }

    }



    public void overridePendingAppTransitionRemote(

            RemoteAnimationAdapterCompat remoteAnimationAdapter) {

            RemoteAnimationAdapterCompat remoteAnimationAdapter, int displayId) {

        try {

            WindowManagerGlobal.getWindowManagerService().overridePendingAppTransitionRemote(

                    remoteAnimationAdapter.getWrapped());

                    remoteAnimationAdapter.getWrapped(), displayId);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to override pending app transition (remote): ", e);

        }