From 7dedaeb255272ccb17be1f1d60ce21275233602b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cosmin=20B=C4=83ie=C8=99?= Date: Wed, 5 Mar 2025 17:54:44 +0100 Subject: [PATCH] Remove canImeRenderGesturalNavButtons and sysprop This method, and the corresponding system property persist.sys.ime.can_render_gestural_nav_buttons were originally added in [1], just before starting the implementation of gesture navigation handling for IMEs. These were meant to serve as a feature flag, initially turned off, and later permanently enabled. This removes the sysprop and the code path handling it being disabled. [1]: I7a2e9f08072a97d61b78dddb144282a5728d1407 Flag: EXEMPT refactor Bug: 281029564 Bug: 411106486 Test: atest InputMethodServiceTest#testShowHideImeNavigationBar_doesDrawImeNavBar InputMethodServiceTest#testShowHideImeNavigationBar_doesNotDrawImeNavBar InputMethodServiceTest#testBackButtonClick InputMethodServiceTest#testBackButtonLongClick InputMethodServiceTest#testImeSwitchButtonClick InputMethodServiceTest#testImeSwitchButtonLongClick Change-Id: I94e2fb280a1dac130596d7f4e344d83cfc12b70e --- .../launcher3/taskbar/NavbarButtonsViewController.java | 4 +--- .../com/android/quickstep/RecentsAnimationDeviceState.java | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index cbe2634452..9eb7b556e6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -72,7 +72,6 @@ import android.graphics.Region.Op; import android.graphics.drawable.Drawable; import android.graphics.drawable.PaintDrawable; import android.graphics.drawable.RotateDrawable; -import android.inputmethodservice.InputMethodService; import android.os.Bundle; import android.os.Handler; import android.os.SystemProperties; @@ -310,8 +309,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT } mNavButtonsView.setLayoutParams(navButtonsViewLayoutParams); - mIsImeRenderingNavButtons = - InputMethodService.canImeRenderGesturalNavButtons() && mContext.imeDrawsImeNavBar(); + mIsImeRenderingNavButtons = mContext.imeDrawsImeNavBar(); if (!mIsImeRenderingNavButtons) { // IME switcher final int switcherResId = Flags.imeSwitcherRevamp() diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index b732986f56..010fe812b3 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -52,7 +52,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_T import android.app.ActivityTaskManager; import android.content.Context; import android.graphics.Region; -import android.inputmethodservice.InputMethodService; import android.net.Uri; import android.os.RemoteException; import android.os.SystemProperties; @@ -115,9 +114,6 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E private final RotationTouchHelper mRotationTouchHelper; private final TaskStackChangeListener mPipListener; - // Cache for better performance since it doesn't change at runtime. - private final boolean mCanImeRenderGesturalNavButtons = - InputMethodService.canImeRenderGesturalNavButtons(); private @SystemUiStateFlags long mSystemUiStateFlags = QuickStepContract.SYSUI_STATE_AWAKE; private NavigationMode mMode = THREE_BUTTONS; @@ -605,8 +601,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener, E /** Returns whether IME is rendering nav buttons, and IME is currently showing. */ public boolean isImeRenderingNavButtons() { - return mCanImeRenderGesturalNavButtons && mMode == NO_BUTTON - && ((getSysuiStateFlags() & SYSUI_STATE_IME_VISIBLE) != 0); + return mMode == NO_BUTTON && ((getSysuiStateFlags() & SYSUI_STATE_IME_VISIBLE) != 0); } /**