feat: tune double-tap shift timing and keep llamacpp proguard

Author: LeanBitLab

app/proguard-rules.pro

@@ -27,6 +27,8 @@
 
 # Keep java-llama.cpp classes
 -keep class de.kherud.llama.** { *; }
+-keep class org.nehuatl.llamacpp.** { *; }
+
 
 
 # Fix correct service name

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

@@ -366,6 +366,7 @@ private void setMainKeyboardFrame(
             }
             mHandwritingView.setVisibility(View.GONE);
         }
+
 
         if (PointerTracker.sPersistentTouchpadModeActive) {
             if (mTouchpadView != null) {

app/src/main/java/helium314/keyboard/keyboard/internal/KeyboardState.kt

@@ -73,6 +73,8 @@ class KeyboardState(private val switchActions: SwitchActions) {
     // For handling double tap.
     private var isInAlphabetUnshiftedFromShifted = false
     private var isInDoubleTapShiftKey = false
+    private var lastShiftPressTime = 0L
+
 
     private val savedKeyboardState = SavedKeyboardState()
 
@@ -515,8 +517,11 @@ class KeyboardState(private val switchActions: SwitchActions) {
             shiftKeyState.onPress()
             return
         }
-        isInDoubleTapShiftKey = switchActions.isInDoubleTapShiftKeyTimeout
+        val now = android.os.SystemClock.uptimeMillis()
+        isInDoubleTapShiftKey = switchActions.isInDoubleTapShiftKeyTimeout && (now - lastShiftPressTime > 100)
+        lastShiftPressTime = now
         if (isInDoubleTapShiftKey) {
+
             if (alphabetShiftState.isManualShifted || isInAlphabetUnshiftedFromShifted) {
                 // Shift key has been double tapped while in manual shifted or automatic shifted state.
                 setShiftLocked(true)

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

@@ -163,10 +163,10 @@ public boolean isTypingState() {
 
     @Override
     public void startDoubleTapShiftKeyTimer() {
-        sendMessageDelayed(obtainMessage(MSG_DOUBLE_TAP_SHIFT_KEY),
-                ViewConfiguration.getDoubleTapTimeout());
+        sendMessageDelayed(obtainMessage(MSG_DOUBLE_TAP_SHIFT_KEY), 300);
     }
 
+
     @Override
     public void cancelDoubleTapShiftKeyTimer() {
         removeMessages(MSG_DOUBLE_TAP_SHIFT_KEY);
@@ -218,8 +218,10 @@ public void postDismissGestureFloatingPreviewText(final long delay) {
 
     public void cancelAllMessages() {
         cancelAllKeyTimers();
+        cancelDoubleTapShiftKeyTimer();
         cancelAllUpdateBatchInputTimers();
         removeMessages(MSG_DISMISS_KEY_PREVIEW);
         removeMessages(MSG_DISMISS_GESTURE_FLOATING_PREVIEW_TEXT);
     }
 }
+