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

Commit 7c3bf28f authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Clean up predictive_back_three_button_nav flag" into main

parents ddf40b2e 5964426b

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

+0 −7
Original line number Diff line number Diff line
@@ -290,13 +290,6 @@ flag { 
    is_exported: true

}



flag {

    name: "predictive_back_three_button_nav"

    namespace: "systemui"

    description: "Enable Predictive Back Animation for 3-button-nav"

    bug: "373544911"

}



flag {

    name: "remove_depart_target_from_motion"

    namespace: "windowing_frontend"

packages/SystemUI/src/com/android/systemui/LauncherProxyService.java

+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_V 
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_TRANSITION;

import static com.android.systemui.shared.system.QuickStepContract.addInterface;

import static com.android.window.flags.Flags.predictiveBackSwipeEdgeNoneApi;

import static com.android.window.flags.Flags.predictiveBackThreeButtonNav;



import android.annotation.FloatRange;

import android.annotation.Nullable;
@@ -346,8 +345,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis 
        @Override

        public void onBackEvent(@Nullable KeyEvent keyEvent) throws RemoteException {

            final int displayId = keyEvent == null ? INVALID_DISPLAY : keyEvent.getDisplayId();

            if (predictiveBackThreeButtonNav() && predictiveBackSwipeEdgeNoneApi()

                    && mBackAnimation != null && keyEvent != null) {

            if (predictiveBackSwipeEdgeNoneApi() && mBackAnimation != null && keyEvent != null) {

                mBackAnimation.setTriggerBack(!keyEvent.isCanceled());

                mBackAnimation.onBackMotion(/* touchX */ 0, /* touchY */ 0, keyEvent.getAction(),

                        EDGE_NONE, displayId);