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

Commit 98a01f43 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Remove DepartingAnimationTarget from BackMotionEvent"" into main

parents 225565e9 e0a9fcc6

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -387,6 +387,17 @@ flag { 
    bug: "373544911"

}



flag {

    name: "remove_depart_target_from_motion"

    namespace: "windowing_frontend"

    description: "Remove DepartingAnimationTarget from BackMotionEvent"

    bug: "395035430"

    is_fixed_read_only: true

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "predictive_back_default_enable_sdk_36"

    namespace: "systemui"

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+2 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
                () -> mShellExecutor.execute(this::onBackAnimationFinished));



        if (mApps.length >= 1) {

            BackMotionEvent startEvent = mCurrentTracker.createStartEvent(mApps[0]);

            BackMotionEvent startEvent = mCurrentTracker.createStartEvent(

                    Flags.removeDepartTargetFromMotion() ? null : mApps[0]);

            dispatchOnBackStarted(mActiveCallback, startEvent);

            if (startEvent.getSwipeEdge() == EDGE_NONE) {

                // TODO(b/373544911): onBackStarted is dispatched here so that