Commit Graph

40776 Commits

Author SHA1 Message Date
Chia-chi Yeh
0c18a10c10 Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Irfan Sheriff
e44371c6f1 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -08:00
Jake Hamby
f73a44533e Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 2011-12-08 15:51:33 -08:00
Andreas Huber
dabd58b008 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
405aa649d8 Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 2011-12-08 13:33:06 -08:00
Svetoslav Ganov
5355d06117 Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1 2011-12-08 12:28:11 -08:00
Irfan Sheriff
807f51e4c2 Merge "Handle emergency call back mode correctly" into ics-mr1 2011-12-08 12:21:20 -08:00
Gilles Debunne
e8df1fe0fb Merge "Make the Next key navigate between TextViews" into ics-mr1 2011-12-08 11:57:06 -08:00
Gilles Debunne
64993fe81c Merge "Limit created string size in Spell Checker" into ics-mr1 2011-12-08 11:56:28 -08:00
Eric Fischer
c88c1187ad Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-08 11:09:11 -08:00
The Android Open Source Project
1b487a6be1 Reconcile with ics-mr0-release
Change-Id: I2b2afc572c36ef210d81af16bd2e52cecdd94079
2011-12-08 10:26:33 -08:00
Gilles Debunne
91e3720a47 Merge "IOOB is Suggestions" into ics-mr1 2011-12-08 09:59:44 -08:00
Gilles Debunne
5a63853ae8 Merge "Prevent NPE in SuggestionSpan" into ics-mr1 2011-12-08 09:59:29 -08:00
Jeff Tinker
624c9bf09e Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
Jeff Brown
6cdd6659a9 Merge "Shortcut keys should be handled on down, not up." into ics-mr1 2011-12-07 23:29:52 -08:00
Jeff Brown
515dd4d129 Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
Dave Burke
73b2d11e0d Merge "Remove dangerous and useless optimization Bug #5525888" into ics-mr1 2011-12-07 20:40:10 -08:00
Wink Saville
7f69cab4a8 Merge "When the SIM_READY set current preferred network type." into ics-mr1 2011-12-07 20:15:45 -08:00
Jaikumar Ganesh
169fabc9bc Merge "Reduce likelihood of crash in state machine." into ics-mr1 2011-12-07 19:50:03 -08:00
John Wang
8fdf67ce4b Merge "Correct the dialing number of structured MMI." into ics-mr1 2011-12-07 18:49:28 -08:00
Gilles Debunne
19b1a8ae0c Merge "Insert into user dict with the correct locale" into ics-mr1 2011-12-07 18:41:04 -08:00
Adam Powell
85b41d50a2 Merge "Raise touch slop value from previous experiment" into ics-mr1 2011-12-07 17:55:35 -08:00
Daniel Sandler
7a73f3a5fd Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1 2011-12-07 17:40:07 -08:00
Joe Malin
a9f2453392 am 3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '3937e055708a8618f184feab204fed4bb41f3f6e':
  DOC CHANGE: Add text for android.os.storage
2011-12-07 17:11:59 -08:00
Dianne Hackborn
7fb0eb9d1f am b32785c6: Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0
* commit 'b32785c6e893743956e28b285b8e6f6fc7aa8edb':
  More fixing for issue #5366535: Lockscreen has wrong layout...
2011-12-07 17:11:57 -08:00
Dianne Hackborn
ee2a8be8b4 Merge "Merge commit 'eee12419' into manualmerge" into ics-mr1 2011-12-07 17:10:34 -08:00
Robert Greenwalt
52744cedeb Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 2011-12-07 17:09:05 -08:00
Amith Yamasani
2f2278a0d2 Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1 2011-12-07 16:54:31 -08:00
Daniel Sandler
43d6c73063 Merge "Invalidate the whole status bar after layout transitions." into ics-mr1 2011-12-07 16:33:31 -08:00
Dianne Hackborn
6be8470096 Merge commit 'eee12419' into manualmerge 2011-12-07 16:33:15 -08:00
Russell Brenner
2952c4e0bb Merge "Update Armenian and Georgian fonts" into ics-mr1 2011-12-07 16:20:15 -08:00
Joe Malin
7cb74e25f7 Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0 2011-12-07 16:07:49 -08:00
Dianne Hackborn
0969ff1b17 Merge "More fixing for issue #5366535: Lockscreen has wrong layout..." into ics-mr0 2011-12-07 15:22:21 -08:00
Jeff Brown
a33dec75f3 Merge "Make the dock orientation override the HDMI orientation." into ics-mr1 2011-12-07 15:04:39 -08:00
Dianne Hackborn
e26381bce5 Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 2011-12-07 15:01:55 -08:00
Dianne Hackborn
7c3885169d Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen..." into ics-mr0 2011-12-07 15:00:05 -08:00
Winson Chung
e2fe012e3d Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 2011-12-07 14:33:31 -08:00
Dave Burke
d59a3673c9 Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 2011-12-07 14:05:41 -08:00
Robert Greenwalt
2c43067b5c Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 2011-12-07 12:29:14 -08:00
Irfan Sheriff
d8e3949849 Merge "Fix CS wakelock handling" into ics-mr1 2011-12-07 12:06:31 -08:00
Bart Sears
162fa3da8d Merge "Fix WebTextView rings" into ics-mr1 2011-12-07 11:41:57 -08:00
Joe Malin
a457633b3f am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
  DOC CHANGE: Add Content URI ref doc
2011-12-07 11:28:25 -08:00
Joe Malin
62fecd5066 Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0 2011-12-07 11:26:20 -08:00
Dianne Hackborn
aadc681f50 Merge "Truthiness is good." into ics-mr1 2011-12-07 10:33:19 -08:00
The Android Open Source Project
9e86a344c1 Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
2011-12-07 07:24:54 -08:00
Irfan Sheriff
17d23095d2 Merge "Disable poor network connection alone" into ics-mr1 2011-12-06 21:06:03 -08:00
Scott Main
f0eac29469 am b6322a5b: docs: fix broken links bug: 5542371
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
  docs: fix broken links bug: 5542371
2011-12-06 17:12:53 -08:00
Andreas Huber
0c62c3799e Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Fabrice Di Meglio
662eb58742 Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 2011-12-06 15:47:27 -08:00
Hong Teng
862884d205 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00