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
James Dong
e8b26dcec7
Extract embedded cover art (aka poster frame) in mp4 files
...
Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
2011-05-26 11:31:16 -07:00
Wink Saville
7f9d3210cb
am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
...
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
Remove or disable some verbose debugging.
2011-05-26 11:07:18 -07:00
Dianne Hackborn
590ec479fd
am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
Spiffy new compatibility mode UI.
2011-05-26 11:02:52 -07:00
Wink Saville
f55e0346a5
Merge "Remove or disable some verbose debugging." into honeycomb-LTE
2011-05-26 10:55:46 -07:00
Scott Main
3453b1c584
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Dianne Hackborn
80ef2a9745
am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
Spiffy new compatibility mode UI.
2011-05-26 10:00:00 -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
Wink Saville
3b13b2c9d1
Remove or disable some verbose debugging.
...
Change-Id: I930689502f2a76bf72e315331d66a9259135c6b8
2011-05-26 06:36:08 -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
Dianne Hackborn
42f8094c06
Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
2011-05-25 21:18:36 -07:00
Dianne Hackborn
36cd41f8ef
Spiffy new compatibility mode UI.
...
Change-Id: I1207eaafae59a434fcc979ad60a83e2d685288af
2011-05-25 21:08:37 -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
Jeff Brown
3f5b95b05e
am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit 'a4e747445ac0bdd2cc561802c9c7abfedbd0d981':
Touch pad UX improvements.
2011-05-25 19:19:01 -07:00
Jeff Brown
a4e747445a
am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit 'fa574c0e0ce7f84eea34e96dededea35329dbd18':
Touch pad UX improvements.
2011-05-25 19:16:39 -07:00
Jeff Brown
fa574c0e0c
Merge "Touch pad UX improvements." into honeycomb-mr2
2011-05-25 19:15:24 -07:00
Jeff Brown
538881e183
Touch pad UX improvements.
...
Fade the pointer spot when swiping or performing a freeform
gesture.
Support configuring the gesture mode in the device IDC file.
Added workaround for devices that report individual finger
movements one at a time instead of all at once.
Bug: 4124987
Change-Id: I44628b00382ad59306e4ec5c4717d69cc6fbebb8
2011-05-25 19:08:49 -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
Jeff Brown
fd86ab8a0f
am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-25 19:00:42 -07:00
Jeff Brown
919a2efeef
am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-25 18:58:22 -07:00
Jeff Brown
5665770bc4
Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 18:55:52 -07:00
Jeff Brown
2cb7981e70
Fix deadlock in dispatcher. (DO NOT MERGE)
...
This regression was caused due to a bad cherry-pick / merge.
Change-Id: I79e84285bbfd4cd4b66681461543fb185b60d3ba
2011-05-25 18:53:49 -07:00
Adam Powell
31caa0e6e5
am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit 'b017632dad1c6a89cbdc02a9fa7a0029a7dbac12':
Updated popup dialog 9 patches (light)
2011-05-25 18:16:48 -07:00
Adam Powell
b017632dad
am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit '5a328f0f7cf88a2b917db15aec9f9d1714db3e06':
Updated popup dialog 9 patches (light)
2011-05-25 18:12:40 -07:00
Adam Powell
5a328f0f7c
Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
2011-05-25 18:10:22 -07: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
Joe Onorato
7f818d0a97
am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '94a06bd8db0d19be3108bd2ee709373f80318c8b':
Move status bar icons to sw600.
2011-05-25 17:42:27 -07:00
Joe Onorato
94a06bd8db
am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
Move status bar icons to sw600.
2011-05-25 17:39:04 -07:00
Joe Onorato
6fb093b14b
Merge "Move status bar icons to sw600." into honeycomb-mr2
2011-05-25 17:36:54 -07:00
Joe Onorato
07949e9082
Move status bar icons to sw600.
...
Change-Id: Idb85252b30cca90704f1cfebb7abce522e21b8a3
2011-05-25 17:35:35 -07:00
Justin Ho
33fcd365c9
Updated popup dialog 9 patches (light)
...
Change-Id: I04c55e02b76dd676e3e11fd9d5b63a685019bbf2
2011-05-25 16:59:32 -07:00
Dianne Hackborn
fee1c69a49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Jeff Hamilton
7c324a3f7d
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f':
Swap Mifare for MIFARE.
2011-05-25 16:32:12 -07:00
Joe Onorato
fce12613ed
am a2a605a9: am c112118a: Merge "move resources" into honeycomb-mr2
...
* commit 'a2a605a958ae8443e54b7a2607bc71501682f9ae':
move resources
2011-05-25 16:25:02 -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