PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove canImeRenderGesturalNavButtons and sysprop" into main

Browse Source
This commit is contained in:
Cosmin Băieș
2025-05-20 03:41:58 -07:00
committed by Android (Google) Code Review
parent 9977ef7c2a 7dedaeb255
commit cba51f4023
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+1 -3
View File
@@ -73,7 +73,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;
@@ -311,8 +310,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()
quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+1 -6
View File
@@ -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;
@@ -125,9 +124,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;
@@ -618,8 +614,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);
}
/**