Keyboard updates: Polish, Danish UIS-6 and bug fixing (#1890)

* Keyboard updated Added Danish and Polish and updated the Spec to UIS-6_Keyboard_021 * Added Danish and Polish to display and voice languages * Fixed spacebar strings for polish and Danish * Updated Polski language string
MozillaReality · Oct 16, 2019 · e8a2dad · e8a2dad
1 parent 1bb6b98
commit e8a2dad
Show file tree

Hide file tree

Showing 33 changed files with 603 additions and 50 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/input/CustomKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/input/CustomKeyboard.java
@@ -10,7 +10,6 @@
 import android.content.res.XmlResourceParser;
 import android.inputmethodservice.Keyboard;
 import android.view.KeyEvent;
-import android.view.inputmethod.EditorInfo;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -22,6 +21,7 @@ public class CustomKeyboard extends Keyboard {
     private Key mSpaceKey;
     private Key mModeChangeKey;
     private int mMaxColums;
+    private int[] mDisabledKeysIndexes;
 
     public static final int KEYCODE_SYMBOLS_CHANGE = -10;
     public static final int KEYCODE_VOICE_INPUT = -11;
@@ -235,7 +235,23 @@ public int[] getShiftKeyIndices() {
         }
     }
 
-    public int getMaxColums() {
+    public int getMaxColumns() {
         return mMaxColums;
     }
+
+    public void disableKeys(int[] disabledKeyIndexes) {
+        mDisabledKeysIndexes = disabledKeyIndexes;
+    }
+
+    public boolean isKeyEnabled(int keyIndex) {
+        if (mDisabledKeysIndexes != null) {
+            for (int key : mDisabledKeysIndexes) {
+                if (key == keyIndex) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java
@@ -197,7 +197,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.pinyin_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_simplified_chinese, getLocale());
         } else {
             return mContext.getString(R.string.pinyin_spacebar_selection);
         }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java
@@ -153,7 +153,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.zhuyin_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_traditional_chinese, getLocale());
         } else {
             return mContext.getString(R.string.zhuyin_spacebar_selection);
         }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DanishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/DanishKeyboard.java
@@ -0,0 +1,68 @@
+package org.mozilla.vrbrowser.ui.keyboards;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.input.CustomKeyboard;
+import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
+import org.mozilla.vrbrowser.utils.StringUtils;
+
+import java.util.Locale;
+
+public class DanishKeyboard extends BaseKeyboard {
+    private CustomKeyboard mKeyboard;
+    private CustomKeyboard mSymbolsKeyboard;
+    private Locale mLocale;
+
+    public DanishKeyboard(Context aContext) {
+        super(aContext);
+        mLocale = new Locale("da", "DK");
+    }
+
+    @NonNull
+    @Override
+    public CustomKeyboard getAlphabeticKeyboard() {
+        if (mKeyboard == null) {
+            mKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_qwerty_danish);
+        }
+        return mKeyboard;
+    }
+
+    @Nullable
+    @Override
+    public CustomKeyboard getSymbolsKeyboard() {
+        if (mSymbolsKeyboard == null) {
+            mSymbolsKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_symbols_danish);
+        }
+        return mSymbolsKeyboard;
+    }
+
+    @Override
+    public float getAlphabeticKeyboardWidth() {
+        return WidgetPlacement.dpDimension(mContext, R.dimen.keyboard_alphabetic_width_danish);
+    }
+
+    @Nullable
+    @Override
+    public CandidatesResult getCandidates(String aText) {
+        return null;
+    }
+
+    @Override
+    public String getKeyboardTitle() {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_danish, getLocale());
+    }
+
+    @Override
+    public Locale getLocale() {
+        return mLocale;
+    }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_danish, getLocale());
+    }
+}
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/EnglishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/EnglishKeyboard.java
@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.ENGLISH;
     }
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_english, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FrenchKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/FrenchKeyboard.java
@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.FRENCH;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_french, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/GermanKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/GermanKeyboard.java
@@ -58,4 +58,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.GERMAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_german, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ItalianKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ItalianKeyboard.java
@@ -42,4 +42,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.ITALIAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_italian, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java
@@ -183,7 +183,7 @@ public Locale getLocale() {
     @Override
     public String getSpaceKeyText(String aComposingText) {
         if (aComposingText == null || aComposingText.trim().isEmpty()) {
-            return mContext.getString(R.string.japanese_spacebar_space);
+            return StringUtils.getStringByLocale(mContext, R.string.settings_language_japanese, getLocale());
         } else {
             return mContext.getString(R.string.japanese_spacebar_selection);
         }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KoreanKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KoreanKeyboard.java
@@ -400,4 +400,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return Locale.KOREAN;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_korean, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/PolishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/PolishKeyboard.java
@@ -0,0 +1,68 @@
+package org.mozilla.vrbrowser.ui.keyboards;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.input.CustomKeyboard;
+import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
+import org.mozilla.vrbrowser.utils.StringUtils;
+
+import java.util.Locale;
+
+public class PolishKeyboard extends BaseKeyboard {
+    private CustomKeyboard mKeyboard;
+    private CustomKeyboard mSymbolsKeyboard;
+    private Locale mLocale;
+
+    public PolishKeyboard(Context aContext) {
+        super(aContext);
+        mLocale = new Locale("pl", "PL");
+    }
+
+    @NonNull
+    @Override
+    public CustomKeyboard getAlphabeticKeyboard() {
+        if (mKeyboard == null) {
+            mKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_qwerty_polish);
+        }
+        return mKeyboard;
+    }
+
+    @Nullable
+    @Override
+    public CustomKeyboard getSymbolsKeyboard() {
+        if (mSymbolsKeyboard == null) {
+            mSymbolsKeyboard = new CustomKeyboard(mContext.getApplicationContext(), R.xml.keyboard_symbols_polish);
+        }
+        return mSymbolsKeyboard;
+    }
+
+    @Override
+    public float getAlphabeticKeyboardWidth() {
+        return WidgetPlacement.dpDimension(mContext, R.dimen.keyboard_alphabetic_width);
+    }
+
+    @Nullable
+    @Override
+    public CandidatesResult getCandidates(String aText) {
+        return null;
+    }
+
+    @Override
+    public String getKeyboardTitle() {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_polish, getLocale());
+    }
+
+    @Override
+    public Locale getLocale() {
+        return mLocale;
+    }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_polish, getLocale());
+    }
+}
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/RussianKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/RussianKeyboard.java
@@ -60,4 +60,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return mLocale;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_russian, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SpanishKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/SpanishKeyboard.java
@@ -43,4 +43,9 @@ public String getKeyboardTitle() {
     public Locale getLocale() {
         return mSpanishLocale;
     }
+
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.settings_language_spanish, getLocale());
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomKeyboardView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/CustomKeyboardView.java
@@ -23,7 +23,6 @@
 import android.graphics.Paint.Align;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.graphics.Region.Op;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.inputmethodservice.Keyboard;
