Merge "Disable side swiping on RTL languages" into rvc-dev am: 46b4296beb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11880480

Change-Id: I41be3c664315f158f455857d5baff5a24c43ec27
This commit is contained in:
Antoan Angelov
2020-06-18 14:29:17 +00:00
committed by Automerger Merge Worker

View File

@@ -74,12 +74,16 @@ public class ResolverViewPager extends ViewPager {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
/**
* Sets whether swiping sideways should happen.
* <p>Note that swiping is always disabled for RTL layouts (b/159110029 for context).
*/
void setSwipingEnabled(boolean swipingEnabled) { void setSwipingEnabled(boolean swipingEnabled) {
mSwipingEnabled = swipingEnabled; mSwipingEnabled = swipingEnabled;
} }
@Override @Override
public boolean onInterceptTouchEvent(MotionEvent ev) { public boolean onInterceptTouchEvent(MotionEvent ev) {
return mSwipingEnabled && super.onInterceptTouchEvent(ev); return !isLayoutRtl() && mSwipingEnabled && super.onInterceptTouchEvent(ev);
} }
} }