content/public/android/java/src/org/chromium/content/browser/ZoomManager.java - Issue 11568042: Some initial changes for manipulating the top controls positions on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

Issue 11568042: Some initial changes for manipulating the top controls positions on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review comments Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | content/public/android/java/src/org/chromium/content/common/CommandLine.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

index 1aabd0f64917b234080335ae491b288ce7ff24d7..8e8df31ce40923979718cfc17b23f9fa78aa289e 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

@@ -145,7 +145,10 @@ class ZoomManager {

// TODO: Need to deal with multi-touch transition

mMultiTouchListener.setTemporarilyIgnoreDetectorEvents(false);

try {

- return mMultiTouchDetector.onTouchEvent(event);

+ boolean inGesture = isScaleGestureDetectionInProgress();

+ boolean retVal = mMultiTouchDetector.onTouchEvent(event);

+ if (event.getActionMasked() == MotionEvent.ACTION_UP && !inGesture) return false;

+ return retVal;

} catch (Exception e) {

Log.e(TAG, "ScaleGestureDetector got into a bad state!", e);

assert(false);