Keyboard bugs fix (#3120)

* Fixes #3093: German trademark symbol. * Fixes #3094: Backslash symbol. * Fixes #3099: domain key is wrongly in uppercase. * Fixes #3100: the shift key should not be the lock mode after language changes.
MozillaReality · Apr 7, 2020 · 1345296 · 1345296
1 parent 9378a63
commit 1345296
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java
@@ -826,7 +826,7 @@ private void handleEmojiInput() {
 
     private void handleDomain() {
         if (!mIsLongPress) {
-            handleText(mCurrentKeyboard.getDomains()[0]);
+            handleText(mCurrentKeyboard.getDomains()[0], true);
         }
     }
 
@@ -877,6 +877,7 @@ private void handleLanguageChange(KeyboardInterface aKeyboard) {
         mKeyboardView.setKeyboard(mCurrentKeyboard.getAlphabeticKeyboard());
         updateSpaceBarLanguageLabel();
         disableShift(getSymbolsKeyboard());
+        mIsCapsLock = false;
         handleShift(false);
         hideOverlays();
         updateCandidates();

diff --git a/app/src/main/res/xml/keyboard_symbols_danish.xml b/app/src/main/res/xml/keyboard_symbols_danish.xml
@@ -42,7 +42,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="\\"/>
+        <Key android:codes="92" android:keyLabel="\\"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />
         <Key android:codes="47" android:keyLabel="/" />

diff --git a/app/src/main/res/xml/keyboard_symbols_finnish.xml b/app/src/main/res/xml/keyboard_symbols_finnish.xml
@@ -42,7 +42,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="\\"/>
+        <Key android:codes="92" android:keyLabel="\\"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />
         <Key android:codes="47" android:keyLabel="/" />

diff --git a/app/src/main/res/xml/keyboard_symbols_german.xml b/app/src/main/res/xml/keyboard_symbols_german.xml
@@ -43,7 +43,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="™"/>
+        <Key android:codes="0x2122" android:keyLabel="™"/>
         <Key android:codes="95" android:keyLabel="_"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />

diff --git a/app/src/main/res/xml/keyboard_symbols_norwegian.xml b/app/src/main/res/xml/keyboard_symbols_norwegian.xml
@@ -42,7 +42,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="\\"/>
+        <Key android:codes="92" android:keyLabel="\\"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />
         <Key android:codes="47" android:keyLabel="/" />

diff --git a/app/src/main/res/xml/keyboard_symbols_polish.xml b/app/src/main/res/xml/keyboard_symbols_polish.xml
@@ -41,7 +41,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="\\"/>
+        <Key android:codes="92" android:keyLabel="\\"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />
         <Key android:codes="47" android:keyLabel="/" />

diff --git a/app/src/main/res/xml/keyboard_symbols_swedish.xml b/app/src/main/res/xml/keyboard_symbols_swedish.xml
@@ -42,7 +42,7 @@
         <Key android:codes="126" android:keyLabel="~"/>
         <Key android:codes="39" android:keyLabel="'"/>
         <Key android:codes="34" android:keyLabel="&quot;"/>
-        <Key android:codes="58" android:keyLabel="\\"/>
+        <Key android:codes="92" android:keyLabel="\\"/>
         <Key android:codes="45" android:keyLabel="-" />
         <Key android:codes="43" android:keyLabel="+" />
         <Key android:codes="47" android:keyLabel="/" />