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

Commit 88212d5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib5330c3c098242a634020c3bc931bcdf7a6c9b81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b980cc92 d4714815

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

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

                    break;

                case WindowManager.TRANSIT_TO_BACK:

                case WindowManager.TRANSIT_TO_BACK:

                case WindowManager.TRANSIT_TO_FRONT:

                case WindowManager.TRANSIT_TO_FRONT:

                    transitionHandled = true;

                    break;

                    break;

            }

            }

        }

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

            return false;

        }

        }

        mFreeformTaskListener.createWindowDecoration(change, startT, finishT);

        mFreeformTaskListener.createWindowDecoration(change, startT, finishT);

        return true;



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

        return false;

    }

    }





    private boolean startCloseTransition(

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

            windowDecors.add(windowDecor);

        }

        }





        return true;

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

        return false;

    }

    }





    private boolean startChangeTransition(

    private boolean startChangeTransition(