merge: sync LeanBitLab/LeanType v4.1.8

CHANGELOG.md

@@ -14,6 +14,9 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 ## [Unreleased]
 
+### Upstream
+- Merged **LeanBitLab/LeanType v4.1.8** (pinned at `3717aa80`, covering v4.1.3–v4.1.8, 178 commits) — adds sound packs, plugin/model management improvements, floating-keyboard fixes, next-word suggestion fixes, and Android compatibility updates. LeanTypeDual retains its distinct `applicationId` and version, four privacy flavors, bundled offline AI and dictionaries, Java fallback gesture engine, and two-thumb typing. (#149)
+
 ### Added
 - **Side-by-side experimental build** — an `experimental` build type (`com.asafmah.leantypedual.exp`, shown as "LeanTypeDual EXP") that installs alongside the normal build instead of replacing it, so input experiments can be compared against a working daily driver. (#141)
 

app/proguard-rules.pro

@@ -38,27 +38,58 @@
 -dontwarn com.google.api.client.**
 -dontwarn java.lang.management.**
 -dontwarn org.joda.time.**
+-dontwarn com.google.ai.client.generativeai.**
+-dontwarn de.kherud.llama.**
+-dontwarn org.nehuatl.llamacpp.**
 
-# Keep offline voice plugin AIDL interface and parcelable classes
+# Keep offline voice plugin AIDL interface, parcelables, and host managers
 -keep class com.leanbitlab.leantype.voice.** { *; }
 -keep interface com.leanbitlab.leantype.voice.** { *; }
+-keep class helium314.keyboard.latin.voice.** { *; }
 
+# Keep handwriting plugin interface and classes to prevent signature optimization or inlining
 -keep interface helium314.keyboard.latin.handwriting.HandwritingRecognizer {
     <methods>;
 }
 -keep interface helium314.keyboard.latin.handwriting.ModelDownloadListener {
     <methods>;
 }
+-keep class helium314.keyboard.latin.handwriting.** { *; }
+-keep interface helium314.keyboard.latin.handwriting.** { *; }
 
 # Keep translation plugin interface to prevent parameter removal/signature optimization
 -keep interface helium314.keyboard.latin.translation.ITranslationProvider {
     <methods>;
 }
+-keep interface helium314.keyboard.latin.translation.TranslationModelDownloadListener {
+    <methods>;
+}
+-keep class helium314.keyboard.latin.translation.** { *; }
+-keep interface helium314.keyboard.latin.translation.** { *; }
+
+# Keep offline AI plugin interface to prevent parameter removal/signature optimization
+-keep interface helium314.keyboard.latin.ai.IOfflineAiProvider {
+    <methods>;
+}
+-keep class helium314.keyboard.latin.ai.** { *; }
+-keep interface helium314.keyboard.latin.ai.** { *; }
+
+# Keep WorkManager plugin factory & runtime for dynamically loaded plugins
+-keep class helium314.keyboard.latin.work.** { *; }
+-keep interface helium314.keyboard.latin.work.** { *; }
+-keep class androidx.work.** { *; }
+-keep interface androidx.work.** { *; }
+-keep class * extends androidx.work.ListenableWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keepnames class com.google.mlkit.** extends androidx.work.ListenableWorker
+-dontwarn androidx.work.**
 
-# Keep ML Kit, GMS Tasks, and Firebase components for handwriting plugin dynamic linkage
+# Keep ML Kit, DataTransport, GMS Tasks, and Firebase components for plugin dynamic linkage
 -keep class com.google.mlkit.** { *; }
--keep class com.google.android.gms.tasks.** { *; }
--keep class com.google.firebase.components.** { *; }
+-keep class com.google.android.datatransport.** { *; }
+-keep class com.google.android.gms.** { *; }
+-keep class com.google.firebase.** { *; }
 
 # Keep Kotlin standard library for dynamically loaded plugins
 # ponytail: keep kotlin stdlib classes to prevent NoSuchMethodError in plugin loading

app/src/main/AndroidManifest.xml

@@ -18,6 +18,7 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-feature android:name="android.hardware.microphone" android:required="false" />
 
     <queries>

app/src/main/assets/layouts/editing/editing.json

@@ -8,23 +8,23 @@
   ],
   [
     { "code": -32, "label": "Cut", "type": "function", "width": 0.2 },
-    { "code": -25, "label": "⤒", "width": 0.2 },
+    { "code": -10015, "label": "«", "width": 0.2 },
     { "code": -23, "label": "↑", "width": 0.2 },
-    { "code": -26, "label": "⤓", "width": 0.2 },
-    { "code": -7, "label": "delete", "type": "function", "width": 0.2 }
+    { "code": -10016, "label": "»", "width": 0.2 },
+    { "code": 32, "label": "space", "width": 0.2 }
   ],
   [
     { "code": -31, "label": "Copy", "type": "function", "width": 0.2 },
     { "code": -21, "label": "←", "width": 0.2 },
     { "code": -306, "label": "Select", "type": "function", "width": 0.2 },
     { "code": -22, "label": "→", "width": 0.2 },
-    { "code": -10015, "label": "«", "width": 0.2 }
+    { "code": -7, "label": "delete", "type": "function", "width": 0.2 }
   ],
   [
     { "code": -33, "label": "Paste", "type": "function", "width": 0.2 },
     { "code": -27, "label": "⇱", "width": 0.2 },
     { "code": -24, "label": "↓", "width": 0.2 },
     { "code": -28, "label": "⇲", "width": 0.2 },
-    { "code": -10016, "label": "»", "width": 0.2 }
+    { "label": "action", "width": 0.2 }
   ]
 ]

