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

Commit 6c222076 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Turn off predictive back"" into tm-dev am: b6468930 

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

Change-Id: Ie25fafc1d418d23cb8b9937d3087dcdb7f34b0d5
parents 9236a41d b6468930

core/java/android/window/WindowOnBackInvokedDispatcher.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
    private static final String TAG = "WindowOnBackDispatcher";

    private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";

    private static final boolean IS_BACK_PREDICTABILITY_ENABLED = SystemProperties

            .getInt(BACK_PREDICTABILITY_PROP, 0) > 0;

            .getInt(BACK_PREDICTABILITY_PROP, 1) > 0;



    /** Convenience hashmap to quickly decide if a callback has been added. */

    private final HashMap<OnBackInvokedCallback, Integer> mAllCallbacks = new HashMap<>();

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 


    private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability";

    public static final boolean IS_ENABLED = SystemProperties

            .getInt(BACK_PREDICTABILITY_PROP, 0) > 0;

            .getInt(BACK_PREDICTABILITY_PROP, 1) > 0;

    private static final String BACK_PREDICTABILITY_PROGRESS_THRESHOLD_PROP =

            "persist.debug.back_predictability_progress_threshold";

    private static final int PROGRESS_THRESHOLD = SystemProperties

services/core/java/com/android/server/wm/BackNavigationController.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class BackNavigationController { 
     * Returns true if the back predictability feature is enabled

     */

    static boolean isEnabled() {

        return SystemProperties.getInt(BACK_PREDICTABILITY_PROP, 0) > 0;

        return SystemProperties.getInt(BACK_PREDICTABILITY_PROP, 1) > 0;

    }



    static boolean isScreenshotEnabled() {