4568 Commits

Author SHA1 Message Date
Grace Kloba
aeeb1a84aa am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
6dc9232c1c am a66baccc: Merge "Do not merge" into eclair
Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
  Do not merge
2010-01-20 18:35:24 -08:00
Mike Reed
a66baccc8f Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
Grace Kloba
f8c7d06ffa am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp

* commit '89e3c1ab017717b619b27ca312d87918981004ca':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-20 17:40:30 -08:00
Grace Kloba
8f9fbb0c45 Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=2385061
2010-01-20 17:35:50 -08:00
Mike Reed
12bcbdc681 Do not merge
port stretchy from master
2010-01-20 16:27:36 -05:00
Adam Powell
97b108532f am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp

* commit '5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
  Edge of screen slop detection for ScaleGestureDetector.
2010-01-19 19:59:19 -08:00
Adam Powell
380b525220 Edge of screen slop detection for ScaleGestureDetector. 2010-01-19 16:33:46 -08:00
Amith Yamasani
658dc0d4b0 am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
Merge commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp

* commit 'b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
  Security fix in accessibility - don't read out password. # 2371557
2010-01-19 11:53:59 -08:00
Amith Yamasani
b35b8c1334 Merge "Security fix in accessibility - don't read out password. # 2371557" into eclair 2010-01-19 11:50:39 -08:00
Grace Kloba
76c29e633f am f167c4bf: DO NOT MERGE
Merge commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3' into eclair-plus-aosp

* commit 'f167c4bfca57b5467f40f6cf25e10fb12183a9f3':
  DO NOT MERGE
2010-01-18 23:43:37 -08:00
Grace Kloba
b869c59446 am 17b14bd3: DO NOT MERGE
Merge commit '17b14bd36aba265ac6bffc2626d8db29713d7c45' into eclair-plus-aosp

* commit '17b14bd36aba265ac6bffc2626d8db29713d7c45':
  DO NOT MERGE
2010-01-18 23:43:32 -08:00
Grace Kloba
55d791e74e am 5a0bf1f0: DO NOT MERGE
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp

* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
  DO NOT MERGE
2010-01-18 23:43:27 -08:00
Grace Kloba
8d4baa7893 am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit 'd79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp

* commit 'd79d1c72991e587294432e80d091e3ae26a0c103':
  If ZoomButttonsController detects more than one pointer,
2010-01-18 23:43:20 -08:00
Grace Kloba
3648f949ef am f080a5ad: Merge "DO NOT MERGE" into eclair
Merge commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp

* commit 'f080a5adf6d59bade46815ee605a3829e5c3ab89':
  DO NOT MERGE
2010-01-18 23:43:14 -08:00
Jim Miller
84928fa93c am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp

* commit '813d2d86789d1c2e705c4d11d052ad649e6bac84':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-18 23:43:01 -08:00
Grace Kloba
f167c4bfca DO NOT MERGE
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
2010-01-18 15:30:59 -08:00
Grace Kloba
17b14bd36a DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.

This should fix the weird state Bart got in with
m.wikipedia.org.
2010-01-18 15:29:46 -08:00
Grace Kloba
5a0bf1f03e DO NOT MERGE
Remove testing (enable plugin) code.

No reflow when zoom in, auto reflow when zoom out.

Fix http://b/issue?id=2375955
2010-01-18 15:29:46 -08:00
Grace Kloba
d79d1c7299 Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 2010-01-18 15:21:38 -08:00
Grace Kloba
f080a5adf6 Merge "DO NOT MERGE" into eclair 2010-01-18 15:21:31 -08:00
Grace Kloba
d4d1d6eca0 If ZoomButttonsController detects more than one pointer,
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
2010-01-18 10:43:59 -08:00
Jim Miller
813d2d8678 Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 2010-01-15 17:20:29 -08:00
Grace Kloba
19c9df3c1d DO NOT MERGE
Bring back +/- when panning. Dismiss it when pinching.
2010-01-15 16:35:40 -08:00
Jim Miller
2cd1e6eda9 Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.

Instead, we'll handle this separately in lockscreen.
2010-01-15 16:20:36 -08:00
Grace Kloba
88196464e9 am 4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp

