Show correct enter key label based on input IME options

MozillaReality · May 16, 2019 · f07e552 · f07e552
1 parent e64f6d1
commit f07e552
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/BaseKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/BaseKeyboard.java
@@ -33,6 +33,11 @@ public String getEnterKeyText(int aIMEOptions, String aComposingText) {
         }
     }
 
+    @Override
+    public String getSpaceKeyText(String aComposingText) {
+        return StringUtils.getStringByLocale(mContext, R.string.keyboard_space_label, getLocale()).toUpperCase();
+    }
+
     @Override
     public String getComposingText(String aComposing, String aCode) {
         return aComposing.replaceFirst(Pattern.quote(aCode), "");

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KeyboardInterface.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/KeyboardInterface.java
@@ -37,7 +37,7 @@ public enum Action {
     String getComposingText(String aComposing, String aCode);
     String getKeyboardTitle();
     Locale getLocale();
-    default String getSpaceKeyText(String aComposingText) { return ""; }
+    String getSpaceKeyText(String aComposingText);
     String getEnterKeyText(int aIMEOptions, String aComposingText);
     String getModeChangeKeyText();
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -113,7 +113,8 @@ private void initialize(Context aContext) {
         mURL = findViewById(R.id.urlEditText);
         mURL.setShowSoftInputOnFocus(false);
         mURL.setOnEditorActionListener((aTextView, actionId, event) -> {
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
+            if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEARCH
+                    || actionId == EditorInfo.IME_ACTION_GO || actionId == EditorInfo.IME_ACTION_SEND) {
                 handleURLEdit(aTextView.getText().toString());
                 return true;
             }

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
@@ -275,6 +275,7 @@ public void updateFocusedView(View aFocusedView) {
         }
 
         updateCandidates();
+        updateSpecialKeyLabels();
     }
 
     public void dismiss() {

diff --git a/app/src/main/res/layout/navigation_url.xml b/app/src/main/res/layout/navigation_url.xml
@@ -31,7 +31,7 @@
             android:fadingEdgeLength="20dp"
             android:gravity="center_vertical"
             android:hint="@string/search_placeholder"
-            android:imeOptions="actionDone"
+            android:imeOptions="actionGo"
             android:inputType="textUri"
             android:paddingStart="20dp"
             android:paddingEnd="80dp"