From 7fc98ba91b3be333a53a5b6e324a9729fd07317a Mon Sep 17 00:00:00 2001 From: Shan Huang Date: Thu, 17 Feb 2022 01:01:38 +0000 Subject: [PATCH] Remove the back_predictability sysprop flag. Test: m -j and testing back behavior throughout the system. Bug: 19594658 Change-Id: I61ada9866ff760d913ea0d2e245857320372a0a4 --- .../android/wm/shell/back/BackAnimationController.java | 3 --- .../com/android/wm/shell/dagger/WMShellBaseModule.java | 7 ++----- .../navigationbar/gestural/EdgeBackGestureHandler.java | 9 --------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index e50ad385faf93..9b414681c0fa8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -52,9 +52,6 @@ import com.android.wm.shell.common.annotations.ShellMainThread; */ public class BackAnimationController implements RemoteCallable { - private static final String BACK_PREDICTABILITY_PROP = "persist.debug.back_predictability"; - public static final boolean IS_ENABLED = SystemProperties - .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 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java index 2e54c792ed57f..299a132964e9d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellBaseModule.java @@ -699,10 +699,7 @@ public abstract class WMShellBaseModule { Context context, @ShellMainThread ShellExecutor shellExecutor ) { - if (BackAnimationController.IS_ENABLED) { - return Optional.of( - new BackAnimationController(shellExecutor, context)); - } - return Optional.empty(); + return Optional.of( + new BackAnimationController(shellExecutor, context)); } } diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java index 9199911896760..9ea27634df6ae 100644 --- a/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java +++ b/packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java @@ -263,15 +263,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker // Notify FalsingManager that an intentional gesture has occurred. // TODO(b/186519446): use a different method than isFalseTouch mFalsingManager.isFalseTouch(BACK_GESTURE); - // Only inject back keycodes when ahead-of-time back dispatching is disabled. - if (mBackAnimation == null) { - boolean sendDown = sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK); - boolean sendUp = sendEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK); - if (DEBUG_MISSING_GESTURE) { - Log.d(DEBUG_MISSING_GESTURE_TAG, "Triggered back: down=" - + sendDown + ", up=" + sendUp); - } - } mOverviewProxyService.notifyBackAction(true, (int) mDownPoint.x, (int) mDownPoint.y, false /* isButton */, !mIsOnLeftEdge);