app/src/main/assets/layouts/editing/editing_classic.json

@@ -0,0 +1,30 @@
+[
+  [
+    { "code": -131, "label": "Undo", "type": "function", "width": 0.2 },
+    { "code": -132, "label": "Redo", "type": "function", "width": 0.2 },
+    { "code": -35, "label": "All", "type": "function", "width": 0.2 },
+    { "code": -34, "label": "Word", "type": "function", "width": 0.2 },
+    { "code": -201, "label": "✕", "type": "function", "width": 0.2 }
+  ],
+  [
+    { "code": -32, "label": "Cut", "type": "function", "width": 0.2 },
+    { "code": -25, "label": "⤒", "width": 0.2 },
+    { "code": -23, "label": "↑", "width": 0.2 },
+    { "code": -26, "label": "⤓", "width": 0.2 },
+    { "code": -7, "label": "delete", "type": "function", "width": 0.2 }
+  ],
+  [
+    { "code": -31, "label": "Copy", "type": "function", "width": 0.2 },
+    { "code": -21, "label": "←", "width": 0.2 },
+    { "code": -306, "label": "Select", "type": "function", "width": 0.2 },
+    { "code": -22, "label": "→", "width": 0.2 },
+    { "code": -10015, "label": "«", "width": 0.2 }
+  ],
+  [
+    { "code": -33, "label": "Paste", "type": "function", "width": 0.2 },
+    { "code": -27, "label": "⇱", "width": 0.2 },
+    { "code": -24, "label": "↓", "width": 0.2 },
+    { "code": -28, "label": "⇲", "width": 0.2 },
+    { "code": -10016, "label": "»", "width": 0.2 }
+  ]
+]

app/src/main/java/com/android/inputmethod/latin/BinaryDictionary.java

@@ -305,6 +305,11 @@ public ArrayList<SuggestedWordInfo> getSuggestions(final ComposedData composedDa
                     session.mInputOutputWeightOfLangModelVsSpatialModel[0];
         }
         final int count = session.mOutputSuggestionCount[0];
