From ef07d0849df4cefdfdf0ca7313da954e11a0fc0f Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Sat, 4 Nov 2023 21:34:47 +0800 Subject: [PATCH] Revert back onehanded config --- .../quickstep/RecentsAnimationDeviceState.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 8b13000ee1..cc74047b75 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -146,7 +146,6 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { mRotationTouchHelper.init(); runOnDestroy(mRotationTouchHelper::destroy); } -// runOnUserUnlocked(mRotationTouchHelper::onUserUnlocked); // Register for user unlocked if necessary mIsUserUnlocked = context.getSystemService(UserManager.class) @@ -169,7 +168,7 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { mExclusionRegion = region; } }; -// runOnDestroy(mExclusionListener::unregister); + runOnDestroy(mExclusionListener::unregister); // Register for display changes changes mDisplayController.addChangeListener(this); @@ -178,12 +177,12 @@ public class RecentsAnimationDeviceState implements DisplayInfoChangeListener { SettingsCache settingsCache = SettingsCache.INSTANCE.get(mContext); if (mIsOneHandedModeSupported) { -// Uri oneHandedUri = Settings.Secure.getUriFor(ONE_HANDED_ENABLED); -// SettingsCache.OnChangeListener onChangeListener = -// enabled -> mIsOneHandedModeEnabled = enabled; -// settingsCache.register(oneHandedUri, onChangeListener); -// mIsOneHandedModeEnabled = settingsCache.getValue(oneHandedUri); -// runOnDestroy(() -> settingsCache.unregister(oneHandedUri, onChangeListener)); + Uri oneHandedUri = Settings.Secure.getUriFor(ONE_HANDED_ENABLED); + SettingsCache.OnChangeListener onChangeListener = + enabled -> mIsOneHandedModeEnabled = enabled; + settingsCache.register(oneHandedUri, onChangeListener); + mIsOneHandedModeEnabled = LawnchairApp.isRecentsEnabled () && settingsCache.getValue(oneHandedUri); + runOnDestroy(() -> settingsCache.unregister(oneHandedUri, onChangeListener)); } else { mIsOneHandedModeEnabled = false; }