36291 Commits

Author SHA1 Message Date
Jason Sams
7a21ee6148 Fix crash with extended debugging.
Change-Id: I982a7c7ea7ccae074be5254032c43a862137747a
2010-11-16 12:19:37 -08:00
Mike Lockwood
af376a5427 Merge "MediaScanner: Always use mime type provided to the media scanner" 2010-11-16 11:16:03 -08:00
Andreas Huber
7a218d7a3a Merge "Make sure live streamed http live content does not start playing from the very beginning." 2010-11-16 11:13:43 -08:00
Dianne Hackborn
3a57fb9e9c Fix issue #3191573: PreferenceFragment.onActivityResult cannot
launch a new fragment on the same call.

There were some problems with the API design where you could do
things in such a way that a back stack entry that was not at the
top would get popped.  Ouch.  Hopefully this change prevents that
from being able to happen.

Change-Id: I8cbc952e12ddd231ff6c84b6e9bbf5125f449f04
2010-11-16 10:50:31 -08:00
Eric Rowe
248caac22e Merge "Remove asserts in bluetooth test utils" 2010-11-16 10:41:11 -08:00
Eric Rowe
16013b37cb Merge "Add acceptPair method to BT stress." 2010-11-16 10:39:24 -08:00
Andreas Huber
8c7cb61cff Make sure live streamed http live content does not start playing from the very beginning.
The different bandwidth streams may not all start on the same seqnum, so switching bandwidths may fail lateron if we start playing from the very beginning.

Change-Id: I03df8d1f44b3f7b4713d381a3d97847997e3ee59
related-to-bug: 2368598
2010-11-16 10:32:13 -08:00
Adam Powell
850a4c6688 Merge "Fix bug 3198503 - NPE at MenuPopupHelper.dismiss" 2010-11-16 10:27:54 -08:00
Adam Powell
ed8b403cc8 Fix bug 3198503 - NPE at MenuPopupHelper.dismiss
Make sure dismiss() can be called even when the popup is not currently
showing.

Change-Id: I48077d8b3bfe0df04bceeb056ed54cbd79a6e660
2010-11-16 10:22:35 -08:00
Adam Powell
75663ceec4 Merge "Add protection for ActionMode-related window callbacks that may not implement new methods." 2010-11-16 10:18:04 -08:00
Brad Fitzpatrick
f342ac9182 am 8443dd16: am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '8443dd16c2dfd5f56e33fbe76129f56e6a83b23e':
  DropBox: Read until the end of stream has been reached
2010-11-16 09:40:52 -08:00
Brad Fitzpatrick
8443dd16c2 am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
  DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
383e95e245 Merge "DropBox: Read until the end of stream has been reached" 2010-11-16 09:22:31 -08:00
Xia Wang
4e74e181d1 am f55c9736: am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit 'f55c973637f2b17de0f5543260e7e409a8635112':
  Add Wi-Fi connection functional tests.
2010-11-16 09:18:48 -08:00
Xia Wang
f55c973637 am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
  Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -08:00
Xia Wang
d0a8f54a5b Merge "Add Wi-Fi connection functional tests." into gingerbread 2010-11-16 09:14:46 -08:00
Mike Lockwood
858caeaaa1 MediaScanner: Always use mime type provided to the media scanner
BUG: 3179926

Change-Id: Ib94aea43b83658e3ab31c5eacf7a5135cd14822a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-16 11:28:42 -05:00
Cary Clark
21a97ef9f2 make tap initiated scrolls more reliable
Programmatic scrolls fail when the scroll has not had a chance
to start. In this case, the current position equals the last
position; the logic erroneously cancels the scrolls, assuming
that in this case the scroll has finished.

Also, new scrolls should cancel the old velocity whether they
are animated or not.

This has a companion change in external/webkit, which is not
required, but makes tap initiated scrolls work more reliably.

bug:1331125
bug:3099569
Change-Id: I80ae8e8cdefce2d8d09532f79d1b2e1ae4738fa6
2010-11-16 10:22:11 -05:00
Christian Lindeberg
e9f1881521 DropBox: Read until the end of stream has been reached
Read the requested length or until the end of the input stream
has actually been reached.

Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
2010-11-16 09:57:54 +01:00
Adam Powell
bf85f43e48 Add protection for ActionMode-related window callbacks that may not
implement new methods.

Change-Id: Id4463ee97366187ba43b0966f79aa8bd34f7fa1d
2010-11-15 22:16:50 -08:00
Adam Powell
debf3bed9e Fix bug 2948913 - provide lifecycle notifications for action modes
Change-Id: I432e29a7bddb18bc32dfbe21a8ecd7d83158e3a0
2010-11-15 20:59:29 -08:00
James Dong
9d305170dc Merge "Add initial stereo capture support for AAC encoder" 2010-11-15 17:59:42 -08:00
Joe Onorato
8a6b2e52af Merge "Add the quick settings panel. There's currently nothing in it." 2010-11-15 17:48:33 -08:00
Joe Onorato
8a576713e2 Add the quick settings panel. There's currently nothing in it.
Change-Id: I71195c7b0bd2b902da1c60527b6e23964b1ea4fc
2010-11-15 17:45:03 -08:00
Vasu Nori
f598b242f1 Merge "another bug introduced by some previous refactoring CL" 2010-11-15 17:30:00 -08:00
Vasu Nori
98f030742c another bug introduced by some previous refactoring CL
bug:3197501
Change-Id: I29342b111ef25c75129b095acee307c5d79f1692
2010-11-15 17:22:20 -08:00
Stephen Hines
3414bae7b2 Merge "Remove WARs for zero-init + destructors." 2010-11-15 17:19:26 -08:00
James Dong
36663b2f6c Add initial stereo capture support for AAC encoder
Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
2010-11-15 17:17:29 -08:00
Eric Rowe
b49aa60829 Remove asserts in bluetooth test utils
Certain checks were causing the test to fail due to a race condition.

