From 2a78a2d9d0f7f5f3316ee9f3863a5a746fdb321c Mon Sep 17 00:00:00 2001 From: Suphon Thanakornpakapong Date: Thu, 26 May 2022 20:31:10 +0700 Subject: [PATCH] Rename gesture handler pref keys --- lawnchair/src/app/lawnchair/LawnchairLauncher.kt | 4 ++-- .../app/lawnchair/gestures/GestureController.kt | 14 +++++++------- .../lawnchair/preferences2/PreferenceManager2.kt | 12 ++++++------ .../lawnchair/ui/preferences/GesturePreferences.kt | 6 +++--- .../ui/preferences/HomeScreenPreferences.kt | 2 +- src/com/android/launcher3/LauncherState.java | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 5d95438082..95f08ddecc 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -220,7 +220,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner, preferenceManager2.darkStatusBar.onEach(launchIn = lifecycleScope) { darkStatusBar -> systemUiController.updateUiState(UI_STATE_BASE_WINDOW, isWorkspaceDarkText || darkStatusBar) } - preferenceManager2.backTapGestureHandler.onEach(launchIn = lifecycleScope) { handler -> + preferenceManager2.backPressGestureHandler.onEach(launchIn = lifecycleScope) { handler -> hasBackGesture = handler !is GestureHandlerConfig.NoOp } @@ -274,7 +274,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner, } override fun handleHomeTap() { - gestureController.onHomeTap() + gestureController.onHomePressed() } override fun shouldBackButtonBeHidden(toState: LauncherState): Boolean { diff --git a/lawnchair/src/app/lawnchair/gestures/GestureController.kt b/lawnchair/src/app/lawnchair/gestures/GestureController.kt index f4076e443d..8968483fa2 100644 --- a/lawnchair/src/app/lawnchair/gestures/GestureController.kt +++ b/lawnchair/src/app/lawnchair/gestures/GestureController.kt @@ -30,11 +30,11 @@ class GestureController(private val launcher: LawnchairLauncher) { private val prefs = PreferenceManager2.getInstance(launcher) private val scope = MainScope() - private val doubleTapHandler = handler(prefs.doubleTapHandler) + private val doubleTapHandler = handler(prefs.doubleTapGestureHandler) private val swipeUpHandler = handler(prefs.swipeUpGestureHandler) private val swipeDownHandler = handler(prefs.swipeDownGestureHandler) - private val homeTapHandler = handler(prefs.homeTapGestureHandler) - private val backTapHandler = handler(prefs.backTapGestureHandler) + private val homePressHandler = handler(prefs.homePressGestureHandler) + private val backPressHandler = handler(prefs.backPressGestureHandler) fun onDoubleTap() { triggerHandler(doubleTapHandler) @@ -48,12 +48,12 @@ class GestureController(private val launcher: LawnchairLauncher) { triggerHandler(swipeDownHandler) } - fun onHomeTap() { - triggerHandler(homeTapHandler) + fun onHomePressed() { + triggerHandler(homePressHandler) } - fun onBackTap() { - triggerHandler(backTapHandler, false) + fun onBackPressed() { + triggerHandler(backPressHandler, false) } private fun triggerHandler(handlerFlow: Flow, withHaptic: Boolean = true) { diff --git a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt index e5d3af4423..1287c0654d 100644 --- a/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt +++ b/lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt @@ -303,8 +303,8 @@ class PreferenceManager2(private val context: Context) : PreferenceManager { save = { it.toString() }, ) - val doubleTapHandler = serializablePreference( - key = stringPreferencesKey("double_tap_handler"), + val doubleTapGestureHandler = serializablePreference( + key = stringPreferencesKey("double_tap_gesture_handler"), defaultValue = GestureHandlerConfig.Sleep ) @@ -318,13 +318,13 @@ class PreferenceManager2(private val context: Context) : PreferenceManager { defaultValue = GestureHandlerConfig.OpenNotifications ) - val homeTapGestureHandler = serializablePreference( - key = stringPreferencesKey("home_tap_gesture_handler"), + val homePressGestureHandler = serializablePreference( + key = stringPreferencesKey("home_press_gesture_handler"), defaultValue = GestureHandlerConfig.NoOp ) - val backTapGestureHandler = serializablePreference( - key = stringPreferencesKey("back_tap_gesture_handler"), + val backPressGestureHandler = serializablePreference( + key = stringPreferencesKey("back_press_gesture_handler"), defaultValue = GestureHandlerConfig.NoOp ) diff --git a/lawnchair/src/app/lawnchair/ui/preferences/GesturePreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/GesturePreferences.kt index 88b447565b..4227c24865 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/GesturePreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/GesturePreferences.kt @@ -20,7 +20,7 @@ fun GesturePreferences() { PreferenceLayout(label = stringResource(id = R.string.gestures_label)) { PreferenceGroup { GestureHandlerPreference( - adapter = prefs.doubleTapHandler.getAdapter(), + adapter = prefs.doubleTapGestureHandler.getAdapter(), label = stringResource(id = R.string.gesture_double_tap) ) GestureHandlerPreference( @@ -32,11 +32,11 @@ fun GesturePreferences() { label = stringResource(id = R.string.gesture_swipe_down) ) GestureHandlerPreference( - adapter = prefs.homeTapGestureHandler.getAdapter(), + adapter = prefs.homePressGestureHandler.getAdapter(), label = stringResource(id = R.string.gesture_home_tap) ) GestureHandlerPreference( - adapter = prefs.backTapGestureHandler.getAdapter(), + adapter = prefs.backPressGestureHandler.getAdapter(), label = stringResource(id = R.string.gesture_back_tap) ) } diff --git a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt index 6ff1aa4f7b..75f4541cba 100644 --- a/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt +++ b/lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt @@ -60,7 +60,7 @@ fun HomeScreenPreferences() { label = stringResource(id = R.string.wallpaper_scrolling_label), ) GestureHandlerPreference( - adapter = prefs2.doubleTapHandler.getAdapter(), + adapter = prefs2.doubleTapGestureHandler.getAdapter(), label = stringResource(id = R.string.gesture_double_tap) ) val feedAvailable = OverlayCallbackImpl.minusOneAvailable(LocalContext.current) diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index b26affb4ab..7399451c3c 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -111,7 +111,7 @@ public abstract class LauncherState implements BaseState { @Override public void onBackPressed(Launcher launcher) { if (launcher instanceof LawnchairLauncher) { - ((LawnchairLauncher) launcher).getGestureController().onBackTap(); + ((LawnchairLauncher) launcher).getGestureController().onBackPressed(); } super.onBackPressed(launcher); }