+        if (helium314.keyboard.latin.define.DebugFlags.DEBUG_ENABLED && composedData.mTypedWord.isEmpty()) {
+            Log.i("ScoreAudit", "BinaryDict.getSuggestions type=" + mDictType + " outputCount=" + count
+                    + " prevWordCount=" + ngramContext.getPrevWordCount()
+                    + " isBOS=" + ngramContext.isBeginningOfSentenceContext());
+        }
         final ArrayList<SuggestedWordInfo> suggestions = new ArrayList<>();
         for (int j = 0; j < count; ++j) {
             final int start = j * DICTIONARY_MAX_WORD_LENGTH;

app/src/main/java/com/leanbitlab/leantype/voice/VoiceDataClasses.kt

@@ -47,7 +47,9 @@ data class VoiceSessionConfig(
     val enablePartial: Boolean,
     val maxSegmentMs: Int,
     val hybridTimeoutMs: Int,
-    val hybridFallbackToVosk: Boolean
+    val hybridFallbackToVosk: Boolean,
+    val cpuThreads: Int = 4,
+    val customPrompt: String? = null
 ) : Parcelable
 
 object VoiceConstants {
@@ -81,6 +83,10 @@ object VoiceConstants {
     const val PREF_VOICE_LANGUAGE = "voice_language"
     const val VOICE_LANG_FOLLOW_KEYBOARD = "follow_keyboard"
     const val VOICE_LANG_AUTO = "auto"
+    const val PREF_VOICE_CPU_THREADS = "voice_cpu_threads"
+    const val PREF_VOICE_CUSTOM_PROMPT = "voice_custom_prompt"
+    const val PREF_VOICE_MIC_SENSITIVITY = "voice_mic_sensitivity"
+    const val PREF_VOICE_MAX_DURATION_SECONDS = "voice_max_duration_seconds"
     const val PREF_USE_DEBUG_VOICE_STUB = "use_debug_voice_stub"
     const val VOICE_PLUGIN_PACKAGE = "com.leanbitlab.leantype.voice.offline"
 }

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

@@ -739,6 +739,9 @@ public void reloadKeyboard() {
         if (mCurrentInputView == null)
             return;
         mEmojiPalettesView.clearKeyboardCache();
+        if (mSuggestionStripView != null) {
+            mSuggestionStripView.onFloatingKeyboardScaleChanged();
+        }
         reloadMainKeyboard();
     }
 

app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt

@@ -535,9 +535,14 @@ private constructor(val themeId: Int, @JvmField val mStyleId: Int) {
                 }
                 COLOR_KEYS ->
                     return brightenOrDarken(determineUserColor(colors, context, COLOR_BACKGROUND, isNight), isNight)
-                COLOR_FUNCTIONAL_KEYS ->
-                    return brightenOrDarken(determineUserColor(colors, context, COLOR_KEYS, isNight), true)
-                COLOR_SPACEBAR -> return determineUserColor(colors, context, COLOR_KEYS, isNight)
+                COLOR_SPACEBAR -> {
+                    val keyColor = determineUserColor(colors, context, COLOR_KEYS, isNight)
+                    if (!context.prefs().getBoolean(Settings.PREF_THEME_KEY_BORDERS, Defaults.PREF_THEME_KEY_BORDERS)) {
+                        val background = determineUserColor(colors, context, COLOR_BACKGROUND, isNight)
+                        return androidx.core.graphics.ColorUtils.blendARGB(background, keyColor, 0.45f)
+                    }
+                    return keyColor
+                }
                 COLOR_SPACEBAR_TEXT -> {
                     val spacebar = determineUserColor(colors, context, COLOR_SPACEBAR, isNight)
                     val hintText = determineUserColor(colors, context, COLOR_HINT_TEXT, isNight)

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

@@ -40,6 +40,7 @@
 import helium314.keyboard.latin.settings.SettingsValues;
 import helium314.keyboard.latin.suggestions.MoreSuggestions;
 import helium314.keyboard.latin.suggestions.MoreSuggestionsView;
+import helium314.keyboard.latin.utils.ResourceUtils;
 import helium314.keyboard.latin.utils.TypefaceUtils;
 
 import java.util.HashSet;
@@ -324,7 +325,17 @@ private void onDrawKeyboard(@NonNull final Canvas canvas) {
         final SettingsValues sv = Settings.getValues();
         mShowsHints = sv.mShowsHints;
         final float scale = sv.mKeyboardHeightScale;
-        mIconScaleFactor = scale < 0.8f ? scale + 0.2f : 1f;
+        final float floatingScale = ResourceUtils.getFloatingKeyboardScale();
+        final int floatingWidth = ResourceUtils.getFloatingKeyboardWidth();
+        final int defaultWidth = ResourceUtils.getDefaultKeyboardWidth(getContext());
+        if (floatingScale > 0.0f || floatingWidth > 0) {
+            final float heightScale = scale * (floatingScale > 0.0f ? floatingScale : 1.0f);
+            final float widthScale = (floatingWidth > 0 && defaultWidth > 0) ? ((float) floatingWidth / defaultWidth) : 1.0f;
+            final float effectiveKeyScale = Math.min(heightScale, widthScale);
+            mIconScaleFactor = Math.max(0.4f, Math.min(effectiveKeyScale, 1.5f));
+        } else {
+            mIconScaleFactor = scale < 0.8f ? scale + 0.2f : 1f;
+        }
         final Paint paint = mPaint;
         final Drawable background = getBackground();
         // Calculate clip region and set.
@@ -392,11 +403,14 @@ private void onDrawKey(@NonNull final Key key, @NonNull final Canvas canvas,
     protected void onDrawKeyBackground(@NonNull final Key key, @NonNull final Canvas canvas,
             @NonNull final Drawable background) {
         int customColor = 0;
-        if (KeyboardActionListenerImpl.sPersistentTextEditModeActive) {
+        final boolean isTextEditMode = KeyboardActionListenerImpl.sPersistentTextEditModeActive
+                || (getKeyboard() != null && getKeyboard().mId.mElementId == KeyboardId.ELEMENT_TEXT_EDIT);
+        if (isTextEditMode) {
             switch (key.getCode()) {
                 case KeyCode.UNDO:
                 case KeyCode.REDO:
                 case KeyCode.DELETE:
+                case KeyCode.FORWARD_DELETE:
                     customColor = mColors.get(ColorType.EDIT_MODE_DELETE_BACKGROUND);
                     break;
                 case KeyCode.CLIPBOARD_SELECT_ALL:
@@ -425,6 +439,11 @@ protected void onDrawKeyBackground(@NonNull final Key key, @NonNull final Canvas
                 case KeyCode.WORD_RIGHT:
                     customColor = mColors.get(ColorType.EDIT_MODE_JUMP_BACKGROUND);
                     break;
+                default:
+                    if (key.hasActionKeyBackground()) {
+                        customColor = mColors.get(ColorType.ACTION_KEY_BACKGROUND);
+                    }
+                    break;
             }
         }
 
@@ -437,12 +456,19 @@ protected void onDrawKeyBackground(@NonNull final Key key, @NonNull final Canvas
         final int keyHeight = key.getHeight();
         final int bgWidth, bgHeight, bgX, bgY;
         if (key.needsToKeepBackgroundAspectRatio(mDefaultKeyLabelFlags)
+                && !isTextEditMode
                 // HACK: To disable expanding normal/functional key background.
                 && !key.hasCustomActionLabel()) {
             bgWidth = (int) (drawBackground.getIntrinsicWidth() * mIconScaleFactor);
             bgHeight = (int) (drawBackground.getIntrinsicHeight() * mIconScaleFactor);
             bgX = (keyWidth - bgWidth) / 2;
             bgY = (keyHeight - bgHeight) / 2;
+        } else if (!mColors.getHasKeyBorders() && key.getBackgroundType() == Key.BACKGROUND_TYPE_SPACEBAR) {
+            final int verticalInset = (int) (keyHeight * 0.16f);
+            bgWidth = keyWidth + padding.left + padding.right;
+            bgHeight = Math.max(1, keyHeight + padding.top + padding.bottom - (verticalInset * 2));
+            bgY = -padding.top + verticalInset;
+            bgX = -padding.left;
         } else {
             bgWidth = keyWidth + padding.left + padding.right;
             bgHeight = keyHeight + padding.top + padding.bottom;
@@ -535,7 +561,9 @@ protected void onDrawKeyTopVisuals(@NonNull final Key key, @NonNull final Canvas
             }
             if (key.needsAutoXScale() || (StringUtilsKt.isEmoji(label) && Settings.getValues().mEmojiKeyFit)) {
                 final int width;
-                if (key.needsToKeepBackgroundAspectRatio(mDefaultKeyLabelFlags)) {
+                final boolean isTextEditMode = KeyboardActionListenerImpl.sPersistentTextEditModeActive
+                        || (keyboard != null && keyboard.mId.mElementId == KeyboardId.ELEMENT_TEXT_EDIT);
+                if (key.needsToKeepBackgroundAspectRatio(mDefaultKeyLabelFlags) && !isTextEditMode) {
                     // make sure the text stays inside bounds of background drawable
                     Drawable bg = key.selectBackgroundDrawable(mKeyBackground, mFunctionalKeyBackground,
                             mSpacebarBackground, mActionKeyBackground);

app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.java

@@ -218,7 +218,7 @@ private void updateState(@NonNull RecyclerView recyclerView, long categoryId) {
     private static SingleDictionaryFacilitator sDictionaryFacilitator;
 
     private boolean initialized = false;
-    private final Colors mColors;
+    private Colors mColors;
     private final EmojiLayoutParams mEmojiLayoutParams;
     private LinearLayout mTabStrip;
     private EmojiCategoryPageIndicatorView mEmojiCategoryPageIndicatorView;
@@ -884,6 +884,7 @@ public void startEmojiPalettes(final KeyVisualAttributes keyVisualAttr,
         mEditorInfo = editorInfo; // Saved
         mKeyboardActionListener = keyboardActionListener;
         initialize();
+        updateColors();
         setupBottomRowKeyboard(editorInfo, keyboardActionListener);
         final KeyDrawParams params = new KeyDrawParams();
         params.updateParams(mEmojiLayoutParams.getBottomRowKeyboardHeight(), keyVisualAttr);
@@ -1174,7 +1175,7 @@ private void setCurrentCategoryId(final int categoryId, final boolean initial) {
 
                 if (old instanceof ImageView) {
                     Settings.getValues().mColors.setColor((ImageView) old, ColorType.EMOJI_CATEGORY);
-                    old.setBackgroundColor(android.graphics.Color.WHITE);
+                    old.setBackground(null);
                     Settings.getValues().mColors.setBackground((ImageView) old, ColorType.STRIP_BACKGROUND);
                 }
                 if (current instanceof ImageView) {
@@ -1185,6 +1186,33 @@ private void setCurrentCategoryId(final int categoryId, final boolean initial) {
         }
     }
 
+    public void updateColors() {
+        mColors = Settings.getValues().mColors;
+        if (mTabStrip != null) {
+            mColors.setBackground(mTabStrip, ColorType.STRIP_BACKGROUND);
+            for (int i = 0; i < mTabStrip.getChildCount(); i++) {
+                final View child = mTabStrip.getChildAt(i);
+                if (child instanceof ImageView) {
+                    final Object tag = child.getTag();
+                    final long categoryId = tag instanceof Long ? (Long) tag : -1;
+                    if (categoryId == mEmojiCategory.getCurrentCategoryId()) {
+                        child.setBackgroundResource(R.drawable.toolbar_key_background);
+                        mColors.setColor(child.getBackground(), ColorType.TOOL_BAR_EXPAND_KEY_BACKGROUND);
+                    } else {
+                        child.setBackground(null);
+                        mColors.setBackground(child, ColorType.STRIP_BACKGROUND);
+                    }
+                    mColors.setColor((ImageView) child, ColorType.EMOJI_CATEGORY);
+                }
+            }
+        }
+        if (mEmojiCategoryPageIndicatorView != null) {
+            mEmojiCategoryPageIndicatorView.setColors(
+                    mColors.get(ColorType.EMOJI_CATEGORY_SELECTED),
+                    mColors.get(ColorType.STRIP_BACKGROUND));
+        }
+    }
+
     private boolean isAnimationsDisabled() {
         return android.provider.Settings.Global.getFloat(getContext().getContentResolver(),
                 android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1.0f) == 0.0f;
@@ -1196,6 +1224,7 @@ public void clearKeyboardCache() {
         }
 
         mEmojiCategory.clearKeyboardCache();
+        updateColors();
         mPager.getAdapter().notifyDataSetChanged();
         closeDictionaryFacilitator();
     }

app/src/main/java/helium314/keyboard/keyboard/internal/GestureStrokeRecognitionParams.java

@@ -48,7 +48,7 @@ private GestureStrokeRecognitionParams() {
         mDynamicDistanceThresholdFrom = 6.0f; // keyWidth
         mDynamicDistanceThresholdTo = 0.35f; // keyWidth
         // The following parameters' change will affect the result of regression test.
-        mSamplingMinimumDistance = 1.0f / 6.0f; // keyWidth
+        mSamplingMinimumDistance = 1.0f / 8.0f; // keyWidth
         mRecognitionMinimumTime = 100; // msec
         mRecognitionSpeedThreshold = 5.5f; // keyWidth/sec
     }