android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 16 +---------- 1 file changed, 2 insertions(+), 14 deletions(-)
New commits: commit e67befd34063c1898e3e5e9e85fbe2efe1b7620c Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 11 12:58:23 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 12 01:40:46 2025 +0100 android: Drop unused LayerView.getPanZoomController Class GeckoLayerClient also has a getPanZoomController method and that one is actually used. Change-Id: Ief63b875a78295303c36c4a22bbb49825e8a4a63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193796 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java index 3b21964fb916..a83d4552f111 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -119,7 +119,6 @@ public class LayerView extends FrameLayout { } public GeckoLayerClient getLayerClient() { return mLayerClient; } - public PanZoomController getPanZoomController() { return mPanZoomController; } public ImmutableViewportMetrics getViewportMetrics() { return mLayerClient.getViewportMetrics(); commit 70ce1ba89f1052b688a3dcc8f2014b99ad73a338 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 11 12:54:03 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 12 01:40:35 2025 +0100 android: Drop always null LayerView.mTouchIntercepter As is more obvious since Change-Id: I127cc13d2390d948dc68cbd76cce4582d58eeda6 Author: Michael Weghorn <[email protected]> Date: Tue Nov 11 12:51:19 2025 +0100 android: Drop unused LayerView.setTouchIntercepter , this field is always null, so drop it and corresponding (unused) logic. Change-Id: I7f91b9c9ce66afaa3bf2e2366381bb87dd7bcd2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193795 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java index 22be74f6e995..3b21964fb916 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -27,7 +27,6 @@ import org.libreoffice.LOEvent; import org.libreoffice.LOKitShell; import org.libreoffice.LibreOfficeMainActivity; import org.libreoffice.R; -import org.mozilla.gecko.OnInterceptTouchListener; import org.mozilla.gecko.OnSlideSwipeListener; /** @@ -48,7 +47,6 @@ public class LayerView extends FrameLayout { private final SurfaceView mSurfaceView; private Listener mListener; - private OnInterceptTouchListener mTouchIntercepter; private final LibreOfficeMainActivity mContext; public LayerView(Context context, AttributeSet attrs) { @@ -107,21 +105,12 @@ public class LayerView extends FrameLayout { requestFocus(); } - if (mTouchIntercepter != null && mTouchIntercepter.onInterceptTouchEvent(this, event)) { - return true; - } - if (mPanZoomController != null && mPanZoomController.onTouchEvent(event)) { - return true; - } - if (mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event)) { - return true; - } - return false; + return mPanZoomController != null && mPanZoomController.onTouchEvent(event); } @Override public boolean onHoverEvent(MotionEvent event) { - return mTouchIntercepter != null && mTouchIntercepter.onTouch(this, event); + return false; } @Override
