Merge f048566bf6 into 55af392706

app/src/main/java/de/jrpie/android/launcher/Application.kt

@@ -10,6 +10,8 @@ import android.content.pm.ShortcutInfo
 import android.os.AsyncTask
 import android.os.Build
 import android.os.Build.VERSION_CODES
+import android.os.Handler
+import android.os.Looper
 import android.os.UserHandle
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.MutableLiveData
@@ -108,12 +110,10 @@ class Application : android.app.Application() {
         // Try to restore old preferences
         migratePreferencesToNewVersion(this)
 
-        // First time opening the app: set defaults and start tutorial
+        // First time opening the app: set defaults
+        // The tutorial is started from HomeActivity#onStart, as starting it here is blocked by android
         if (!LauncherPreferences.internal().started()) {
             resetPreferences(this)
-
-            LauncherPreferences.internal().started(true)
-            openTutorial(this)
         }
 
 
@@ -134,7 +134,8 @@ class Application : android.app.Application() {
                     it.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)
                 }
             }
-            ContextCompat.registerReceiver(this, profileAvailabilityBroadcastReceiver, filter,
+            ContextCompat.registerReceiver(
+                this, profileAvailabilityBroadcastReceiver, filter,
                 ContextCompat.RECEIVER_EXPORTED
             )
         }

app/src/main/java/de/jrpie/android/launcher/Functions.kt

@@ -100,7 +100,7 @@ fun removeUnusedShortcuts(context: Context) {
                 },
                 profile
             )
-        } catch (e: IllegalStateException) {
+        } catch (e: Exception) {
             // https://github.com/jrpie/launcher/issues/116
             return null
         }
@@ -135,9 +135,7 @@ fun openInBrowser(url: String, context: Context) {
 }
 
 fun openTutorial(context: Context) {
-    context.startActivity(Intent(context, TutorialActivity::class.java).apply {
-        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    })
+    context.startActivity(Intent(context, TutorialActivity::class.java))
 }
 
 

app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt

@@ -13,6 +13,7 @@ import androidx.appcompat.content.res.AppCompatResources
 import de.jrpie.android.launcher.Application
 import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.apps.AppFilter
+import de.jrpie.android.launcher.apps.hidePrivateSpaceWhenLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceSupported
 import de.jrpie.android.launcher.apps.togglePrivateSpaceLock
 import de.jrpie.android.launcher.preferences.LauncherPreferences
