Fix detection of keys on emoji popups (#1790)

mainly with long descriptions, but also fixes other quirks

Author: eranl

app/src/main/java/helium314/keyboard/keyboard/PopupKeysKeyboardView.java

@@ -148,19 +148,33 @@ private void showPopupKeysPanelInternal(final View parentView, final Controller
                 + getPaddingBottom();
 
         parentView.getLocationInWindow(mCoordinates);
+        final int containerY = y + CoordinateUtils.y(mCoordinates);
+        container.setY(containerY);
+
+        // This is needed for cases where there's also a text popup above this keyboard
+        final int panelMaxX = parentView.getMeasuredWidth() - getMeasuredWidth();
+        var panelFinalX = Math.max(0, Math.min(panelMaxX, x));
+        var center = panelFinalX + getMeasuredWidth() / 2;
+        var layoutGravity = center < pointX - getKeyboard().mMostCommonKeyWidth / 2?
+                        Gravity.RIGHT : center > pointX + getKeyboard().mMostCommonKeyWidth / 2? Gravity.LEFT : Gravity.CENTER_HORIZONTAL;
+
+        int containerAdjustedX = x;
+        if (getMeasuredWidth() < container.getMeasuredWidth()) {
+            containerAdjustedX = layoutGravity == Gravity.LEFT? panelFinalX : layoutGravity == Gravity.RIGHT
+                ? panelFinalX + getMeasuredWidth() - container.getMeasuredWidth()
+                : panelFinalX + (getMeasuredWidth() - container.getMeasuredWidth()) / 2;
+        }
+
         // Ensure the horizontal position of the panel does not extend past the parentView edges.
-        final int maxX = parentView.getMeasuredWidth() - container.getMeasuredWidth();
-        var finalX = Math.max(0, Math.min(maxX, x));
-        final int panelX = finalX + CoordinateUtils.x(mCoordinates);
-        final int panelY = y + CoordinateUtils.y(mCoordinates);
-        container.setX(panelX);
-        container.setY(panelY);
-
-        mOriginX = finalX + container.getPaddingLeft();
-        mOriginY = y + container.getPaddingTop();
-        var center = panelX + getMeasuredWidth() / 2;
-        // This is needed for cases where there's also a long text popup above this keyboard
-        controller.setLayoutGravity(center < pointX? Gravity.RIGHT : center > pointX? Gravity.LEFT : Gravity.CENTER_HORIZONTAL);
+        int containerMaxX = parentView.getMeasuredWidth() - container.getMeasuredWidth();
+        int containerFinalX = Math.max(0, Math.min(containerMaxX, containerAdjustedX));
+        int containerX = containerFinalX + CoordinateUtils.x(mCoordinates);
+        container.setX(containerX);
+        setTranslationX(panelFinalX - containerFinalX);
+        controller.setLayoutGravity(layoutGravity);
+
+        mOriginX = panelFinalX;
+        mOriginY = y + container.getPaddingTop() + (int) getY();
         controller.onShowPopupKeysPanel(this);
         final PopupKeysKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
         if (accessibilityDelegate != null

app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPageKeyboardView.java

@@ -211,13 +211,10 @@ public boolean isShowingPopupKeysPanel() {
 
     @Override
     public void setLayoutGravity(int layoutGravity) {
-        var layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
-                                                   ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.gravity = mDescriptionView.getMeasuredWidth() > mPopupKeysKeyboardView.getMeasuredWidth()?
-                                layoutGravity : Gravity.CENTER_HORIZONTAL;
+        var layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        layoutParams.gravity = layoutGravity;
         mPopupKeysKeyboardContainer.setLayoutParams(layoutParams);
         mDescriptionView.setLayoutParams(layoutParams);
-        mPopupKeysKeyboardView.setLayoutParams(layoutParams);
     }
 
     @Override
@@ -306,15 +303,6 @@ private void onLongPressed(final Key key) {
 
         final int x = mLastX;
         final int y = mLastY;
-        if (popupKeysPanel != null) {
-            final int translatedX = popupKeysPanel.translateX(x);
-            final int translatedY = popupKeysPanel.translateY(y);
-            popupKeysPanel.onDownEvent(translatedX, translatedY, mPointerId, 0 /* nor used for now */);
-            // No need of re-allowing parent later as we don't
-            // want any scroll to append during this entire input.
-            disallowParentInterceptTouchEvent(true);
-        }
-
         if (popupKeysPanel != null || descriptionPanel != null) {
             mPopupKeysKeyboardContainer.measure(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
@@ -329,6 +317,15 @@ private void onLongPressed(final Key key) {
             (popupKeysPanel != null? popupKeysPanel : descriptionPanel)
                             .showPopupKeysPanel(this, this, pointX, pointY, mEmojiViewCallback);
         }
+
+        if (popupKeysPanel != null) {
+            final int translatedX = popupKeysPanel.translateX(x);
+            final int translatedY = popupKeysPanel.translateY(y);
+            popupKeysPanel.onDownEvent(translatedX, translatedY, mPointerId, 0 /* nor used for now */);
+            // No need of re-allowing parent later as we don't
+            // want any scroll to append during this entire input.
+            disallowParentInterceptTouchEvent(true);
+        }
     }
 
     private PopupKeysPanel showDescription(Key key) {