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

Commit 3376f686 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Always show CHANGE containers in transition setup" into udc-dev

parents 6e0bf332 0b645386

core/java/android/window/TransitionInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -493,6 +493,9 @@ public final class TransitionInfo implements Parcelable { 
        if ((flags & FLAG_FIRST_CUSTOM) != 0) {

            sb.append(sb.length() == 0 ? "" : "|").append("FIRST_CUSTOM");

        }

        if ((flags & FLAG_MOVED_TO_TOP) != 0) {

            sb.append(sb.length() == 0 ? "" : "|").append("MOVE_TO_TOP");

        }

        return sb.toString();

    }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+4 −0
Original line number Diff line number Diff line
@@ -492,6 +492,10 @@ public class Transitions implements RemoteCallable<Transitions>, 
                finishT.show(leash);

            } else if (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK) {

                finishT.hide(leash);

            } else if (isOpening && mode == TRANSIT_CHANGE) {

                // Just in case there is a race with another animation (eg. recents finish()).

                // Changes are visible->visible so it's a problem if it isn't visible.

                t.show(leash);

            }

        }

    }