@@ -66,7 +67,11 @@ enum class LauncherAction(
         R.string.list_other_list_private_space,
         R.drawable.baseline_security_24,
         { context ->
-            openAppsList(context, private = true)
+            if ((context.applicationContext as Application).privateSpaceLocked.value != true
+                || !hidePrivateSpaceWhenLocked(context)
+            ) {
+                openAppsList(context, private = true)
+            }
         },
         available = { _ ->
             isPrivateSpaceSupported()
@@ -83,31 +88,37 @@ enum class LauncherAction(
         "volume_up",
         R.string.list_other_volume_up,
         R.drawable.baseline_volume_up_24,
-        { context -> audioVolumeAdjust(context, true)}
+        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_RAISE) }
     ),
     VOLUME_DOWN(
         "volume_down",
         R.string.list_other_volume_down,
         R.drawable.baseline_volume_down_24,
-        { context -> audioVolumeAdjust(context, false)}
+        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_LOWER) }
+    ),
+    VOLUME_ADJUST(
+        "volume_adjust",
+        R.string.list_other_volume_adjust,
+        R.drawable.baseline_volume_adjust_24,
+        { context -> audioVolumeAdjust(context, AudioManager.ADJUST_SAME) }
     ),
     TRACK_PLAY_PAUSE(
         "play_pause_track",
         R.string.list_other_track_play_pause,
         R.drawable.baseline_play_arrow_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)}
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE) }
     ),
     TRACK_NEXT(
         "next_track",
         R.string.list_other_track_next,
         R.drawable.baseline_skip_next_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_NEXT)}
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_NEXT) }
     ),
     TRACK_PREV(
         "previous_track",
         R.string.list_other_track_previous,
         R.drawable.baseline_skip_previous_24,
-        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PREVIOUS)}
+        { context -> audioManagerPressKey(context, KeyEvent.KEYCODE_MEDIA_PREVIOUS) }
     ),
     EXPAND_NOTIFICATIONS_PANEL(
         "expand_notifications_panel",
@@ -176,17 +187,13 @@ private fun audioManagerPressKey(context: Context, key: Int) {
 
 }
 
-private fun audioVolumeAdjust(context: Context, louder: Boolean) {
+private fun audioVolumeAdjust(context: Context, direction: Int) {
     val audioManager =
         context.getSystemService(Context.AUDIO_SERVICE) as AudioManager
 
     audioManager.adjustStreamVolume(
         AudioManager.STREAM_MUSIC,
-        if (louder) {
-            AudioManager.ADJUST_RAISE
-        } else {
-            AudioManager.ADJUST_LOWER
-        },
+        direction,
         AudioManager.FLAG_SHOW_UI
     )
 }

app/src/main/java/de/jrpie/android/launcher/apps/PinnedShortcutInfo.kt

@@ -28,15 +28,20 @@ class PinnedShortcutInfo(
     fun getShortcutInfo(context: Context): ShortcutInfo? {
         val launcherApps = context.getSystemService(Service.LAUNCHER_APPS_SERVICE) as LauncherApps
 
-        return launcherApps.getShortcuts(
-            ShortcutQuery().apply {
-                setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
-                setPackage(packageName)
-                setActivity(ComponentName(packageName, activityName))
-                setShortcutIds(listOf(id))
-            },
-            getUserFromId(user, context)
-        )?.firstOrNull()
+        return try {
+            launcherApps.getShortcuts(
+                ShortcutQuery().apply {
+                    setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED)
+                    setPackage(packageName)
+                    setActivity(ComponentName(packageName, activityName))
+                    setShortcutIds(listOf(id))
+                },
+                getUserFromId(user, context)
+            )?.firstOrNull()
+        } catch(_: Exception) {
+            // can throw SecurityException or IllegalStateException when profile is locked
+            null
+        }
     }
 
     override fun equals(other: Any?): Boolean {

app/src/main/java/de/jrpie/android/launcher/apps/PrivateSpace.kt

@@ -95,6 +95,12 @@ fun lockPrivateSpace(context: Context, lock: Boolean) {
     if (!isPrivateSpaceSupported()) {
         return
     }
+
+    // silently return when trying to unlock but hide when locked is set
+    if (!lock && hidePrivateSpaceWhenLocked(context)) {
+        return
+    }
+
     val userManager = context.getSystemService(Context.USER_SERVICE) as UserManager
     val privateSpaceUser = getPrivateSpaceUser(context) ?: return
     userManager.requestQuietModeEnabled(lock, privateSpaceUser)
@@ -116,3 +122,11 @@ fun togglePrivateSpaceLock(context: Context) {
     }
 }
 
+fun hidePrivateSpaceWhenLocked(context: Context): Boolean {
+    // TODO: perhaps this should be cached
+
+    // https://cs.android.com/android/platform/superproject/main/+/main:packages/apps/Launcher3/src/com/android/launcher3/util/SettingsCache.java;l=61;drc=56bf7ad33bc9d5ed3c18e7abefeec5c177ec75d7
+    val key = "hide_privatespace_entry_point"
+    return Settings.Secure.getInt(context.contentResolver, key, 0) == 1
+}
+

app/src/main/java/de/jrpie/android/launcher/preferences/LauncherPreferences$Config.java

@@ -21,8 +21,10 @@ import eu.jonahbauer.android.preference.annotations.Preferences;
         r = R.class,
         value = {
                 @PreferenceGroup(name = "internal", prefix = "settings_internal_", suffix = "_key", value = {
+                        // set after the user finished the tutorial
                         @Preference(name = "started", type = boolean.class, defaultValue = "false"),
                         @Preference(name = "started_time", type = long.class),
+                        // see PREFERENCE_VERSION in de.jrpie.android.launcher.preferences.Preferences.kt
                         @Preference(name = "version_code", type = int.class, defaultValue = "-1"),
                 }),
                 @PreferenceGroup(name = "apps", prefix = "settings_apps_", suffix = "_key", value = {

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/Version1.kt

@@ -100,7 +100,7 @@ private fun migrateAppInfoStringMap(key: String) {
             }
         }?.toMap(HashMap())
     )?.let {
-        preferences.edit().putStringSet(key, it as Set<String>).apply()
+        preferences.edit().putStringSet(key, it).apply()
     }
 }
 

app/src/main/java/de/jrpie/android/launcher/preferences/legacy/Version3.kt

@@ -11,6 +11,7 @@ import de.jrpie.android.launcher.preferences.serialization.SetAbstractAppInfoPre
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.util.HashSet
+import androidx.core.content.edit
 
 /**
  * Migrate preferences from version 3 (used until version 0.0.23) to the current format
@@ -42,6 +43,7 @@ private fun migrateSetAppInfo(key: String, preferences: SharedPreferences, edito
         deserializeSet(preferences.getStringSet(key, null))?.let {
             set.addAll(it)
         }
+        @Suppress("UNCHECKED_CAST")
         editor.putStringSet(
             key,
             serializer.serialize(set as java.util.Set<AbstractAppInfo>) as Set<String>?
@@ -60,6 +62,7 @@ private fun migrateMapAppInfoString(key: String, preferences: SharedPreferences,
         deserializeMap(preferences.getStringSet(key, null))?.let {
             map.putAll(it)
         }
+        @Suppress("UNCHECKED_CAST")
         editor.putStringSet(key, serializer.serialize(map) as Set<String>?)
     } catch (e: Exception) {
         e.printStackTrace()
@@ -72,14 +75,11 @@ fun migratePreferencesFromVersion3() {
     assert(LauncherPreferences.internal().versionCode() == 3)
 
     val preferences = LauncherPreferences.getSharedPreferences()
-    val editor = preferences.edit()
-    migrateSetAppInfo(LauncherPreferences.apps().keys().favorites(), preferences, editor)
-    migrateSetAppInfo(LauncherPreferences.apps().keys().hidden(), preferences, editor)
-    migrateMapAppInfoString(LauncherPreferences.apps().keys().customNames(), preferences, editor)
-
-    editor.apply()
-
-
+    preferences.edit {
+        migrateSetAppInfo(LauncherPreferences.apps().keys().favorites(), preferences, this)
+        migrateSetAppInfo(LauncherPreferences.apps().keys().hidden(), preferences, this)
+        migrateMapAppInfoString(LauncherPreferences.apps().keys().customNames(), preferences, this)
+    }
 
     LauncherPreferences.internal().versionCode(4)
 }

app/src/main/java/de/jrpie/android/launcher/ui/HomeActivity.kt

@@ -9,9 +9,6 @@ import android.util.DisplayMetrics
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
-import android.view.Window
-import android.view.WindowInsets
-import android.view.WindowInsetsController
 import android.window.OnBackInvokedDispatcher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible
@@ -20,6 +17,7 @@ import de.jrpie.android.launcher.actions.Action
 import de.jrpie.android.launcher.actions.Gesture
 import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.databinding.HomeBinding
+import de.jrpie.android.launcher.openTutorial
 import de.jrpie.android.launcher.preferences.LauncherPreferences
 import de.jrpie.android.launcher.ui.tutorial.TutorialActivity
 import java.util.Locale
@@ -58,7 +56,6 @@ class HomeActivity : UIObject, AppCompatActivity() {
         super<AppCompatActivity>.onCreate(savedInstanceState)
         super<UIObject>.onCreate()
 
-
         val displayMetrics = DisplayMetrics()
         windowManager.defaultDisplay.getMetrics(displayMetrics)
 
@@ -88,8 +85,6 @@ class HomeActivity : UIObject, AppCompatActivity() {
         binding.buttonFallbackSettings.setOnClickListener {
             LauncherAction.SETTINGS.invoke(this)
         }
-
-
     }
 
     override fun onStart() {
@@ -97,6 +92,11 @@ class HomeActivity : UIObject, AppCompatActivity() {
 
         super<UIObject>.onStart()
 
+        // If the tutorial was not finished, start it
+        if (!LauncherPreferences.internal().started()) {
+            openTutorial(this)
+        }
+
         LauncherPreferences.getSharedPreferences()
             .registerOnSharedPreferenceChangeListener(sharedPreferencesListener)
 
@@ -220,7 +220,8 @@ class HomeActivity : UIObject, AppCompatActivity() {
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        return touchGestureDetector.onTouchEvent(event) || super.onTouchEvent(event)
+        touchGestureDetector.onTouchEvent(event)
+        return true
     }
 
     override fun setOnClicks() {

app/src/main/java/de/jrpie/android/launcher/ui/TouchGestureDetector.kt

@@ -1,6 +1,8 @@
 package de.jrpie.android.launcher.ui
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import android.view.MotionEvent
 import android.view.ViewConfiguration
 import de.jrpie.android.launcher.actions.Gesture
@@ -27,6 +29,8 @@ class TouchGestureDetector(
 
     private val MIN_TRIANGLE_HEIGHT = 250
 
+    private val longPressHandler = Handler(Looper.getMainLooper())
+
 
     data class Vector(val x: Float, val y: Float) {
         fun absSquared(): Float {
@@ -83,16 +87,28 @@ class TouchGestureDetector(
     }
 
     private var paths = HashMap<Int, PointerPath>()
+    private var gestureIsLongClick = false
 
     private var lastTappedTime = 0L
     private var lastTappedLocation: Vector? = null
 
-    fun onTouchEvent(event: MotionEvent): Boolean {
+    fun onTouchEvent(event: MotionEvent) {
         val pointerIdToIndex =
             (0..<event.pointerCount).associateBy { event.getPointerId(it) }
 
         if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-            paths = HashMap()
+            synchronized(this@TouchGestureDetector) {
+                paths = HashMap()
+                gestureIsLongClick = false
+            }
+            longPressHandler.postDelayed({
+                synchronized(this@TouchGestureDetector) {
+                    if (paths.entries.size == 1 && paths.entries.firstOrNull()?.value?.isTap() == true) {
+                        gestureIsLongClick = true
+                        Gesture.LONG_CLICK.invoke(context)
+                    }
+                }
+            }, LONG_PRESS_TIMEOUT.toLong())
         }
 
         // add new pointers
@@ -122,9 +138,17 @@ class TouchGestureDetector(
         }
 
         if (event.actionMasked == MotionEvent.ACTION_UP) {
+            synchronized(this@TouchGestureDetector) {
+                // if the long press handler is still running, kill it
+                longPressHandler.removeCallbacksAndMessages(null)
+                // if the gesture was already detected as a long click, there is nothing to do
+                if (gestureIsLongClick) {
+                    return
+                }
+            }
             classifyPaths(paths, event.downTime, event.eventTime)
         }
-        return true
+        return
     }
 
     private fun getGestureForDirection(direction: Vector): Gesture? {
@@ -171,10 +195,6 @@ class TouchGestureDetector(
                     lastTappedTime = timeEnd
                     lastTappedLocation = mainPointerPath.last
                 }
-            } else if (duration > LONG_PRESS_TIMEOUT) {
-                // TODO: Don't wait until the finger is lifted.
-                // Instead set a timer to start long click as soon as LONG_PRESS_TIMEOUT is reached
-                Gesture.LONG_CLICK.invoke(context)
             }
         } else {
             // detect swipes

app/src/main/java/de/jrpie/android/launcher/ui/list/ListActivity.kt

@@ -22,6 +22,7 @@ import de.jrpie.android.launcher.R
 import de.jrpie.android.launcher.REQUEST_UNINSTALL
 import de.jrpie.android.launcher.actions.LauncherAction
 import de.jrpie.android.launcher.apps.AppFilter
+import de.jrpie.android.launcher.apps.hidePrivateSpaceWhenLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceLocked
 import de.jrpie.android.launcher.apps.isPrivateSpaceSetUp
 import de.jrpie.android.launcher.apps.togglePrivateSpaceLock
@@ -34,10 +35,12 @@ import de.jrpie.android.launcher.ui.list.other.ListFragmentOther
 
 // TODO: Better solution for this intercommunication functionality (used in list-fragments)
 var intention = ListActivity.ListActivityIntention.VIEW
-var favoritesVisibility: AppFilter.Companion.AppSetVisibility = AppFilter.Companion.AppSetVisibility.VISIBLE
+var favoritesVisibility: AppFilter.Companion.AppSetVisibility =
+    AppFilter.Companion.AppSetVisibility.VISIBLE
 var privateSpaceVisibility: AppFilter.Companion.AppSetVisibility =
     AppFilter.Companion.AppSetVisibility.VISIBLE
-var hiddenVisibility: AppFilter.Companion.AppSetVisibility = AppFilter.Companion.AppSetVisibility.HIDDEN
+var hiddenVisibility: AppFilter.Companion.AppSetVisibility =
+    AppFilter.Companion.AppSetVisibility.HIDDEN
 var forGesture: String? = null
 
 /**
@@ -52,6 +55,23 @@ class ListActivity : AppCompatActivity(), UIObject {
 
 
     private fun updateLockIcon(locked: Boolean) {
+        if (
+            // only show lock for VIEW intention
+            (intention != ListActivityIntention.VIEW)
+            // hide lock when private space does not exist
+            || !isPrivateSpaceSetUp(this)
+            // hide lock when private space apps are hidden from the main list and we are not in the private space list
+            || (LauncherPreferences.apps().hidePrivateSpaceApps()
+                    && privateSpaceVisibility != AppFilter.Companion.AppSetVisibility.EXCLUSIVE)
+            // hide lock when private space is locked and the hidden when locked setting is set
+            || (locked && hidePrivateSpaceWhenLocked(this))
+        ) {
+            binding.listLock.visibility = View.GONE
+            return
+        }
+
+        binding.listLock.visibility = View.VISIBLE
+
         binding.listLock.setImageDrawable(
             AppCompatResources.getDrawable(
                 this,
@@ -74,7 +94,6 @@ class ListActivity : AppCompatActivity(), UIObject {
     }
 
 
-
     enum class ListActivityIntention(val titleResource: Int) {
         VIEW(R.string.list_title_view), /* view list of apps */
         PICK(R.string.list_title_pick)  /* choose app or action to associate to a gesture */
@@ -119,20 +138,6 @@ class ListActivity : AppCompatActivity(), UIObject {
             LauncherAction.SETTINGS.launch(this@ListActivity)
         }
 
-        binding.listLock.visibility =
-            if (intention != ListActivityIntention.VIEW) {
-                View.GONE
-            } else if (!isPrivateSpaceSetUp(this)) {
-                View.GONE
-            } else if (LauncherPreferences.apps().hidePrivateSpaceApps()) {
-                if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
-                    View.VISIBLE
-                } else {
-                    View.GONE
-                }
-            } else {
-                View.VISIBLE
-            }
 
         if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
             isPrivateSpaceSetUp(this, showToast = true, launchSettings = true)
@@ -200,15 +205,16 @@ class ListActivity : AppCompatActivity(), UIObject {
     fun updateTitle() {
         var titleResource = intention.titleResource
         if (intention == ListActivityIntention.VIEW) {
-            titleResource = if (hiddenVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
-                R.string.list_title_hidden
-            } else if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
-                R.string.list_title_private_space
-            } else if (favoritesVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
-                R.string.list_title_favorite
-            } else {
-                R.string.list_title_view
-            }
+            titleResource =
+                if (hiddenVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
+                    R.string.list_title_hidden
+                } else if (privateSpaceVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
+                    R.string.list_title_private_space
+                } else if (favoritesVisibility == AppFilter.Companion.AppSetVisibility.EXCLUSIVE) {
+                    R.string.list_title_favorite
+                } else {
+                    R.string.list_title_view
+                }
         }
 
         binding.listHeading.text = getString(titleResource)

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/AppsRecyclerAdapter.kt

@@ -67,7 +67,7 @@ class AppsRecyclerAdapter(
         override fun onClick(v: View) {
             val rect = Rect()
             img.getGlobalVisibleRect(rect)
-            selectItem(adapterPosition, rect)
+            selectItem(bindingAdapterPosition, rect)
         }
 
         init {

app/src/main/java/de/jrpie/android/launcher/ui/list/apps/ContextMenuActions.kt

@@ -22,6 +22,7 @@ import de.jrpie.android.launcher.apps.DetailedAppInfo
 import de.jrpie.android.launcher.apps.PinnedShortcutInfo
 import de.jrpie.android.launcher.getUserFromId
 import de.jrpie.android.launcher.preferences.LauncherPreferences
+import androidx.core.net.toUri
 
 private const val LOG_TAG = "AppContextMenu"
 
@@ -44,7 +45,7 @@ fun AbstractAppInfo.uninstall(activity: Activity) {
         Log.i(LOG_TAG, "uninstalling $this")
 
         val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE)
-        intent.data = Uri.parse("package:$packageName")
+        intent.data = "package:$packageName".toUri()
         getUserFromId(userId, activity).let { user ->
             intent.putExtra(Intent.EXTRA_USER, user)
         }

app/src/main/java/de/jrpie/android/launcher/ui/list/other/OtherRecyclerAdapter.kt

@@ -33,7 +33,7 @@ class OtherRecyclerAdapter(val activity: Activity) :
 
 
         override fun onClick(v: View) {
-            val pos = adapterPosition
+            val pos = bindingAdapterPosition
             val content = othersList[pos]
 
             forGesture?.let { returnChoiceIntent(it, content) }

app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt

@@ -11,6 +11,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -94,6 +95,8 @@ class SettingsFragmentActionsRecycler : Fragment(), UIObject {
 class ActionsRecyclerAdapter(val activity: Activity) :
     RecyclerView.Adapter<ActionsRecyclerAdapter.ViewHolder>() {
 
+    private val drawableUnknown = AppCompatResources.getDrawable(activity, R.drawable.baseline_question_mark_24)
+
     private val gesturesList: ArrayList<Gesture> =
         Gesture.entries.filter(Gesture::isEnabled) as ArrayList<Gesture>
 
@@ -115,15 +118,18 @@ class ActionsRecyclerAdapter(val activity: Activity) :
 
     private fun updateViewHolder(gesture: Gesture, viewHolder: ViewHolder) {
         val action = Action.forGesture(gesture)
-        val drawable = action?.getIcon(activity)
 
-        if (action == null || drawable == null) {
+        if (action == null) {
             viewHolder.img.visibility = View.INVISIBLE
             viewHolder.removeAction.visibility = View.GONE
             viewHolder.chooseButton.visibility = View.VISIBLE
             return
         }
 
+        // Use the unknown icon if there is an action, but we can't find its icon.
+        // Probably an app was uninstalled.
+        val drawable = action.getIcon(activity) ?: drawableUnknown
+
         viewHolder.img.visibility = View.VISIBLE
         viewHolder.removeAction.visibility = View.VISIBLE
         viewHolder.chooseButton.visibility = View.INVISIBLE

app/src/main/java/de/jrpie/android/launcher/ui/settings/meta/SettingsFragmentMeta.kt

@@ -16,6 +16,7 @@ import de.jrpie.android.launcher.copyToClipboard
 import de.jrpie.android.launcher.databinding.SettingsMetaBinding
 import de.jrpie.android.launcher.getDeviceInfo
 import de.jrpie.android.launcher.openInBrowser
+import de.jrpie.android.launcher.openTutorial
 import de.jrpie.android.launcher.preferences.resetPreferences
 import de.jrpie.android.launcher.ui.LegalInfoActivity
 import de.jrpie.android.launcher.ui.UIObject
@@ -47,8 +48,17 @@ class SettingsFragmentMeta : Fragment(), UIObject {
 
     override fun setOnClicks() {
 
+        fun bindURL(view: View, urlRes: Int) {
+            view.setOnClickListener {
+                openInBrowser(
+                    getString(urlRes),
+                    requireContext()
+                )
+            }
+        }
+
         binding.settingsMetaButtonViewTutorial.setOnClickListener {
-            startActivity(Intent(this.context, TutorialActivity::class.java))
+            openTutorial(requireContext())
         }
 
         // prompting for settings-reset confirmation
@@ -69,12 +79,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
 
 
         // view code
-        binding.settingsMetaButtonViewCode.setOnClickListener {
-            openInBrowser(
-                getString(R.string.settings_meta_link_github),
-                requireContext()
-            )
-        }
+        bindURL(binding.settingsMetaButtonViewCode, R.string.settings_meta_link_github)
 
         // report a bug
         binding.settingsMetaButtonReportBug.setOnClickListener {
@@ -110,37 +115,19 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
         // join chat
-        binding.settingsMetaButtonJoinChat.setOnClickListener {
-            openInBrowser(
-                getString(R.string.settings_meta_chat_url),
-                requireContext()
-            )
-        }
-
+        bindURL(binding.settingsMetaButtonJoinChat, R.string.settings_meta_chat_url)
 
         // contact developer
-        binding.settingsMetaButtonContact.setOnClickListener {
-            openInBrowser(
-                getString(R.string.settings_meta_contact_url),
-                requireContext()
-            )
-        }
+        // bindURL(binding.settingsMetaButtonContact, R.string.settings_meta_contact_url)
 
         // contact fork developer
-        binding.settingsMetaButtonForkContact.setOnClickListener {
-            openInBrowser(
-                getString(R.string.settings_meta_fork_contact_url),
-                requireContext()
-            )
-        }
+        bindURL(binding.settingsMetaButtonForkContact, R.string.settings_meta_fork_contact_url)
+
+        // donate
+        bindURL(binding.settingsMetaButtonDonate, R.string.settings_meta_donate_url)
 
         // privacy policy
-        binding.settingsMetaButtonPrivacy.setOnClickListener {
-            openInBrowser(
-                getString(R.string.settings_meta_privacy_url),
-                requireContext()
-            )
-        }
+        bindURL(binding.settingsMetaButtonPrivacy, R.string.settings_meta_privacy_url)
 
         // legal info
         binding.settingsMetaButtonLicenses.setOnClickListener {

app/src/main/java/de/jrpie/android/launcher/ui/tutorial/TutorialActivity.kt

@@ -2,7 +2,9 @@ package de.jrpie.android.launcher.ui.tutorial
 
 import android.content.Intent
 import android.content.res.Resources
+import android.os.Build
 import android.os.Bundle
+import android.window.OnBackInvokedDispatcher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -33,6 +35,19 @@ class TutorialActivity : AppCompatActivity(), UIObject {
         super<AppCompatActivity>.onCreate(savedInstanceState)
         super<UIObject>.onCreate()
 
+        // Handle back key / gesture on Android 13+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            onBackInvokedDispatcher.registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_OVERLAY
+            ) {
+                // prevent going back when the tutorial is shown for the first time
+                if (!LauncherPreferences.internal().started()) {
+                    return@registerOnBackInvokedCallback
+                }
+                finish()
+            }
+        }
+
         // Initialise layout
         setContentView(R.layout.tutorial)
 
@@ -60,7 +75,7 @@ class TutorialActivity : AppCompatActivity(), UIObject {
         }
     }
 
-    // Default: prevent going back, allow if viewed again later
+    // prevent going back when the tutorial is shown for the first time
     override fun onBackPressed() {
         if (LauncherPreferences.internal().started())
             super.onBackPressed()

app/src/main/res/drawable/baseline_question_mark_24.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.07,12.85c0.77,-1.39 2.25,-2.21 3.11,-3.44c0.91,-1.29 0.4,-3.7 -2.18,-3.7c-1.69,0 -2.52,1.28 -2.87,2.34L6.54,6.96C7.25,4.83 9.18,3 11.99,3c2.35,0 3.96,1.07 4.78,2.41c0.7,1.15 1.11,3.3 0.03,4.9c-1.2,1.77 -2.35,2.31 -2.97,3.45c-0.25,0.46 -0.35,0.76 -0.35,2.24h-2.89C10.58,15.22 10.46,13.95 11.07,12.85zM14,20c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2S14,18.9 14,20z" />
+
+</vector>

app/src/main/res/drawable/baseline_volume_adjust_24.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:textColor"
+        android:pathData="m 3,9 v 6 h 4 l 5,5 V 4 L 7,9 Z m 13.5,3 C 16.5,10.23 15.48,8.71 14,7.97 v 8.05 c 1.48,-0.73 2.5,-2.25 2.5,-4.02 z" />
+    <path
+        android:fillAlpha="0.5"
+        android:fillColor="?android:textColor"
+        android:pathData="m 14,3.23 v 2.06 c 2.89,0.86 5,3.54 5,6.71 0,3.17 -2.11,5.85 -5,6.71 v 2.06 C 18.01,19.86 21,16.28 21,12 21,7.72 18.01,4.14 14,3.23 Z"
+        android:strokeAlpha="0.5" />
+
+</vector>

app/src/main/res/layout/settings_meta.xml

@@ -59,12 +59,12 @@
             android:text="@string/settings_meta_join_chat"
             android:textAllCaps="false" />
 
-        <Button
+        <!--<Button
             android:id="@+id/settings_meta_button_contact"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/settings_meta_contact"
-            android:textAllCaps="false" />
+            android:textAllCaps="false" />-->
 
         <Button
             android:id="@+id/settings_meta_button_fork_contact"
@@ -73,6 +73,13 @@
             android:text="@string/settings_meta_fork_contact"
             android:textAllCaps="false" />
 
+        <Button
+            android:id="@+id/settings_meta_button_donate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_meta_donate"
+            android:textAllCaps="false" />
+
         <Space
             android:layout_width="match_parent"
             android:layout_height="64sp" />

app/src/main/res/values-de/strings.xml

@@ -6,8 +6,8 @@
       -
       -->
     <string name="alert_cant_open_title">App kann nicht geöffnet werden</string>
-    <string name="alert_cant_open_message">Möchtest du die App-Einstellungen anpassen?</string>
-    <string name="toast_cant_open_message">Öffne die Einstellungen um für diese Geste eine Aktion zu wählen</string>
+    <string name="alert_cant_open_message">App-Einstellungen anpassen?</string>
+    <string name="toast_cant_open_message">Einstellungen öffnen um für diese Geste eine Aktion zu wählen</string>
     <!--
       -
       - Settings
@@ -117,7 +117,7 @@
     <string name="settings_list_layout_item_grid">Raster</string>
     <string name="settings_general_choose_home_screen">Launcher wählen</string>
     <string name="settings_meta_cant_select_launcher">App Info</string>
-    <string name="settings_meta_cant_select_launcher_msg">Dein Gerät unterstützt diese Funktion nicht. Stattdessen die App Details bearbeiten?</string>
+    <string name="settings_meta_cant_select_launcher_msg">Das Gerät unterstützt diese Funktion nicht. Stattdessen die App Details bearbeiten?</string>
     <string name="settings_meta_show_tutorial">Zum Tutorial</string>
     <string name="settings_meta_reset">Einstellungen zurücksetzen</string>
     <string name="settings_meta_reset_confirm">Alle Einstellungen gehen verloren. Weitermachen?</string>
@@ -128,6 +128,7 @@
     <string name="dialog_report_bug_create_report">Report erstellen</string>
     <string name="settings_meta_fork_contact">Entwickler des Fork kontaktieren</string>
     <string name="settings_meta_join_chat">Dem µLauncher-Chat beitreten</string>
+    <string name="settings_meta_donate">Spenden</string>
     <string name="settings_meta_privacy">Datenschutzerklärung</string>
     <!--
       -
@@ -151,8 +152,9 @@
     <string name="list_other_list">Alle Anwendungen</string>
     <string name="list_other_list_favorites">Favoriten</string>
     <string name="list_other_toggle_private_space_lock">Privaten Bereich (ent)sperren</string>
-    <string name="list_other_volume_up">Musik: Lauter</string>
-    <string name="list_other_volume_down">Musik: Leiser</string>
+    <string name="list_other_volume_up">Lauter</string>
+    <string name="list_other_volume_down">Leiser</string>
+    <string name="list_other_volume_adjust">Lautstärke ändern</string>
     <string name="list_other_track_next">Musik: Weiter</string>
     <string name="list_other_track_previous">Musik: Zurück</string>
     <string name="list_other_nop">Nichts tun</string>
@@ -163,23 +165,23 @@
       -->
     <string name="list_other_torch">Taschenlampe umschalten</string>
     <string name="tutorial_title">Tutorial</string>
-    <string name="tutorial_start_text">Nimm dir kurz Zeit und lerne, wie du diesen Launcher verwendest!</string>
+    <string name="tutorial_start_text">Hier eine kurze Erklärung, wie dieser Launcher funktioniert.</string>
     <string name="tutorial_concept_title">Konzept</string>
-    <string name="tutorial_concept_text">µLauncher bietet eine minimalistische, effiziente und ablenkungsfreie digitale Umgebung.\n\nDie App kostet dich nichts, enthält keine Werbung und sammelt keinerlei Daten.</string>
-    <string name="tutorial_concept_text_2">Launcher ist open-source (MIT license) und auf GitHub!\n\nSchau gerne mal dort vorbei!</string>
+    <string name="tutorial_concept_text">µLauncher bietet eine minimalistische, effiziente und ablenkungsfreie digitale Umgebung.\n\nDie App ist freie Software, enthält keine Werbung und sammelt keinerlei Daten.</string>
+    <string name="tutorial_concept_text_2">Der Quellcode ist bei GitHub zu finden.</string>
     <string name="tutorial_usage_title">Benutzung</string>
-    <string name="tutorial_usage_text">Auf deinem Homescreen siehst du nur das Datum und die Uhrzeit. Keine Ablenkung.</string>
-    <string name="tutorial_usage_text_2">Du öffnest Apps indem du über den Bildschirm wischt oder die Lautstärketasten drückst. Gleich wählst du deine Apps.</string>
+    <string name="tutorial_usage_text">Der Homescreen zeigt nur das Datum und die Uhrzeit. Keine Ablenkung.</string>
+    <string name="tutorial_usage_text_2">Häufig verwendete Apps können mittels Gesten, z.B. Wischen oder den Lautstärketasten geöffnet werden. Gleich können die Apps ausgewählt werden.</string>
     <string name="tutorial_setup_title">Einrichtung</string>
-    <string name="tutorial_setup_text">Wir haben dir ein paar Standardapps ausgewählt, du kannst sie hier gerne ändern:</string>
-    <string name="tutorial_setup_text_2">Du kannst deine Auswahl in den Einstellungen später jederzeit ändern.</string>
+    <string name="tutorial_setup_text">Es wurden Standardapps ausgewählt, die Zuordnung kann hier angepasst werden:</string>
+    <string name="tutorial_setup_text_2">Die Auswahl kann in den Einstellungen später jederzeit geändert werden.</string>
     <string name="tutorial_finish_title">Los gehts!</string>
-    <string name="tutorial_finish_text">Du bist bereit loszulegen!\n\nIch hoffe diese App ist nützlich für dich!\n\n- Finn (der Entwickler)\n\tund Josia (der einige Änderungen vorgenommen hat und den Fork μLauncher entwickelt)</string>
+    <string name="tutorial_finish_text">Es kann losgehen!\n\nWir hoffen, dass diese App hilfreich ist!\n\n- Finn (der Entwickler)\n\tund Josia (der einige Änderungen vorgenommen hat und den Fork μLauncher entwickelt)</string>
     <string name="tutorial_finish_button">Starten</string>
     <string name="settings">Einstellungen</string>
     <string name="ic_menu_alt">Mehr Optionen</string>
     <string name="list_other_expand_notifications_panel">Benachrichtigungen</string>
-    <string name="alert_cant_expand_status_bar_panel">Fehler: Diese Funktion wird von deinem Gerät leider nicht unterstützt.</string>
+    <string name="alert_cant_expand_status_bar_panel">Fehler: Die Funktion wird von diesem Gerät leider nicht unterstützt.</string>
     <string name="settings_clock_show_seconds">Sekunden anzeigen</string>
     <string name="undo">Rückgängig</string>
     <string name="list_other_expand_settings_panel">Schnelleinstellungen</string>
@@ -194,7 +196,7 @@
     <string name="alert_requires_android_v">Diese Funktionalität benötigt Android 15 oder neuer.</string>
     <string name="snackbar_app_hidden">Die App wurde versteckt. Sie kann in den Einstellungen wieder sichtbar gemacht werden.</string>
     <string name="toast_device_admin_not_enabled">µLauncher muss Geräteadministrator sein, um den Bildschirm sperren zu dürfen.</string>
-    <string name="device_admin_explanation">Dies ist erforderlich, damit µLauncher den Bildschirm spreen kann.</string>
+    <string name="device_admin_explanation">Dies ist erforderlich, damit µLauncher den Bildschirm sperren kann.</string>
     <string name="device_admin_description">Die Aktion \"Bildschirm sperren\" aktivieren</string>
     <string name="alert_no_torch_found">Es wurde keine geeignete Kamera gefunden.</string>
     <string name="alert_torch_access_exception">Fehler: Kein Zugriff auf die Kamera möglich.</string>
@@ -233,8 +235,8 @@
         Dies erfordert sehr weitgehende Berechtigungen.
         µLauncher wird diese ausschließlich zum Sperren des Bildschirms verwenden.
         <br/>
-        (Irgeneiner gerade heruntergeladenen App sollte man eine solche Behauptung natürlich nicht einfach glauben.
-        Du kannst jedoch den <a href=\"https://github.com/jrpie/Launcher\">Source Code</a> selbst prüfen.)
+        (Irgendeiner gerade heruntergeladenen App sollte man eine solche Behauptung natürlich nicht einfach glauben.
+        Der <a href=\"https://github.com/jrpie/Launcher\">Quelltext</a> dieser App ist jedoch frei verfügbar und kann überprüft werden.)
 
 
         <br/><br/><br/><br/>

app/src/main/res/values/donottranslate.xml

@@ -164,6 +164,7 @@
         <string name="settings_meta_privacy_url" translatable="false">https://s.jrpie.de/android-legal</string>
         <string name="settings_meta_contact_url" translatable="false">https://www.finnmglas.com/contact/</string>
         <string name="settings_meta_chat_url" translatable="false">https://s.jrpie.de/launcher-chat</string>
+        <string name="settings_meta_donate_url" translatable="false">https://s.jrpie.de/launcher-donate</string>
 
         <!--
           -

app/src/main/res/values/strings.xml

@@ -192,7 +192,6 @@
       -->
     <string name="settings_general_choose_home_screen">Set μLauncher as home screen</string>
     <string name="settings_meta_cant_select_launcher">App Info</string>
-    <string name="settings_meta_cant_select_launcher_msg">Your device does not support this feature. Manage application details instead?</string>
 
     <string name="settings_meta_show_tutorial">View Launcher Tutorial</string>
 
@@ -211,6 +210,7 @@
 
     <string name="settings_meta_fork_contact">Contact the developer of the fork</string>
     <string name="settings_meta_join_chat">Join µLauncher chat</string>
+    <string name="settings_meta_donate">Donate</string>
 
     <string name="settings_meta_privacy">Privacy Policy</string>
 
@@ -251,8 +251,9 @@
     <string name="list_other_list_favorites">Favorite Applications</string>
     <string name="list_other_list_private_space">Private Space</string>
     <string name="list_other_toggle_private_space_lock">Toggle Private Space Lock</string>
-    <string name="list_other_volume_up">Music: Louder</string>
-    <string name="list_other_volume_down">Music: Quieter</string>
+    <string name="list_other_volume_up">Raise Volume</string>
+    <string name="list_other_volume_down">Lower Volume</string>
+    <string name="list_other_volume_adjust">Adjust Volume</string>
     <string name="list_other_track_next">Music: Next</string>
     <string name="list_other_track_previous">Music: Previous</string>
     <string name="list_other_track_play_pause">Music: Play / Pause</string>