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

Commit 4abad003 authored by Todd Lee's avatar Todd Lee
Browse files

Handle case of no closing surfaces in origin launch 

This can happen if the launch is a trampoline/translucent task.
It's not the ideal origin transition scenario, but we can still
accommodate and just not include closing surface (because there
is none)

Bug: b/330346132
Test: manual tile launch
Flag: com.google.wear.sdk.enable_origin_transitions
Change-Id: If9d4639f77b4bd8b0102aa5af638db0cf4c6f710
parent deadc63e

packages/SystemUI/animation/lib/src/com/android/systemui/animation/OriginRemoteTransition.java

+45 −12
Original line number Diff line number Diff line
@@ -195,7 +195,10 @@ public class OriginRemoteTransition extends IRemoteTransition.Stub { 
        // Create the origin leash and add to the transition root leash.

        mOriginLeash =

                new SurfaceControl.Builder().setName("OriginTransition-origin-leash").build();

        mStartTransaction



        // Create temporary transaction to build

        final SurfaceControl.Transaction tmpTransaction = new SurfaceControl.Transaction();

        tmpTransaction

                .reparent(mOriginLeash, rootLeash)

                .show(mOriginLeash)

                .setCornerRadius(mOriginLeash, windowRadius)
@@ -208,14 +211,14 @@ public class OriginRemoteTransition extends IRemoteTransition.Stub { 
            int mode = change.getMode();

            SurfaceControl leash = change.getLeash();

            // Reparent leash to the transition root.

            mStartTransaction.reparent(leash, rootLeash);

            tmpTransaction.reparent(leash, rootLeash);

            if (TransitionUtil.isOpeningMode(mode)) {

                openingSurfaces.add(change.getLeash());

                // For opening surfaces, ending bounds are base bound. Apply corner radius if

                // it's full screen.

                Rect bounds = change.getEndAbsBounds();

                if (displayBounds.equals(bounds)) {

                    mStartTransaction

                    tmpTransaction

                            .setCornerRadius(leash, windowRadius)

                            .setWindowCrop(leash, bounds.width(), bounds.height());

                }
@@ -226,28 +229,53 @@ public class OriginRemoteTransition extends IRemoteTransition.Stub { 
                // it's full screen.

                Rect bounds = change.getStartAbsBounds();

                if (displayBounds.equals(bounds)) {

                    mStartTransaction

                    tmpTransaction

                            .setCornerRadius(leash, windowRadius)

                            .setWindowCrop(leash, bounds.width(), bounds.height());

                }

            }

        }



        if (openingSurfaces.isEmpty() && closingSurfaces.isEmpty()) {

            logD("prepareUIs: no opening/closing surfaces available, nothing to prepare.");

            return false;

        }



        // Set relative order:

        // ----  App1  ----

        // ---- origin ----

        // ----  App2  ----



        if (mIsEntry) {

            mStartTransaction

                    .setRelativeLayer(mOriginLeash, closingSurfaces.get(0), 1)

            if (!closingSurfaces.isEmpty()) {

                tmpTransaction

                        .setRelativeLayer(mOriginLeash, closingSurfaces.get(0), 1);

            } else {

                logW("Missing closing surface is entry transition");

            }

            if (!openingSurfaces.isEmpty()) {

                tmpTransaction

                        .setRelativeLayer(

                                openingSurfaces.get(openingSurfaces.size() - 1), mOriginLeash, 1);

            } else {

            mStartTransaction

                    .setRelativeLayer(mOriginLeash, openingSurfaces.get(0), 1)

                    .setRelativeLayer(

                logW("Missing opening surface is entry transition");

            }



        } else {

            if (!openingSurfaces.isEmpty()) {

                tmpTransaction

                        .setRelativeLayer(mOriginLeash, openingSurfaces.get(0), 1);

            } else {

                logW("Missing opening surface is exit transition");

            }

            if (!closingSurfaces.isEmpty()) {

                tmpTransaction.setRelativeLayer(

                        closingSurfaces.get(closingSurfaces.size() - 1), mOriginLeash, 1);

            } else {

                logW("Missing closing surface is exit transition");

            }

        }

        mStartTransaction.merge(tmpTransaction);



        // Attach origin UIComponent to origin leash.

        mOriginTransaction = mOrigin.newTransaction();
@@ -300,6 +328,7 @@ public class OriginRemoteTransition extends IRemoteTransition.Stub { 
    }



    private void cancel() {

        logD("cancel()");

        if (mAnimator != null) {

            mAnimator.cancel();

        }
@@ -311,6 +340,10 @@ public class OriginRemoteTransition extends IRemoteTransition.Stub { 
        }

    }



    private static void logW(String msg) {

        Log.w(TAG, msg);

    }



    private static void logE(String msg) {

        Log.e(TAG, msg);

    }