Bug 909940 - Disable updating the URL bar type for HTC keyboards. r=cpeterson

mobile/android/base/BrowserToolbar.java

@@ -1501,6 +1501,10 @@ public class BrowserToolbar extends GeckoRelativeLayout
 
         mGo.setVisibility(View.VISIBLE);
 
+        if (InputMethods.shouldDisableUrlBarUpdate(mUrlEditText.getContext())) {
+            return;
+        }
+
         int imageResource = R.drawable.ic_url_bar_go;
         String contentDescription = mActivity.getString(R.string.go);
         int imeAction = EditorInfo.IME_ACTION_GO;

mobile/android/base/InputMethods.java

@@ -61,6 +61,11 @@ final class InputMethods {
         return METHOD_HTC_TOUCH_INPUT.equals(inputMethod);
     }
 
+    public static boolean shouldDisableUrlBarUpdate(Context context) {
+        String inputMethod = getCurrentInputMethod(context);
+        return METHOD_HTC_TOUCH_INPUT.equals(inputMethod);
+    }
+
     public static boolean shouldDelayUrlBarUpdate(Context context) {
         String inputMethod = getCurrentInputMethod(context);
         return METHOD_SAMSUNG.equals(inputMethod) ||