Merge remote-tracking branch 'origin/lineage-20.0' into v1-t (617d8b63) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/GestureController.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ import android.view.GestureDetector;
		import android.view.MotionEvent;

		public class GestureController {
		private static final int GESTURE_THRESHOLD = 20;
		private static final int GESTURE_THRESHOLD = 40;
		private GestureDetector mGestureDetector;
		private GestureControlListener mGestureControlListener;

		@@ -190,7 +190,9 @@ public class GestureController {
		float currentX = currentEvent.getX();
		float currentY = currentEvent.getY();
		if (Math.abs(currentX - startX) >= GESTURE_THRESHOLD) {
		if (mFullRect.contains((int) startX, (int) startY)) {
		return Type.SEEK;
		}
		} else if (Math.abs(currentY - startY) >= GESTURE_THRESHOLD) {
		if (mBrightnessRect.contains((int) startX, (int) startY)) {
		return Type.BRIGHTNESS;

+4 −4

Original line number	Diff line number	Diff line
		@@ -168,13 +168,13 @@ public class GestureControllerOverlay extends FrameLayout implements

		@Override
		protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
		if (changed && mGestureController != null) {
		mGestureController.setRect(left, top, right, bottom);
		}

		int h = bottom - top;
		int w = right - left;

		if (changed && mGestureController != null) {
		mGestureController.setRect(left, top + h / 4, right, bottom);
		}

		if (mCurrentIndicator != null) {
		layoutCenteredView(mCurrentIndicator, 0, 0, w, h);
		}