From 78e542424eb0d602dc3f62dcc2b82bf550993a5c Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Wed, 3 Sep 2025 20:58:13 +0700 Subject: [PATCH] Fix merge todo Signed-off-by: Pun Butrach --- .../launcher3/uioverrides/QuickstepLauncher.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index c185f9b6a9..8b96a252a9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -731,10 +731,12 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, @Override protected boolean initDeviceProfile(InvariantDeviceProfile idp) { final boolean ret = super.initDeviceProfile(idp); - // Lawnchair-TODO-Merge: LC disabled this, see 16r2 ref below: -// mDeviceProfile.isPredictiveBackSwipe = -// getApplicationInfo().isOnBackInvokedCallbackEnabled(); - mDeviceProfile.isPredictiveBackSwipe = false; + try { + mDeviceProfile.isPredictiveBackSwipe = + getApplicationInfo().isOnBackInvokedCallbackEnabled(); + } catch (Throwable t) { + mDeviceProfile.isPredictiveBackSwipe = false; + } if (ret) { SystemUiProxy.INSTANCE.get(this).setLauncherAppIconSize(mDeviceProfile.iconSizePx); }