Merge "Disable side swiping on RTL languages" into rvc-dev (46b4296b) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ResolverViewPager.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}