From d96577963e309c30bfc3e4d840eb5c3145961580 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Wed, 14 Feb 2024 22:41:35 +0100
Subject: Don't invert the pin entry layout

The pin entry layout shouldn't be inverted as the letter indications
would be meaningless and the order would be opposite to what the option
specifies.

The enter and action key are swapped as the automatic swapping is also
removed.
---
 srcs/juloo.keyboard2/Keyboard2.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2.java')

diff --git a/srcs/juloo.keyboard2/Keyboard2.java b/srcs/juloo.keyboard2/Keyboard2.java
index 6440c7d..2a6025b 100644
--- a/srcs/juloo.keyboard2/Keyboard2.java
+++ b/srcs/juloo.keyboard2/Keyboard2.java
@@ -88,13 +88,19 @@ public class Keyboard2 extends InputMethodService
     return KeyboardData.load(getResources(), layout_id);
   }
 
-  /** Load a layout that contains a numpad (eg. the pin entry). */
+  /** Load a layout that contains a numpad. */
   KeyboardData loadNumpad(int layout_id)
   {
     return _config.modify_numpad(KeyboardData.load(getResources(), layout_id),
         current_layout_unmodified());
   }
 
+  KeyboardData loadPinentry(int layout_id)
+  {
+    return _config.modify_pinentry(KeyboardData.load(getResources(), layout_id),
+        current_layout_unmodified());
+  }
+
   @Override
   public void onCreate()
   {
@@ -230,7 +236,7 @@ public class Keyboard2 extends InputMethodService
       case InputType.TYPE_CLASS_PHONE:
       case InputType.TYPE_CLASS_DATETIME:
         if (_config.pin_entry_enabled)
-          return loadNumpad(R.xml.pin);
+          return loadPinentry(R.xml.pin);
         else
           return loadNumpad(R.xml.numeric);
       default:
-- 
cgit v1.2.3