wip

MozillaReality · Aug 29, 2018 · 06c8630 · 06c8630
1 parent 44a5f00
commit 06c8630
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/CustomKeyboardView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/CustomKeyboardView.java
@@ -335,10 +335,10 @@ public CustomKeyboardView(Context context, AttributeSet attrs, int defStyleAttr,
         mPaint.setTypeface(Typeface.create("sans-serif",Typeface.NORMAL));
 
         mPadding = new Rect(0, 0, 0, 0);
-        mMiniKeyboardCache = new HashMap<Key,View>();
+        mMiniKeyboardCache = new HashMap<>();
         mKeyBackground.getPadding(mPadding);
-        mKeyboardHoveredPadding = getContext().getResources().getDimension(R.dimen.keyboard_key_hovered_padding);
-        mKeyboardPressedPadding = getContext().getResources().getDimension(R.dimen.keyboard_key_pressed_padding);
+        mKeyboardHoveredPadding = getResources().getDimensionPixelSize(R.dimen.keyboard_key_hovered_padding);
+        mKeyboardPressedPadding = getResources().getDimensionPixelSize(R.dimen.keyboard_key_pressed_padding);
 
         mSwipeThreshold = (int) (500 * getResources().getDisplayMetrics().density);
         mDisambiguateSwipe = false;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/KeyboardWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/KeyboardWidget.java
@@ -140,8 +140,8 @@ public void onClick(View view) {
             }
         });
 
-        mKeyboardPopupLeftMargin = (int)getResources().getDimension(R.dimen.keyboard_popup_left_margin);
-        mKeyboardPopupTopMargin = (int)getContext().getResources().getDimension(R.dimen.keyboard_key_pressed_padding) * 2;
+        mKeyboardPopupLeftMargin = getResources().getDimensionPixelSize(R.dimen.keyboard_popup_left_margin);
+        mKeyboardPopupTopMargin  = getResources().getDimensionPixelSize(R.dimen.keyboard_key_pressed_padding) * 2;
 
         mPopupKeyboardLayer.setOnClickListener(new OnClickListener() {
             @Override
@@ -305,6 +305,8 @@ public void onLongPress(Keyboard.Key popupKey) {
             mPopupKeyboardview.setVisibility(View.VISIBLE);
             mPopupKeyboardLayer.setVisibility(View.VISIBLE);
 
+            mIsLongPress = true;
+
         } else if (popupKey.codes[0] == CustomKeyboard.KEYCODE_SHIFT) {
             mIsLongPress = !mIsCapsLock;
 
@@ -349,7 +351,10 @@ public void onKey(int primaryCode, int[] keyCodes, boolean hasPopup) {
                 handleText(".com");
                 break;
             default:
-                handleKey(primaryCode, keyCodes);
+                if (!mIsLongPress) {
+                    handleKey(primaryCode, keyCodes);
+                }
+
                 if (!hasPopup) {
                     mPopupKeyboardview.setVisibility(View.GONE);
                     mPopupKeyboardLayer.setVisibility(View.GONE);

diff --git a/app/src/main/res/layout/keyboard.xml b/app/src/main/res/layout/keyboard.xml
@@ -34,7 +34,7 @@
                     android:layout_width="@dimen/keyboard_width"
                     android:layout_height="@dimen/keyboard_height"
                     android:background="@color/void_color"
-                    android:alpha="0.0"
+                    android:alpha="0.5"
                     android:visibility="gone"/>
 
             <org.mozilla.vrbrowser.ui.CustomKeyboardView