HeliBorg · Helium314 · Feb 21, 2026 · Feb 23, 2026 · Feb 23, 2026 · Feb 23, 2026
diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardActionListenerImpl.kt b/app/src/main/java/helium314/keyboard/keyboard/KeyboardActionListenerImpl.kt
@@ -25,7 +25,10 @@ import helium314.keyboard.latin.common.loopOverCodePointsBackwards
 import helium314.keyboard.latin.define.ProductionFlags
 import helium314.keyboard.latin.inputlogic.InputLogic
 import helium314.keyboard.latin.settings.Settings
+import helium314.keyboard.latin.utils.GestureDataGatheringSettings
+import helium314.keyboard.latin.utils.PassiveGatheringCache
 import helium314.keyboard.latin.utils.SubtypeSettings
+import helium314.keyboard.latin.utils.prefs
 import kotlin.math.abs
 import kotlin.math.min
 
@@ -102,7 +105,24 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
     override fun onCodeInput(primaryCode: Int, x: Int, y: Int, isKeyRepeat: Boolean) {
         when (primaryCode) {
             KeyCode.TOGGLE_AUTOCORRECT -> return settings.toggleAutoCorrect()
-            KeyCode.TOGGLE_INCOGNITO_MODE -> return settings.toggleAlwaysIncognitoMode()
+            KeyCode.TOGGLE_PASSIVE_GATHERING -> {
+                GestureDataGatheringSettings.togglePassiveGatheringEnabled(latinIME.prefs())
+                PassiveGatheringCache.clear() // clear data from current text field
+                latinIME.setGestureDataGatheringMode(latinIME.currentInputEditorInfo)
+                return
+            }
+            KeyCode.PASSIVE_GATHERING_TEMP_OFF -> {
+                GestureDataGatheringSettings.tempDisablePassiveGathering(latinIME.prefs())
+                PassiveGatheringCache.clear() // clear data from current text field
+                latinIME.setGestureDataGatheringMode(latinIME.currentInputEditorInfo)
+                return
+            }
+            KeyCode.TOGGLE_INCOGNITO_MODE -> {
+                settings.toggleAlwaysIncognitoMode()
+                PassiveGatheringCache.clear() // clear data from current text field
+                latinIME.setGestureDataGatheringMode(latinIME.currentInputEditorInfo)
+                return
+            }
         }
         val mkv = keyboardSwitcher.mainKeyboardView
 

diff --git a/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java b/app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
@@ -22,6 +22,7 @@
 import android.view.inputmethod.InputMethodSubtype;
 import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -595,6 +596,12 @@ private void showFakeToast(final String text, final int timeMillis) {
         }, timeMillis);
     }
 
+    public void setPassiveGatheringIndicator(boolean enabled, boolean hasData) {
+        ImageView view = mCurrentInputView.findViewById(R.id.passiveGatheringIndicator);
+        view.setVisibility(enabled ? View.VISIBLE: View.GONE);
+        view.setImageResource(hasData ? R.drawable.btn_keyboard_key_action_normal_lxx_base : R.drawable.ring);
+    }
+
     // Implements {@link KeyboardState.SwitchActions}.
     @Override
     public boolean isInDoubleTapShiftKeyTimeout() {

diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardIconsSet.kt
@@ -154,6 +154,7 @@ class KeyboardIconsSet private constructor() {
                     ToolbarKey.PAGE_START -> R.drawable.ic_page_start
                     ToolbarKey.PAGE_END -> R.drawable.ic_page_end
                     ToolbarKey.SPLIT -> R.drawable.ic_ime_switcher
+                    ToolbarKey.PASSIVE_GATHERING -> R.drawable.ic_settings_gesture
                 })
             }
         } }
@@ -215,6 +216,7 @@ class KeyboardIconsSet private constructor() {
                     ToolbarKey.PAGE_START -> R.drawable.ic_page_start
                     ToolbarKey.PAGE_END -> R.drawable.ic_page_end
                     ToolbarKey.SPLIT -> R.drawable.ic_ime_switcher
+                    ToolbarKey.PASSIVE_GATHERING -> R.drawable.ic_settings_gesture
                 })
             }
         } }
