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

Commit 714c2de0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "FreeformHandler should just intercept, not claim animations" into... 

Merge "FreeformHandler should just intercept, not claim animations" into tm-qpr-dev am: d4714815 am: 88212d5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19536295



Change-Id: I25b0497a86e04676a5794652517e7d9d2addf811
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf011546 88212d5b

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionHandler.java

+5 −3
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ public class FreeformTaskTransitionHandler 
                    break;

                case WindowManager.TRANSIT_TO_BACK:

                case WindowManager.TRANSIT_TO_FRONT:

                    transitionHandled = true;

                    break;

            }

        }
@@ -147,7 +146,9 @@ public class FreeformTaskTransitionHandler 
            return false;

        }

        mFreeformTaskListener.createWindowDecoration(change, startT, finishT);

        return true;



        // Intercepted transition to manage the window decorations. Let other handlers animate.

        return false;

    }



    private boolean startCloseTransition(
@@ -164,7 +165,8 @@ public class FreeformTaskTransitionHandler 
            windowDecors.add(windowDecor);

        }



        return true;

        // Intercepted transition to manage the window decorations. Let other handlers animate.

        return false;

    }



    private boolean startChangeTransition(