Jeff Brown
db486ebb3c
am 14c45e2e: (-s ours) am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '14c45e2ef99bf87848a379879dbf8f4090799307':
Support chorded fallback keys. (DO NOT MERGE)
2011-05-26 11:39:22 -07:00
Jeff Brown
fbb71d251b
am 92693bce: (-s ours) am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '92693bce936c1cdbfd9e1b81c4eaf1fe9cf5568e':
Fix focused application handle. (DO NOT MERGE)
2011-05-26 11:39:10 -07:00
Jeff Brown
9bbfc2c412
am 54bd4cae: (-s ours) am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '54bd4caeabc5daddfce56269949daccd8e7bf661':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-26 11:38:58 -07:00
Jeff Brown
fd8a76b9d1
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-26 11:38:48 -07:00
Jeff Brown
eed8d87a0d
am 7d0fb570: (-s ours) am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '7d0fb57044576fd4bbaf9683997bab288c3b759c':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-26 11:38:35 -07:00
Jeff Brown
966b5f9055
am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-26 11:38:24 -07:00
Scott Main
31c9c2f91e
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Andreas Huber
12673736ec
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
2011-05-26 08:52:55 -07:00
Debashish Chatterjee
de335ca8ec
Merge "framework/base changes to add new voicemail provider sample."
2011-05-26 07:45:28 -07:00
Daniel Sandler
198b7d0d9e
Merge "Framework support for Android Dreams."
2011-05-26 06:01:41 -07:00
Joe Onorato
db53a23dc0
am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
Make adb shell am display-size persistent.
2011-05-25 21:29:07 -07:00
Dianne Hackborn
09f8d45589
am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 21:28:39 -07:00
Amith Yamasani
f0654ca13d
am 361c286d: (-s ours) am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
...
* commit '361c286d095a22152750e73b01bfc6b1d2076a4d':
More preference item visual adjustments for smaller tablets. DO NOT MERGE
2011-05-25 21:28:31 -07:00
Russell Brenner
48567a8ad8
am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
...
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 21:27:41 -07:00
Mike Lockwood
cba23fa4cd
Merge "Environment: Fix default mount point for external storage"
2011-05-25 20:36:05 -07:00
Dianne Hackborn
128682606b
Merge "resolved conflicts for merge of 77dd616e to master"
2011-05-25 20:35:04 -07:00
Gloria Wang
4bb4da8653
Merge "For out of band timed text support (timed text in a separate file)."
2011-05-25 20:11:25 -07:00
Romain Guy
0d56207474
Merge "Rename test to be able to launch it on crespo."
2011-05-25 17:49:50 -07:00
Dianne Hackborn
717d0dee49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Eric Laurent
2f3a10cff5
Merge "Issue 4364098: bluetooth SCO not working"
2011-05-25 16:22:36 -07:00
Jamie Gennis
e2c8543391
Merge changes I09a74538,I08d96b38,Ic1d3344b
...
* changes:
SurfaceTexture: disable a failing test.
SurfaceTexture: fix an error check in dequeueBuffer.
SurfaceTexture: clean up some comments, tests, etc.
2011-05-25 15:54:35 -07:00
James Dong
53536d771e
am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:57:45 -07:00
James Dong
2d93c9cbd2
am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:54:19 -07:00
James Dong
f050cd0782
Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
2011-05-25 14:51:52 -07:00
Jeff Brown
76a5b2ae10
am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit '6ef142a05081333f104abde225af9eccd1b92d6c':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-25 14:49:20 -07:00
Jeff Brown
8b8391edb3
am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '53c3d5b1d5ba00c7be444a358a5fa678de44f6cd':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-25 14:46:57 -07:00
Jeff Brown
98d1f99704
am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '8148cc3e47e50c916066e2fed562618b5827188f':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-25 14:46:53 -07:00
Jeff Brown
6f5893ff6c
am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit 'e8dc05aa6d2f4138729438281485ca10d854dc8d':
Add a sprite controller. (DO NOT MERGE)
2011-05-25 14:46:50 -07:00
Jeff Brown
974a08d53e
am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
...
* commit 'd5358874e2cc90be3d7d3370ef7342c96c212451':
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
2011-05-25 14:46:37 -07:00
Jeff Brown
e740fb1e4d
am dd2534c2: am 7157f6fe: Allow batching samples onto the pending motion event. (DO NOT MERGE)
...
* commit 'dd2534c2910e851cc8a2e2adeac091df252b503a':
Allow batching samples onto the pending motion event. (DO NOT MERGE)
2011-05-25 14:46:33 -07:00
Jeff Brown
3c4397f7ca
am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
...
* commit 'c5c7e047d1a1c56ba55bdfea9391d1907f355dbc':
Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
2011-05-25 14:46:25 -07:00
Jeff Brown
32d7ba7276
am 6f37a7f9: am eea0aa25: Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
...
* commit '6f37a7f9b6f83fbcc919dc452e72838623e8bb5d':
Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
2011-05-25 14:46:21 -07:00
Jeff Brown
7709cf35b7
am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit 'b416e241db85b678cdfcdee1c74a7f356a5554ef':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-25 14:45:51 -07:00
Jeff Brown
b428eb166c
am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '325bd07b311f8ba68079000e9fe8afbcc076d7b6':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-25 14:43:37 -07:00
Jeff Brown
01fdb1bb41
am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '86ea1f5f521981d075aef56f11693e4f3bc32fdb':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-25 14:43:34 -07:00
Jeff Brown
12e858f392
am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit 'a6dbfdd3a858aac52cc87f80f91e8eef7d613605':
Add a sprite controller. (DO NOT MERGE)
2011-05-25 14:43:26 -07:00
Jeff Brown
a7cb96151a
am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
...
* commit '5ced76a14350db56f1a80f00076f8be3d982c389':
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
2011-05-25 14:43:23 -07:00
Jeff Brown
9914462826
am 7157f6fe: Allow batching samples onto the pending motion event. (DO NOT MERGE)
...
* commit '7157f6fe13ab7e2fef44cc33c95d1c531418220f':
Allow batching samples onto the pending motion event. (DO NOT MERGE)
2011-05-25 14:43:20 -07:00
Jeff Brown
3255c47bad
am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
...
* commit 'd0132e8e187ebf69bf4d2d6d0ef0027ff3f7a727':
Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
2011-05-25 14:43:16 -07:00
Jeff Brown
05d1d05d89
am eea0aa25: Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
...
* commit 'eea0aa25870d49e381567f09abbfb41de52a5a32':
Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
2011-05-25 14:43:13 -07:00
Jeff Brown
d33554dab5
am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '16f1d2ca00a2c793e510edba5266a6d0998efbfc':
Support chorded fallback keys. (DO NOT MERGE)
2011-05-25 14:42:30 -07:00
Jeff Brown
be87c6df40
am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '32b7bcc877e6e3de97d3ee129790a6f1eae400fc':
Fix focused application handle. (DO NOT MERGE)
2011-05-25 14:42:27 -07:00
Jeff Brown
c7e80e70bf
am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '8ea6e6411c9616da4add0d6304a7b2f453356889':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-25 14:42:24 -07:00
Jeff Brown
9a2c1ca2dd
am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'af685f3bb566f297deee1615d55d4f33d5580ba3':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-25 14:42:20 -07:00
Jeff Brown
689e53cc82
am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '16330e249663fed890df0e95fce4016c2971120a':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-25 14:42:06 -07:00
Jeff Brown
446b400910
am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4bd89fb00f319c5d6d4f17b39fd4c0b3dc827ad1':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:42:01 -07:00
Jeff Brown
d3e6d3e763
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
Added a new PointerIcon API (hidden for now) for loading
pointer icons.
Fixed a starvation problem in the native Looper's sendMessage
implementation which caused new messages to be posted ahead
of old messages sent with sendMessageDelayed.
Redesigned the touch pad gestures to be defined in terms of
more fluid finger / spot movements. The objective is to reinforce
the natural mapping between fingers and spots which means there
must not be any discontinuities in spot motion relative to
the fingers.
Removed the SpotController stub and folded its responsibilities
into PointerController.
Change-Id: Ib647dbd7a57a7f30dd9c6e2c260df51d7bbdd18e
2011-05-25 14:37:17 -07:00
Jeff Brown
fa785531f7
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
...
Some drivers report individual finger updates one at a time
instead of all at once. When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data. Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.
This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.
Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.
Change-Id: Ibc6abf8af027d9003011ac75caa12941080caba3
2011-05-25 14:37:16 -07:00
Jeff Brown
576d0398bf
am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '36001a9f48a1ff70504db4d2d8039f4a5f385caa':
Support chorded fallback keys. (DO NOT MERGE)
2011-05-25 14:35:58 -07:00
Jeff Brown
31c7d3db5f
am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'c2d200d4fbf3b0a39bf7518cd9d97afec061c6bb':
Fix focused application handle. (DO NOT MERGE)
2011-05-25 14:35:42 -07:00