@@ -276,6 +278,7 @@ class KeyboardIconsSet private constructor() {
                     ToolbarKey.PAGE_START -> R.drawable.ic_page_start_rounded
                     ToolbarKey.PAGE_END -> R.drawable.ic_page_end_rounded
                     ToolbarKey.SPLIT -> R.drawable.ic_ime_switcher
+                    ToolbarKey.PASSIVE_GATHERING -> R.drawable.ic_settings_gesture
                 })
             }
         } }

diff --git a/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/KeyCode.kt b/app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/floris/KeyCode.kt
@@ -178,6 +178,8 @@ object KeyCode {
     const val META_RIGHT =                -10049
     const val EMOJI_SEARCH =              -10050
     const val INLINE_EMOJI_SEARCH_DONE =  -10051
+    const val TOGGLE_PASSIVE_GATHERING =  -10052 // will be useless after removal of gesture data gathering, but don't remove for compatibility
+    const val PASSIVE_GATHERING_TEMP_OFF =-10053 // will be useless after removal of gesture data gathering, but don't remove for compatibility
 
 
     // Intents
@@ -201,7 +203,7 @@ object KeyCode {
         PAGE_DOWN, META, TAB, ESCAPE, INSERT, SLEEP, MEDIA_PLAY, MEDIA_PAUSE, MEDIA_PLAY_PAUSE, MEDIA_NEXT,
         MEDIA_PREVIOUS, VOL_UP, VOL_DOWN, MUTE, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, BACK,
         TIMESTAMP, CTRL_LEFT, CTRL_RIGHT, ALT_LEFT, ALT_RIGHT, META_LEFT, META_RIGHT, SEND_INTENT_ONE, SEND_INTENT_TWO,
-        SEND_INTENT_THREE, EMOJI_SEARCH, INLINE_EMOJI_SEARCH_DONE, META_LOCK
+        SEND_INTENT_THREE, EMOJI_SEARCH, INLINE_EMOJI_SEARCH_DONE, META_LOCK, TOGGLE_PASSIVE_GATHERING, PASSIVE_GATHERING_TEMP_OFF
         -> this
 
         // conversion

diff --git a/app/src/main/java/helium314/keyboard/latin/App.kt b/app/src/main/java/helium314/keyboard/latin/App.kt
@@ -10,6 +10,8 @@ import helium314.keyboard.latin.settings.Settings
 import helium314.keyboard.latin.utils.LayoutUtilsCustom
 import helium314.keyboard.latin.utils.Log
 import helium314.keyboard.latin.utils.SubtypeSettings
+import helium314.keyboard.latin.utils.prefs
+import helium314.keyboard.latin.utils.upgradeToolbarPrefs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -36,6 +38,8 @@ class App : Application() {
 
         RichInputMethodManager.init(this)
         checkVersionUpgrade(this)
+        if (BuildConfig.DEBUG) // do this on every debug apk start because we may work on adding a new toolbar key
+            upgradeToolbarPrefs(prefs())
         transferOldPinnedClips(this) // todo: remove in a few months, maybe end 2026
         app = this
         Defaults.initDynamicDefaults(this)

diff --git a/app/src/main/java/helium314/keyboard/latin/AppsManager.kt b/app/src/main/java/helium314/keyboard/latin/AppsManager.kt
@@ -8,6 +8,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
+import android.graphics.drawable.Drawable
 
 class AppsManager(val context: Context) : BroadcastReceiver() {
     private val mPackageManager: PackageManager = context.packageManager
@@ -49,10 +50,10 @@ class AppsManager(val context: Context) : BroadcastReceiver() {
         fun onAppsChanged()
     }
 
-    fun getPackagesAndNames(): Collection<Pair<String, String>> {
+    fun getPackagesWithNameAndIcon(): List<Triple<String, String, Drawable?>> {
         val filter = Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER)
         return mPackageManager.queryIntentActivities(filter, 0).distinctBy { it.activityInfo.packageName }.map {
-            it.activityInfo.packageName to it.activityInfo.loadLabel(mPackageManager).toString()
+            Triple(it.activityInfo.packageName, it.activityInfo.loadLabel(mPackageManager).toString(), it.activityInfo.loadIcon(mPackageManager))
         }
     }
 }
diff --git a/app/src/main/java/helium314/keyboard/latin/LatinIME.java b/app/src/main/java/helium314/keyboard/latin/LatinIME.java
@@ -70,6 +70,7 @@
 import helium314.keyboard.latin.touchinputconsumer.GestureConsumer;
 import helium314.keyboard.latin.utils.ColorUtilKt;
 import helium314.keyboard.latin.utils.GestureDataGatheringKt;
+import helium314.keyboard.latin.utils.GestureDataGatheringSettings;
 import helium314.keyboard.latin.utils.InlineAutofillUtils;
 import helium314.keyboard.latin.utils.InputMethodPickerKt;
 import helium314.keyboard.latin.utils.JniUtils;
@@ -840,14 +841,7 @@ private void onStartInputInternal(final EditorInfo editorInfo, final boolean res
     void onStartInputViewInternal(final EditorInfo editorInfo, final boolean restarting) {
         super.onStartInputView(editorInfo, restarting);
 
-        // only for active gesture data gathering, remove when data gathering phase is done (end of 2026 latest)
-        if (GestureDataGatheringKt.isInActiveGatheringMode(editorInfo)) {
-            mDictionaryFacilitator = GestureDataGatheringKt.getGestureDataActiveFacilitator();
-        } else {
-            mDictionaryFacilitator = mOriginalDictionaryFacilitator;
-        }
-        GestureDataGatheringKt.showEndNotificationIfNecessary(this); // will do nothing for a long time
-        mInputLogic.setFacilitator(mDictionaryFacilitator);
+        setGestureDataGatheringMode(editorInfo);
 
         mDictionaryFacilitator.onStartInput();
         // Switch to the null consumer to handle cases leading to early exit below, for which we
@@ -1842,4 +1836,21 @@ public void onTrimMemory(int level) {
             // deallocateMemory always called on hiding, and should not be called when showing
         }
     }
+
+    // remove when data gathering phase is done (end of 2026 latest)
+     public void setGestureDataGatheringMode(final EditorInfo editorInfo) {
+        if (GestureDataGatheringKt.isInActiveGatheringMode(editorInfo)) {
+            mDictionaryFacilitator = GestureDataGatheringKt.getGestureDataActiveFacilitator();
+            GestureDataGatheringKt.usePassiveGathering = false;
+            mKeyboardSwitcher.setPassiveGatheringIndicator(false, false);
+        } else {
+            mDictionaryFacilitator = mOriginalDictionaryFacilitator;
+
+            // no active mode, check for passive mode
+            boolean usePassive = GestureDataGatheringKt.setUsePassiveGathering(this, editorInfo);
+            mKeyboardSwitcher.setPassiveGatheringIndicator(usePassive, false);
+        }
+        GestureDataGatheringSettings.INSTANCE.showEndNotificationIfNecessary(this); // will do nothing for a long time
+        mInputLogic.setFacilitator(mDictionaryFacilitator);
+    }
 }
diff --git a/app/src/main/java/helium314/keyboard/latin/RichInputConnection.java b/app/src/main/java/helium314/keyboard/latin/RichInputConnection.java
@@ -850,7 +850,7 @@ public NgramContext getNgramContextFromNthPreviousWord(
      *
      * @param spacingAndPunctuations the rules for spacing and punctuation
      * @param script the script we consider to be writing words, as one of ScriptUtils.SCRIPT_*
-     * @return a range containing the text surrounding the cursor
+     * @return a range containing the text surrounding the cursor (does NOT include the current selection)
      */
     @Nullable public TextRange getWordRangeAtCursor(final SpacingAndPunctuations spacingAndPunctuations,
             final String script) {

diff --git a/app/src/main/java/helium314/keyboard/latin/Suggest.kt b/app/src/main/java/helium314/keyboard/latin/Suggest.kt
@@ -23,7 +23,10 @@ import helium314.keyboard.latin.settings.SettingsValuesForSuggestion
 import helium314.keyboard.latin.suggestions.SuggestionStripView
 import helium314.keyboard.latin.utils.AutoCorrectionUtils
 import helium314.keyboard.latin.utils.Log
+import helium314.keyboard.latin.utils.PassiveGatheringCache
 import helium314.keyboard.latin.utils.SuggestionResults
+import helium314.keyboard.latin.utils.WordData
+import helium314.keyboard.latin.utils.usePassiveGathering
 import java.util.Locale
 import kotlin.math.min
 
@@ -272,11 +275,11 @@ class Suggest(private val mDictionaryFacilitator: DictionaryFacilitator) {
             wordComposer.composedDataSnapshot, ngramContext, keyboard,
             settingsValuesForSuggestion, SESSION_ID_GESTURE, inputStyle
         )
-        replaceSingleLetterFirstSuggestion(suggestionResults)
 
         // For transforming words that don't come from a dictionary, because it's our best bet
         val locale = mDictionaryFacilitator.mainLocale
         val suggestionsContainer = ArrayList(suggestionResults)
+        replaceSingleLetterFirstSuggestion(suggestionsContainer)
         val suggestionsCount = suggestionsContainer.size
         val keyboardShiftMode = keyboard.mId.keyboardCapsMode
         val shouldMakeSuggestionsOnlyFirstCharCapitalized = wordComposer.wasShiftedNoLock()
@@ -340,6 +343,13 @@ class Suggest(private val mDictionaryFacilitator: DictionaryFacilitator) {
         } else {
             suggestionsContainer
         }
+
+        if (usePassiveGathering && inputStyle == SuggestedWords.INPUT_STYLE_TAIL_BATCH) {
+            val wordData = WordData(null, suggestionResults, wordComposer.composedDataSnapshot,
+                ngramContext, keyboard, inputStyle, false, pseudoTypedWordInfo?.mWord)
+            PassiveGatheringCache.addWord(wordData)
+        }
+
         return SuggestedWords(suggestionsList, suggestionResults.mRawSuggestions, pseudoTypedWordInfo, true,
             false, false, inputStyle, sequenceNumber)
     }
@@ -513,20 +523,21 @@ class Suggest(private val mDictionaryFacilitator: DictionaryFacilitator) {
         }
 
         /** reduces score of the first suggestion if next one is close and has more than a single letter  */
-        private fun replaceSingleLetterFirstSuggestion(suggestionResults: SuggestionResults) {
+        private fun replaceSingleLetterFirstSuggestion(suggestionResults: MutableList<SuggestedWordInfo>) {
             if (suggestionResults.size < 2 || suggestionResults.first().mWord.length != 1) return
             // suppress single letter suggestions if next suggestion is close and has more than one letter
-            val iterator: Iterator<SuggestedWordInfo> = suggestionResults.iterator()
-            val first = iterator.next()
-            val second = iterator.next()
+            val first = suggestionResults[0]
+            val second = suggestionResults[1]
             if (second.mWord.length > 1 && second.mScore > 0.94 * first.mScore) {
                 suggestionResults.remove(first) // remove and re-add with lower score
-                suggestionResults.add(
-                    SuggestedWordInfo(
-                        first.mWord, first.mPrevWordsContext, (first.mScore * 0.93).toInt(),
-                        first.mKindAndFlags, first.mSourceDict, first.mIndexOfTouchPointOfSecondWord, first.mAutoCommitFirstWordConfidence
-                    )
+                val modifiedFirst = SuggestedWordInfo(
+                    first.mWord, first.mPrevWordsContext, (first.mScore * 0.93).toInt(),
+                    first.mKindAndFlags, first.mSourceDict, first.mIndexOfTouchPointOfSecondWord, first.mAutoCommitFirstWordConfidence
                 )
+                val insertIndex = suggestionResults.indexOfFirst { it.mScore < modifiedFirst.mScore }
+                if (insertIndex == -1) suggestionResults.add(modifiedFirst)
+                else suggestionResults.add(insertIndex, modifiedFirst)
+
                 if (DebugFlags.DEBUG_ENABLED)
                     Log.d(TAG, "reduced score of ${first.mWord} from ${first.mScore}, new first: ${suggestionResults.first().mWord} (${suggestionResults.first().mScore})")
             }