@@ -32,7 +31,6 @@
 import android.os.Handler;
 import android.os.Message;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.Gravity;
@@ -184,6 +182,9 @@ public interface OnKeyboardActionListener {
             android.R.attr.state_checked
     };
 
+    private final static int[] KEY_STATE_NORMAL = {
+    };
+
     private int mVerticalCorrection;
     private int mProximityThreshold;
 
@@ -738,23 +739,31 @@ private void onBufferDraw() {
             if (drawSingleKey && invalidKey != key) {
                 continue;
             }
-            int[] drawableState = key.getCurrentDrawableState();
-            if (mHoveredKey == i && !key.pressed) {
-                // Fork: implement hovered key
-                drawableState = KEY_STATE_HOVERED;
-            }
 
             boolean stateHovered = false;
             boolean statePressed = false;
-            for (int state : drawableState) {
-                if (state == android.R.attr.state_hovered) {
-                    stateHovered = true;
-                } else if (state == android.R.attr.state_pressed) {
-                    statePressed = true;
+            int[] drawableState = key.getCurrentDrawableState();
+
+            if (((CustomKeyboard)mKeyboard).isKeyEnabled(i)) {
+                if (mHoveredKey == i && !key.pressed) {
+                    // Fork: implement hovered key
+                    drawableState = KEY_STATE_HOVERED;
                 }
+
+                for (int state : drawableState) {
+                    if (state == android.R.attr.state_hovered) {
+                        stateHovered = true;
+                    } else if (state == android.R.attr.state_pressed) {
+                        statePressed = true;
+                    }
+                }
+
+            } else {
+                drawableState = KEY_STATE_NORMAL;
             }
+
             Drawable keyBackground = mKeyBackground;
-            int columns = ((CustomKeyboard)mKeyboard).getMaxColums();
+            int columns = ((CustomKeyboard)mKeyboard).getMaxColumns();
             if (mFeaturedKeyBackground != null && mFeaturedKeyCodes.contains(key.codes[0])) {
                 keyBackground = mFeaturedKeyBackground;
             } else if ((i == columns && i == keyCount - 1) && mKeySingleBackground != null) {
@@ -912,7 +921,7 @@ private int getKeyIndices(int x, int y, int[] allKeys) {
     private void detectAndSendKey(int index, int x, int y, long eventTime) {
         if (index != NOT_A_KEY && index < mKeys.length) {
             final Key key = mKeys[index];
-            if (key.text != null) {
+            if (key.text != null && (key.popupCharacters == null || key.popupCharacters.length() == 0)) {
                 if (mKeyboardActionListener != null) {
                     mKeyboardActionListener.onText(key.text);
                     mKeyboardActionListener.onRelease(NOT_A_KEY);
@@ -1252,6 +1261,10 @@ private boolean onModifiedTouchEvent(MotionEvent me, boolean possiblePoly) {
         int keyIndex = getKeyIndices(touchX, touchY, null);
         mPossiblePoly = possiblePoly;
 
+        if (keyIndex != NOT_A_KEY && !((CustomKeyboard)mKeyboard).isKeyEnabled(keyIndex)) {
+            return true;
+        }
+
         // Track the last few movements to look for spurious swipes.
         if (action == MotionEvent.ACTION_DOWN) mSwipeTracker.clear();
         mSwipeTracker.addMovement(me);