From 9e7286b3bbbc9bb25cb3cb5f1b1c8215bd5f33ec Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 20 Jan 2023 11:35:39 +0100 Subject: [PATCH] Set default double tap action to lock screen only on Android 9+ --- .../main/java/de/mm20/launcher2/preferences/Defaults.kt | 8 +++++++- .../launcher2/preferences/migrations/Migration_11_12.kt | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt index 517b180e..31c54df8 100644 --- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt +++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt @@ -1,6 +1,7 @@ package de.mm20.launcher2.preferences import android.content.Context +import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.preferences.Settings.SearchBarSettings.SearchBarColors import scheme.Scheme @@ -170,7 +171,12 @@ fun createFactorySettings(context: Context): Settings { ) .setGestures( Settings.GestureSettings.newBuilder() - .setDoubleTap(Settings.GestureSettings.GestureAction.LockScreen) + .setDoubleTap( + if (isAtLeastApiLevel(28)) { + Settings.GestureSettings.GestureAction.LockScreen + } else { + Settings.GestureSettings.GestureAction.None + }) .setLongPress(Settings.GestureSettings.GestureAction.None) .setSwipeDown(Settings.GestureSettings.GestureAction.OpenNotificationDrawer) .setSwipeLeft(Settings.GestureSettings.GestureAction.None) diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_11_12.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_11_12.kt index 92f9f35d..5f369d91 100644 --- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_11_12.kt +++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_11_12.kt @@ -1,5 +1,6 @@ package de.mm20.launcher2.preferences.migrations +import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.preferences.Settings import de.mm20.launcher2.preferences.Settings.GestureSettings import de.mm20.launcher2.preferences.Settings.LayoutSettings @@ -33,7 +34,13 @@ class Migration_11_12: VersionedMigration(11, 12) { ) .setGestures( GestureSettings.newBuilder() - .setDoubleTap(GestureSettings.GestureAction.LockScreen) + .setDoubleTap( + if (isAtLeastApiLevel(28)) { + GestureSettings.GestureAction.LockScreen + } else { + GestureSettings.GestureAction.None + } + ) .setLongPress(GestureSettings.GestureAction.None) .setSwipeDown(GestureSettings.GestureAction.OpenNotificationDrawer) .setSwipeLeft(GestureSettings.GestureAction.None)