Bug: b/3198566
Change-Id: I9389a1936f6032939851922c052ef8ed32e5283b
2010-11-15 17:09:46 -08:00
Stephen Hines
baa19bc59c Remove WARs for zero-init + destructors.
Change-Id: I919db554f3f6fa1fb027402298602a16fba4a235
2010-11-15 17:09:02 -08:00
Michael Jurka
f942b7cbca Merge "Fix issue where Launcher was not getting redrawn" 2010-11-15 17:01:54 -08:00
Adam Powell
c028a5ee7e Merge "Fix a couple interactions between action bar and options menus" 2010-11-15 16:49:35 -08:00
Adam Powell
8d12e20162 Fix a couple interactions between action bar and options menus
Fix bug 3129937 - Activity.openOptionsMenu not calling onPrepareOptionsMenu

Fix bug 3070720 - actionbar android.R.id.home isn't dispatched to fragments

Change-Id: I4a154941595583cdec7d1dffbeac9c8340781fa0
2010-11-15 16:44:17 -08:00
Joe Onorato
b86c89c1a1 Merge "use the proper number of wifi icon levels." 2010-11-15 16:39:24 -08:00
Joe Onorato
09f686ec7e use the proper number of wifi icon levels.
Change-Id: Ib8d4bccff7240d0086729093d79f564aa97001ff
2010-11-15 16:34:41 -08:00
Michael Jurka
ebefea4658 Fix issue where Launcher was not getting redrawn
This is a temporary fix; will submit a change later that restores the performance improvement but fixes the drawing issue
2010-11-15 16:04:01 -08:00
Shimeng (Simon) Wang
20c14fd7b3 Ignore zoom overwidth updating when contentsize is not set.
This happens in case of layer's webkit draw time.

issue:3194817
Change-Id: I58c393d7553e279ccd4b4ee755e2da205faa069b
2010-11-15 15:54:53 -08:00
Joe Onorato
45c7af9725 Merge "Don't crash if we haven't gotten a signal strength yet." 2010-11-15 15:35:58 -08:00
Joe Onorato
801ade0f08 Don't crash if we haven't gotten a signal strength yet.
Bug: 3198447
Change-Id: I645b484eadfff6ed34517571b0c6fea3057ec563
2010-11-15 15:33:39 -08:00
Andreas Huber
7dcf95af05 Merge "Proper support for variable NALsize lengths of AVC content in .mkv files." 2010-11-15 15:31:17 -08:00
Adam Powell
a752468e26 Merge "Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction" 2010-11-15 15:26:31 -08:00
Gilles Debunne
9947b32185 Merge "Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread" 2010-11-15 15:23:01 -08:00
Adam Powell
965b9699f1 Cherry-pick Ib76a95d9e7669016cf11b8b0add8843b438068ea from gingerbread
DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over
extract mode IME window

Make the SelectionModifierCursorController track its show/hide state
more accurately in the presence of an extract mode IME.

Lazily initialize CursorControllers so that we don't end up creating
them for various TextViews where they are not needed.

Change-Id: I3dce7535db3a1bd25ed9899406de47b00058e665
2010-11-15 15:21:15 -08:00
Adam Powell
759dc706ba Fix bug 3176330 - Improve documentation around MenuItem.setShowAsAction
Change-Id: Ibc8babd3668d0d8e1ed50ac330aac06a4f57dc1e
2010-11-15 15:12:20 -08:00
Xia Wang
ca1f2b1a1e Add Wi-Fi connection functional tests.
- Add a XML parser to parse Wi-Fi configurations
- Add Wifi connection tests
- Fix issue: failure in setup will block the next tests.
             call tearDown() if the test fails at setUp().

Change-Id: I1a380fa02ebc96b69165d1514da12df985224e8d
2010-11-15 15:10:44 -08:00
Andreas Huber
0f62458434 Proper support for variable NALsize lengths of AVC content in .mkv files.
Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929
related-to-bug: 3197442
2010-11-15 15:10:34 -08:00
Joe Onorato
c7bc3d09bd Merge "Don't cancel the key buttons when you drag outside their bounds." 2010-11-15 13:32:43 -08:00
James Dong
835ea2f2c9 Merge "Fixed a race condition where some recording frames may not be released." 2010-11-15 13:31:54 -08:00
Joe Onorato
abb27777f4 Don't cancel the key buttons when you drag outside their bounds.
Bug: 3183205
Change-Id: I9e0f2e4e550b3e5b1b46099145b4c703b77aca77
2010-11-15 13:30:49 -08:00
Wink Saville
47ea7c43da Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory." 2010-11-15 13:24:37 -08:00