Skip to content

Commit 48946cf

Browse files
authored
[codex] Stabilize Android floating window touch handling (#4817)
1 parent 26ae812 commit 48946cf

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

src/android/src/FloatingWindowGFG.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import android.view.LayoutInflater;
1616
import android.view.MotionEvent;
1717
import android.view.View;
18+
import android.view.ViewConfiguration;
1819
import android.view.ViewGroup;
1920
import android.view.WindowManager;
2021
import android.view.inputmethod.InputMethodManager;
@@ -106,6 +107,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
106107
webView.measure(100, 100);
107108
webView.setAlpha(Float.valueOf(FloatingHandler._alpha) / 100.0f);
108109
settings.setBuiltInZoomControls(true);
110+
settings.setDisplayZoomControls(false);
109111
settings.setUseWideViewPort(true);
110112
settings.setDomStorageEnabled(true);
111113
QLog.d("QZ","loadurl");
@@ -173,7 +175,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
173175
float initialTouchX;
174176
float initialTouchY;
175177
boolean isDragging = false;
176-
final int TOUCH_THRESHOLD = 10; // Threshold for distinguishing tap vs drag
178+
final int TOUCH_THRESHOLD = ViewConfiguration.get(FloatingWindowGFG.this).getScaledTouchSlop(); // density-aware threshold for distinguishing tap vs drag
177179

178180
@Override
179181
public boolean onTouch(View v, MotionEvent event) {

src/inner_templates/floating/hfloating.htm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ <h3>Select metrics to display</h3>
511511
event.target.closest("#metric-selector") === null &&
512512
event.target.closest("#complete-panel") === null &&
513513
event.target.closest(".quick-actions") === null &&
514+
event.target.closest("button") === null &&
514515
!event.target.classList.contains("quick-action-btn")) {
515516
toggleControlsPanel();
516517
}

0 commit comments

Comments
 (0)