Jeff Brown
7885f63950
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
3d46889f89
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
15291c6f55
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
97683e8284
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
3453b1c584
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Philip Milne
3f8956d82b
Introduction of GridLayout.
...
Change-Id: Ia2ec315e7d29dcc5aa13b080fc6ce00708e9c034
2011-05-26 09:28:26 -07:00
Andreas Huber
73a4b2b3be
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
31beb6db09
Merge "framework/base changes to add new voicemail provider sample."
2011-05-26 07:45:28 -07:00
Daniel Sandler
8c1132e3ce
Merge "Framework support for Android Dreams."
2011-05-26 06:01:41 -07:00
satok
42c5a1666c
Fix internal variables and equals in SuggestionSpan
...
Bug: 4443922
- Instantiating other package's class for the name is complicated, so we changed the internal value for the notification target class from Class to String.
- Implement equals
Change-Id: Iaf7682be777f0027d33c9a3be4609ac01b6950ad
2011-05-26 19:21:35 +09:00
Joe Onorato
2a3c67c0e9
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
620d69d85b
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
b3094dbe29
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
1711e463a4
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
af4932a2be
Merge "Environment: Fix default mount point for external storage"
2011-05-25 20:36:05 -07:00
Dianne Hackborn
b2771f1a41
Merge "resolved conflicts for merge of 77dd616e to master"
2011-05-25 20:35:04 -07:00
Mike Lockwood
d4bdc7b4da
Environment: Fix default mount point for external storage
...
/mnt/sdcard is the real mount point. /sdcard is just a symlink.
Change-Id: If584e5cd31238d5b263de5bd72e179d53875d8c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-25 23:33:50 -04:00
Gloria Wang
98472cced0
Merge "For out of band timed text support (timed text in a separate file)."
2011-05-25 20:11:25 -07:00
satok
f9f0100862
Add Apis to send notifications when the suggestion was picked
...
- Due to a strong request from VoiceIME
Bug: 4443922
Change-Id: Ia539de0acf66053e0349daec459d75e36805f6bf
2011-05-26 11:02:31 +09:00
Gloria Wang
13bc8cde1c
For out of band timed text support (timed text in a separate file).
...
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
2011-05-25 17:53:29 -07:00
Romain Guy
f30c23d7bf
Merge "Rename test to be able to launch it on crespo."
2011-05-25 17:49:50 -07:00
Romain Guy
f9be16a9d4
Rename test to be able to launch it on crespo.
...
Change-Id: Ieb3e1f6a2e3effe5c4042ad170f195244c7e2158
2011-05-25 17:49:11 -07:00
Dianne Hackborn
fee1c69a49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Eric Laurent
6662576d8f
Merge "Issue 4364098: bluetooth SCO not working"
2011-05-25 16:22:36 -07:00
Eric Laurent
b06ac839dd
Issue 4364098: bluetooth SCO not working
...
AudioService does not need to unconditionally stop virtual calls
when the audio mode is changed from normal. Only stop virtual calls
that have been started from AudioService.
Change-Id: I75992d3655661e5910536a62dc8a8e0256d835e8
2011-05-25 16:03:01 -07:00
Andreas Huber
eb2f9c193d
Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.
...
Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
2011-05-25 15:57:07 -07:00
Jamie Gennis
4175a9085e
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
Jeff Brown
54bd4caeab
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
8e5799ed16
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
7d0fb57044
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
4e3ba25cc7
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
8ea6e6411c
am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '266ea6b091d572eaa153e70574da97752b97180b':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-25 14:35:34 -07:00
Jeff Brown
af685f3bb5
am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '85a7f99cfe066f054d4ddf4feb737f0395c9943b':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-25 14:35:21 -07:00
Jeff Brown
16330e2496
am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '94e838f6e113f8cad30086a18f68da99976101d0':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-25 14:34:57 -07:00
Jeff Brown
4bd89fb00f
am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '82e4373ed3775395a23d161e58c003e82511921a':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:34:48 -07:00
Jeff Brown
266ea6b091
Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:54 -07:00
Jeff Brown
85a7f99cfe
Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:50 -07:00
Jeff Brown
94e838f6e1
Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:44 -07:00
Jeff Brown
82e4373ed3
Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:38 -07:00
James Dong
1b9b34adf7
Merge "Convert line breaks to Unix style"
2011-05-25 12:37:07 -07:00
Jamie Gennis
dd386ccb90
SurfaceTexture: disable a failing test.
...
The SurfaceTextureSyncModeWaitRetire test was disabled. It is failing
because of the synchronization hacks that were added to SurfaceTexture
to work around bugs in vendor device drivers.
Change-Id: I09a74538bfe14a04833acb6847471e00826cc7fc
2011-05-25 12:27:33 -07:00
Jamie Gennis
44e9e0d825
SurfaceTexture: fix an error check in dequeueBuffer.
...
This change fixes the MIN_UNDEQUEUED_BUFFERS error check in
dequeueBuffer. The check should only be performed if a buffer has been
queued since the last time the buffer count was changed by the client.
The check must be applied conditionally because video decoders require
all the bufferes to be dequeued and registered before beginning the
decode.
Change-Id: I08d96b380544e395c2fcf0f3983a199bfd695b09
2011-05-25 12:27:33 -07:00
Jamie Gennis
a218715a7f
SurfaceTexture: clean up some comments, tests, etc.
...
This change fixes up some stale comments, member variable names, log
messages and disables a failing test.
Change-Id: Ic1d3344b18066cf710e4a42838b2417c6b1f2f6c
2011-05-25 12:27:33 -07:00
Kristian Monsen
4ece6db47e
Merge "Merge chromium to 10.0.634.0: Compile fix"
2011-05-25 12:09:56 -07:00
Kristian Monsen
1fae3cf246
Merge "Merge Chromium at 10.0.634.0: Add autofill fax string"
2011-05-25 12:09:46 -07:00
Adam Powell
50f7fb9ca1
Merge "Action bar tab layout"
2011-05-25 12:01:00 -07:00
Adam Powell
f8ac6b7394
Action bar tab layout
...
Sync with UX on action bar tab layout behavior.
Make action bar tabs behave better with configuration changes.
LinearLayout now supports largest child measurement in unspecified
mode.
Change-Id: Id520641715a61c07e64124a0c5a70912996c98a0
2011-05-25 11:55:56 -07:00
Joe Onorato
cfb046dead
am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
Make adb shell am display-size persistent.
2011-05-25 11:46:28 -07:00
Joe Onorato
2c09a9c0e9
am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
Make adb shell am display-size persistent.
2011-05-25 11:43:06 -07:00
Joe Onorato
5520610cb2
Merge "Make adb shell am display-size persistent." into honeycomb-mr2
2011-05-25 11:40:59 -07:00