* commit '4d69ac6695246b8df06a6583044dc4712d81a956':
  DO NOT MERGE
2010-01-14 19:32:45 -08:00
Grace Kloba
c8cab72521 am d1019a99: Merge "DO NOT MERGE" into eclair
Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE
2010-01-14 19:32:39 -08:00
Grace Kloba
4d69ac6695 Merge "DO NOT MERGE" into eclair 2010-01-14 19:29:09 -08:00
Amith Yamasani
91ccdb5f10 Security fix in accessibility - don't read out password. # 2371557
Check for password type before send accessibility event.
[Submitting for Svet]
2010-01-14 18:56:02 -08:00
Grace Kloba
fd787ba79d DO NOT MERGE
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.

Fix http://b/issue?id=2370552
2010-01-14 18:30:45 -08:00
Grace Kloba
76336f2ccf DO NOT MERGE
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.

Fix http://b/issue?id=2375232
2010-01-14 18:18:41 -08:00
Grace Kloba
181963a020 am 196926b9: Merge "DO NOT MERGE" into eclair
Merge commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c' into eclair-plus-aosp

* commit '196926b9803e586b06b753a0a02a6b0ba2e5a98c':
  DO NOT MERGE
2010-01-14 09:41:36 -08:00
Grace Kloba
5f01d7e268 DO NOT MERGE
Use the common ScaleGestureDetector to detect the
multi-touch motion.

Check both supportZoom and getBuiltInZoomControls
to decide whether enable the multi-touch behavior.
This should the new pinch behavior only replace the
old +/-.

Fix http://b/issue?id=2363260

Only update textWrapScale if it is different. This
should fix the performance decrease caused by initial
multi-touch code.

Fix http://b/issue?id=2371694
2010-01-13 22:02:53 -08:00
Adam Powell
b5a5a39716 am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - scope reduced. N1 screen can\'t reliably handle translation and scaling at the same time." into eclair
Merge commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe' into eclair-plus-aosp

* commit '56a17690b0b9dc2a2e15ef38a37cc4c403c614fe':
  TransformGestureDetector is now ScaleGestureDetector - scope reduced.
2010-01-13 18:04:39 -08:00
Adam Powell
ae542ff055 TransformGestureDetector is now ScaleGestureDetector - scope reduced.
N1 screen can't reliably handle translation and scaling at the same time.
2010-01-13 17:08:31 -08:00
Adam Powell
202a6734fd am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:15:43 -08:00
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00
Grace Kloba
ba5220fc0c am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
2010-01-12 10:02:48 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
2010-01-12 10:02:40 -08:00
Grace Kloba
ce63c639e9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
c93c70c4b8 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
Couple of tweak for multi-touch in WebView.

1. If we can't zoom, don't get in multitouch mode.
   This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
   zoom is called before.
4. Change the width for nativeSetSize, which was modified
   in the last check-in. The new logic should make both
   msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
   out the jitter just before lifting the finger.

Fix http://b/issue?id=2360032
2010-01-12 09:58:43 -08:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
2010-01-11 14:16:29 -08:00
Tom Taylor
2bb1f87089 am 1edd8277: Merge "Hide unused fields" into eclair
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
2010-01-11 14:15:51 -08:00
Tom Taylor
1edd827744 Merge "Hide unused fields" into eclair 2010-01-11 14:11:46 -08:00
Grace Kloba
6c87c77de4 am a2b0d38f: First draft of multitouch in the WebView.
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp

* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
  First draft of multitouch in the WebView.
2010-01-11 10:47:21 -08:00
Grace Kloba
a2b0d38f8c First draft of multitouch in the WebView.
Currently we just handle a simple pinch action. We
will wait for framework support for more complicated
gesture.

When pinch in the webview, zoom level will be changed
on the fly. But we won't re-wrap the text until user
action like double tap, rotate screen.

Double tap will re-layout the page and wrap the text
to the screen width. We try to keep the spot you
tapped at the same place on the screen after relayout.
If the block after relayout fully fit on the current
screen, we will center it for easy reading.

Fix http://b/issue?id=2360032
2010-01-11 10:41:40 -08:00