Fix fragment-pop stale stroke: realign raw buffer to truncated word

app/src/main/java/com/android/inputmethod/keyboard/ProximityInfo.java

@@ -6,6 +6,7 @@
 
 package com.android.inputmethod.keyboard;
 
+import android.content.Context;
 import android.graphics.Rect;
 import helium314.keyboard.latin.utils.Log;
 
@@ -14,6 +15,10 @@
 import helium314.keyboard.keyboard.Key;
 import helium314.keyboard.keyboard.internal.TouchPositionCorrection;
 import helium314.keyboard.latin.common.Constants;
+import helium314.keyboard.latin.database.TouchModelDao;
+import helium314.keyboard.latin.database.TouchModelManager;
+import helium314.keyboard.latin.settings.Settings;
+import helium314.keyboard.latin.settings.SettingsValues;
 import helium314.keyboard.latin.utils.JniUtils;
 
 import java.util.ArrayList;
@@ -48,12 +53,17 @@ public class ProximityInfo {
     private final List<Key> mSortedKeys;
     @NonNull
     private final List<Key>[] mGridNeighbors;
+    // Adaptive typing: the keyboard element this proximity info is for (e.g. alphabet vs symbols).
+    // Keys the learned touch model by (key, this element, orientation) so layouts stay separate.
+    private final int mLayoutElementId;
 
     @SuppressWarnings("unchecked")
     public ProximityInfo(final int gridWidth, final int gridHeight, final int minWidth, final int height,
             final int mostCommonKeyWidth, final int mostCommonKeyHeight,
             @NonNull final List<Key> sortedKeys,
-            @NonNull final TouchPositionCorrection touchPositionCorrection) {
+            @NonNull final TouchPositionCorrection touchPositionCorrection,
+            final int layoutElementId) {
+        mLayoutElementId = layoutElementId;
         mGridWidth = gridWidth;
         mGridHeight = gridHeight;
         mGridSize = mGridWidth * mGridHeight;
@@ -165,14 +175,34 @@ private long createNativeProximityInfo(@NonNull final TouchPositionCorrection to
             infoIndex++;
         }
 
-        if (touchPositionCorrection.isValid()) {
+        // Adaptive typing (opt-in): when enabled, shift each key's sweet-spot center by the
+        // learned per-user landing offset (capped) so the native recognizer matches swipes — and
+        // tap-correction candidates — against keys where the user's hand actually goes. This
+        // path runs even when the layout ships no static touch-position-correction data, so we
+        // still generate sweet spots in that case. The shift is computed in Java and crosses the
+        // existing JNI; no native change. See docs/ADAPTIVE_TYPING.md.
+        final boolean tpcValid = touchPositionCorrection.isValid();
+        final SettingsValues sv = Settings.getValues();
+        final boolean adaptiveOn = sv != null && sv.mAdaptiveKeyGeometry;
+        final int adaptiveStrength = sv != null ? sv.mAdaptiveKeyGeometryStrength : 0;
+        TouchModelDao adaptiveDao = null;
+        int adaptiveOrientation = 0;
+        if (adaptiveOn && adaptiveStrength > 0) {
+            final Context ctx = Settings.getCurrentContext();
+            if (ctx != null) {
+                adaptiveDao = TouchModelDao.getInstance(ctx);
+                adaptiveOrientation = ctx.getResources().getConfiguration().orientation;
+            }
+        }
+        final boolean applyAdaptive = adaptiveDao != null;
+        if (tpcValid || applyAdaptive) {
             if (DEBUG) {
-                Log.d(TAG, "touchPositionCorrection: ON");
+                Log.d(TAG, "sweet spots: ON (tpc=" + tpcValid + " adaptive=" + applyAdaptive + ")");
             }
             sweetSpotCenterXs = new float[keyCount];
             sweetSpotCenterYs = new float[keyCount];
             sweetSpotRadii = new float[keyCount];
-            final int rows = touchPositionCorrection.getRows();
+            final int rows = tpcValid ? touchPositionCorrection.getRows() : 0;
             final float defaultRadius = DEFAULT_TOUCH_POSITION_CORRECTION_RADIUS
                     * (float)Math.hypot(mMostCommonKeyWidth, mMostCommonKeyHeight);
             for (int infoIndex = 0, keyIndex = 0; keyIndex < sortedKeys.size(); keyIndex++) {
@@ -186,7 +216,7 @@ private long createNativeProximityInfo(@NonNull final TouchPositionCorrection to
                 sweetSpotCenterYs[infoIndex] = hitBox.exactCenterY();
                 sweetSpotRadii[infoIndex] = defaultRadius;
                 final int row = hitBox.top / mMostCommonKeyHeight;
-                if (row < rows) {
+                if (tpcValid && row < rows) {
                     final int hitBoxWidth = hitBox.width();
                     final int hitBoxHeight = hitBox.height();
                     final float hitBoxDiagonal = (float)Math.hypot(hitBoxWidth, hitBoxHeight);
@@ -197,19 +227,27 @@ private long createNativeProximityInfo(@NonNull final TouchPositionCorrection to
                     sweetSpotRadii[infoIndex] =
                             touchPositionCorrection.getRadius(row) * hitBoxDiagonal;
                 }
+                if (applyAdaptive) {
+                    final TouchModelDao.Stat stat = adaptiveDao.get(key.getCode(),
+                            Integer.toString(mLayoutElementId), adaptiveOrientation);
+                    final float[] off = TouchModelManager.adjustedOffset(
+                            stat, key.getWidth(), key.getHeight(), adaptiveStrength);
+                    sweetSpotCenterXs[infoIndex] += off[0];
+                    sweetSpotCenterYs[infoIndex] += off[1];
+                }
                 if (DEBUG) {
                     Log.d(TAG, String.format(Locale.US,
                             "  [%2d] row=%d x/y/r=%7.2f/%7.2f/%5.2f %s code=%s", infoIndex, row,
                             sweetSpotCenterXs[infoIndex], sweetSpotCenterYs[infoIndex],
-                            sweetSpotRadii[infoIndex], (row < rows ? "correct" : "default"),
+                            sweetSpotRadii[infoIndex], (tpcValid && row < rows ? "correct" : "default"),
                             Constants.printableCode(key.getCode())));
                 }
                 infoIndex++;
             }
         } else {
             sweetSpotCenterXs = sweetSpotCenterYs = sweetSpotRadii = null;
             if (DEBUG) {
-                Log.d(TAG, "touchPositionCorrection: OFF");
+                Log.d(TAG, "sweet spots: OFF");
             }
         }
 

app/src/main/java/helium314/keyboard/keyboard/AdaptiveKeyContext.java

@@ -0,0 +1,131 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+package helium314.keyboard.keyboard;
+
+import helium314.keyboard.latin.SuggestedWords;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Holds a transient "likely next key" prior derived from the current suggestion strip, used to
+ * gently enlarge the touch target of likely next keys (adaptive typing, see
+ * docs/ADAPTIVE_TYPING.md).
+ *
+ * <p>It is rebuilt between keystrokes — whenever the suggestions change — on the UI thread, and
+ * read per tap in {@link KeyDetector}. Reads are lock-free via {@code volatile} parallel arrays,
+ * which are tiny (at most a handful of distinct next-characters), so the tap hot path stays fast
+ * even for very fast typists. Because suggestions are computed asynchronously, the prior may lag
+ * the latest keystroke by one tap under very fast typing; that is harmless, as the prior is only
+ * a soft, capped bias.
+ *
+ * <p>Suggestions are weighted EQUALLY (averaged) rather than by score, so the result is not skewed
+ * toward the single top suggestion.
+ */
+public final class AdaptiveKeyContext {
+    /** How many suggestions to average over. */
+    private static final int TOP_N = 5;
+
+    private static volatile int[] sCodes;
+    private static volatile float[] sWeights;
+
+    /**
+     * Optional observer notified whenever the prior changes, on the same (UI) thread that mutates
+     * it. Used only by the debug overlay (see AdaptiveTargetsDrawingPreview) to repaint the live
+     * keyboard as the prior shifts between keystrokes; null in normal operation. Volatile so the
+     * keyboard view can register/clear it from its own lifecycle without extra locking.
+     */
+    private static volatile Runnable sChangeListener;
+
+    private AdaptiveKeyContext() {}
+
+    /** Register (or clear, with {@code null}) the debug repaint observer. */
+    public static void setChangeListener(final Runnable listener) {
+        sChangeListener = listener;
+    }
+
+    private static void fireChanged() {
+        final Runnable l = sChangeListener;
+        if (l != null) l.run();
+    }
+
+    /**
+     * Rebuild the prior from the top suggestions.
+     *
+     * @param words    the current suggestion strip contents.
+     * @param position index of the NEXT character within each suggestion — the current
+     *                 composing-word length while a word is being built, or 0 for a new word
+     *                 (using next-word predictions, whose first letter is the likely next key).
+     */
+    public static void update(final SuggestedWords words, final int position) {
+        if (words == null || words.isEmpty() || position < 0) {
+            clear();
+            return;
+        }
+        final int n = Math.min(TOP_N, words.size());
+        final HashMap<Integer, Integer> tally = new HashMap<>();
+        int considered = 0;
+        for (int i = 0; i < n; i++) {
+            final String w = words.getWord(i);
+            if (w == null || position >= w.length()) continue; // typed word itself / too short
+            final int cp = Character.toLowerCase(w.charAt(position));
+            if (!Character.isLetter(cp)) continue;
+            tally.merge(cp, 1, Integer::sum);
+            considered++;
+        }
+        if (considered == 0) {
+            clear();
+            return;
+        }
+        final int[] codes = new int[tally.size()];
+        final float[] weights = new float[tally.size()];
+        int j = 0;
+        for (final Map.Entry<Integer, Integer> e : tally.entrySet()) {
+            codes[j] = e.getKey();
+            weights[j] = (float) e.getValue() / considered; // 0..1, equal-weight average
+            j++;
+        }
+        sCodes = codes;
+        sWeights = weights;
+        fireChanged();
+    }
+
+    public static void clear() {
+        sCodes = null;
+        sWeights = null;
+        fireChanged();
+    }
+
+    /** Prior weight in [0, 1] for the given key code (0 if none / no prior). Case-insensitive:
+     *  the prior stores lowercase next-characters, but a shifted keyboard reports uppercase key
+     *  codes, so we fold to lowercase to match (otherwise the bias/overlay miss capital letters). */
+    public static float weight(final int code) {
+        final int[] c = sCodes;
+        final float[] w = sWeights;
+        if (c == null || w == null) return 0f;
+        final int lower = Character.toLowerCase(code);
+        for (int i = 0; i < c.length && i < w.length; i++) {
+            if (c[i] == lower) return w[i];
+        }
+        return 0f;
+    }
+
+    public static boolean hasPrior() {
+        return sCodes != null;
+    }
+
+    /** Human-readable snapshot of the current prior, e.g. {@code [e=0.60,o=0.40]}, for debug logs. */
+    public static String debugString() {
+        final int[] c = sCodes;
+        final float[] w = sWeights;
+        if (c == null || w == null) return "(none)";
+        final StringBuilder sb = new StringBuilder("[");
+        for (int i = 0; i < c.length && i < w.length; i++) {
+            if (i > 0) sb.append(',');
+            sb.append((char) c[i]).append('=')
+              .append(String.format(java.util.Locale.US, "%.2f", w[i]));
+        }
+        return sb.append(']').toString();
+    }
+}

app/src/main/java/helium314/keyboard/keyboard/KeyDetector.java

@@ -6,10 +6,26 @@
 
 package helium314.keyboard.keyboard;
 
+import android.content.Context;
+import android.graphics.Rect;
+
+import helium314.keyboard.latin.database.TouchModelDao;
+import helium314.keyboard.latin.database.TouchModelManager;
+import helium314.keyboard.latin.settings.Settings;
+import helium314.keyboard.latin.settings.SettingsValues;
+import helium314.keyboard.latin.utils.Log;
+
 /**
  * This class handles key detection.
  */
 public class KeyDetector {
+    // Adaptive typing: the context prior may enlarge a likely key's effective target by at most
+    // this fraction of the key (deliberately a bit less than the learned-geometry cap, so the
+    // prior nudges rather than dominates). See docs/ADAPTIVE_TYPING.md.
+    private static final float PRIOR_MAX_FRACTION = 0.18f;
+    // A neighbor is only allowed to win a tap if the touch is within this fraction of its hitbox.
+    private static final float CONSIDER_MARGIN_FRACTION = 0.40f;
+
     private final int mKeyHysteresisDistanceSquared;
     private final int mKeyHysteresisDistanceForSlidingModifierSquared;
 
@@ -101,6 +117,87 @@ public Key detectHitKey(final int x, final int y) {
                 primaryKey = key;
             }
         }
+        // Adaptive typing (opt-in): for a plain tap (not a gesture/swipe), let the learned
+        // per-key landing offset and the current next-key prior gently bias which key wins —
+        // bounded so only genuinely ambiguous, near-boundary taps can flip.
+        if (primaryKey != null && !PointerTracker.isInGestureOrKeySwipe()) {
+            final Key biased = applyAdaptiveBias(touchX, touchY, primaryKey);
+            if (biased != null) return biased;
+        }
         return primaryKey;
     }
+
+    /** Returns a key that should win this tap instead of {@code geo} due to learned/prior bias,
+     *  or {@code null} to keep the plain geometric result. */
+    private Key applyAdaptiveBias(final int touchX, final int touchY, final Key geo) {
+        final SettingsValues sv = Settings.getValues();
+        if (sv == null || sv.mAdaptiveKeyGeometryStrength <= 0) return null;
+        // The two halves are independently toggleable: learned per-key offset, and the
+        // context prior. Either alone is enough to bias a tap; both share the strength slider.
+        final boolean learn = sv.mAdaptiveKeyGeometry;
+        final boolean usePrior = sv.mAdaptiveContextPrior;
+        if (!learn && !usePrior) return null;
+        final Context ctx = Settings.getCurrentContext();
+        if (ctx == null || mKeyboard == null) return null;
+        final TouchModelDao dao = learn ? TouchModelDao.getInstance(ctx) : null;
+        final boolean hasPrior = usePrior && AdaptiveKeyContext.hasPrior();
+        if (dao == null && !hasPrior) return null; // nothing to bias with
+        final String layout = Integer.toString(mKeyboard.mId.mElementId);
+        final int orientation = ctx.getResources().getConfiguration().orientation;
+        final int strength = sv.mAdaptiveKeyGeometryStrength;
+
+        Key best = geo;
+        float bestScore = adjustedDistance(geo, touchX, touchY, dao, layout, orientation, strength, usePrior);
+        for (final Key k : mKeyboard.getNearestKeys(touchX, touchY)) {
+            if (k == geo) continue;
+            final int code = k.getCode();
+            if (code <= 0 || !Character.isLetter(code)) continue;
+            // Only a genuinely-favored neighbor (a confident learned offset and/or a next-key
+            // prior) may steal a near-boundary tap; otherwise leave the geometric result alone.
+            final float prior = usePrior ? AdaptiveKeyContext.weight(code) : 0f;
+            final TouchModelDao.Stat st = (dao == null) ? null : dao.get(code, layout, orientation);
+            final boolean hasLearned = st != null && st.getCount() >= TouchModelDao.MIN_CONFIDENT_SAMPLES;
+            if (prior <= 0f && !hasLearned) continue;
+            // Bound: the touch must be within a margin of the neighbor's hitbox.
+            final float margin = CONSIDER_MARGIN_FRACTION * k.getWidth();
+            if (k.squaredDistanceToEdge(touchX, touchY) > margin * margin) continue;
+            final float s = adjustedDistance(k, touchX, touchY, dao, layout, orientation, strength, usePrior);
+            if (s < bestScore) {
+                bestScore = s;
+                best = k;
+            }
+        }
+        if (sv.mAdaptiveDebugOverlay && hasPrior) {
+            Log.d("AdaptivePrior", "tap geo='" + (char) geo.getCode()
+                    + "' priorOnGeo=" + AdaptiveKeyContext.weight(geo.getCode())
+                    + " chosen='" + (char) best.getCode() + "'"
+                    + (best == geo ? "" : " (FLIPPED by bias)")
+                    + " prior=" + AdaptiveKeyContext.debugString());
+        }
+        return best == geo ? null : best;
+    }
+
+    /** Distance from the touch to the key's effective center (center shifted by the learned
+     *  landing offset, when enabled) minus the capped next-key prior boost (when enabled).
+     *  Smaller wins. */
+    private float adjustedDistance(final Key k, final int touchX, final int touchY,
+            final TouchModelDao dao, final String layout, final int orientation, final int strength,
+            final boolean usePrior) {
+        final Rect hb = k.getHitBox();
+        float cx = hb.exactCenterX();
+        float cy = hb.exactCenterY();
+        if (dao != null) {
+            final TouchModelDao.Stat st = dao.get(k.getCode(), layout, orientation);
+            final float[] off = TouchModelManager.adjustedOffset(st, k.getWidth(), k.getHeight(), strength);
+            cx += off[0];
+            cy += off[1];
+        }
+        final float dx = touchX - cx;
+        final float dy = touchY - cy;
+        final float dist = (float) Math.sqrt(dx * dx + dy * dy);
+        final float boost = usePrior
+                ? AdaptiveKeyContext.weight(k.getCode()) * PRIOR_MAX_FRACTION * k.getWidth() * (strength / 100f)
+                : 0f;
+        return dist - boost;
+    }
 }

app/src/main/java/helium314/keyboard/keyboard/Keyboard.java

@@ -113,7 +113,7 @@ public Keyboard(@NonNull final KeyboardParams params) {
 
         mProximityInfo = new ProximityInfo(params.GRID_WIDTH, params.GRID_HEIGHT,
                 mOccupiedWidth, mOccupiedHeight, mMostCommonKeyWidth, mMostCommonKeyHeight,
-                mSortedKeys, params.mTouchPositionCorrection);
+                mSortedKeys, params.mTouchPositionCorrection, mId.mElementId);
         mProximityCharsCorrectionEnabled = params.mProximityCharsCorrectionEnabled;
     }