Dianne Hackborn
138d870fb7
am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
2011-12-07 10:49:56 -08:00
Gilles Debunne
e6513486ee
Merge "Minor tweak in getLocationInWindow"
2011-12-07 10:40:28 -08:00
Gilles Debunne
653d3a2787
Limit created string size in Spell Checker
...
Change-Id: I2f4e7a8b0022d76bc30199ff80c2fe637dbe03ef
2011-12-07 10:40:09 -08:00
Dianne Hackborn
1f1fa7edd6
am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit 'fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
2011-12-07 10:36:54 -08:00
Dianne Hackborn
fb90df8c6e
Merge "Truthiness is good." into ics-mr1
2011-12-07 10:33:19 -08:00
Robert Greenwalt
d4420ab2fb
Trim leading zeros from ipv4 addrs.
...
Underlying libraries will interpret leading zeros as octal values and
fail.
bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
2011-12-07 09:58:48 -08:00
The Android Open Source Project
9cf8c86c62
Reconcile with ics-mr1-release
...
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
2011-12-07 07:44:31 -08:00
The Android Open Source Project
48747bdd5b
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:29:38 -08:00
The Android Open Source Project
6ee7bca1ce
am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:27:57 -08:00
The Android Open Source Project
3de8d36b6f
Reconcile with ics-mr0-release
...
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
2011-12-07 07:24:54 -08:00
Ben Murdoch
a62b9632c8
Clear the WebView picture when a new load starts.
...
Clear the old picture set when we have confirmed a new
page load.
Bug: 5701197
Change-Id: Id96fb7d8e75a0b54a448d35239a69ba1774cffae
2011-12-07 14:16:31 +00:00
Narayan Kamath
b808af7daf
Merge "Allow data uris to be data sources"
2011-12-07 04:15:43 -08:00
Mathias Agopian
6779df2c28
Improve the VSYNC api a bit.
...
- add the ability to set the vsync delivery rate, when the rate is
set to N>1 (ie: receive every N vsync), SF process' is woken up for
all of vsync, but clients only see the every N events.
- add the concept of one-shot vsync events, with a call-back
to request the next one. currently the call-back is a binder IPC.
Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
2011-12-06 22:43:10 -08:00
Irfan Sheriff
bb60ee9766
am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
Disable poor network connection alone
2011-12-06 21:09:44 -08:00
Irfan Sheriff
7c92e2dccb
am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
2011-12-06 21:07:36 -08:00
Irfan Sheriff
8a4cd3b105
Merge "Disable poor network connection alone" into ics-mr1
2011-12-06 21:06:03 -08:00
Jean Chalard
5fa6737cac
Insert into user dict with the correct locale
...
This fixes a bug where a word would be entered in the user
dictionary with the wrong locale.
Bug: 5667272
Change-Id: I219d5461f8f8c74b6ab34f9bb157a4b977f00e68
2011-12-07 13:57:59 +09:00
Jeff Brown
eb3e4b98a4
Make the dock orientation override the HDMI orientation.
...
Bug: 5714422
Change-Id: I5a229f987fb88a25d2e49d0c73184f556ffc1114
2011-12-06 19:54:24 -08:00
Stephen Hines
bfda435744
Merge "Remove warnings about unused results."
2011-12-06 18:33:42 -08:00
Stephen Hines
f7f930480c
Merge "NULL should not be const for RS."
2011-12-06 18:33:35 -08:00
Jeff Brown
2b621bc5bb
Merge "Disable postponing performTraversals(), for now."
2011-12-06 18:09:35 -08:00
Gilles Debunne
6583ce5b89
Minor tweak in getLocationInWindow
...
Change-Id: Ib3f30dbfb3aee7c46c58e1f7832e3394702c0ff6
2011-12-06 18:09:02 -08:00
Jeff Brown
90a3c5f51d
Disable postponing performTraversals(), for now.
...
Bug: 5715378
Bug: 5721047
Change-Id: I89c674306665b6caa3a63b8a9d2b4b7c9ed020ae
2011-12-06 18:01:37 -08:00
James Dong
ca402cdcac
Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed
...
to the callback could be 0.
Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f
related-to-bug: 5613451
2011-12-06 17:58:22 -08:00
John Reck
8463c88ddf
Fix WebTextView rings
...
Bug: 5718531
Don't scroll the rings and fix the border's alpha
Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
2011-12-06 17:38:57 -08:00
Michael Jurka
738a154a1b
Merge "System bar now renders the back button for recents"
2011-12-06 17:37:06 -08:00
Daniel Sandler
328310c6fa
System bar now renders the back button for recents
...
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.
As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.
Bug: 3448536
2011-12-06 17:22:19 -08:00
Scott Main
5396ca5d7d
am 0f668951: am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
...
* commit '0f668951d78ad8c45af54a6c06d3c560eed29108':
docs: fix broken links bug: 5542371
2011-12-06 17:17:00 -08:00
Scott Main
0f668951d7
am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
...
* commit '0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug: 5542371
2011-12-06 17:14:50 -08:00
Scott Main
0a83e9d438
am b6322a5b: docs: fix broken links bug: 5542371
...
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug: 5542371
2011-12-06 17:12:53 -08:00
Scott Main
b6322a5bb9
docs: fix broken links
...
bug: 5542371
Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
2011-12-06 17:09:37 -08:00
Andreas Huber
e3524d33c6
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
...
* commit '92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 16:59:52 -08:00
Fabrice Di Meglio
afd93d515d
am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
...
* commit '596859549254a63c619fdc403e49e809751ab832':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
2011-12-06 16:59:50 -08:00
Hong Teng
2fe9130f22
am 2be608f8: am 6db79c35: 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 an
...
* commit '2be608f88cd469b40a472551f22a9d40903beede':
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.
2011-12-06 16:59:45 -08:00
Amith Yamasani
9c316f3c6a
am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
...
* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
2011-12-06 16:59:44 -08:00
Adam Powell
e49e8cc4e7
Merge "resolved conflicts for merge of 6a828712 to master"
2011-12-06 16:57:35 -08:00
The Android Automerger
3888503a5d
merge in ics-mr1-release history after reset to ics-mr1
2011-12-06 16:54:17 -08:00
Adam Powell
e4b8ff8068
resolved conflicts for merge of 6a828712 to master
...
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
2011-12-06 16:53:47 -08:00
Stephen Hines
d53333cc21
Remove warnings about unused results.
...
Change-Id: I53004b4452c5e1ac6ff0dab8430de7f73e8a99b9
2011-12-06 16:48:43 -08:00
Stephen Hines
4d322043ab
NULL should not be const for RS.
...
Change-Id: I24d96843c40f822bf064a0fa1fc0440b6bf0518d
2011-12-06 16:47:32 -08:00
Jeff Brown
07ee3418bb
Merge "Add tap and swipe capabilities to the "input" tool."
2011-12-06 16:47:29 -08:00
Romain Guy
bdfe770e08
Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817 "
2011-12-06 16:37:58 -08:00
Romain Guy
9c4b79af22
Discard framebuffer rendering queues when discarding layers
...
Bug #5581817
Change-Id: Ie30700a29059d2ea60eb7bd3f8bd20ac48a149ab
2011-12-06 16:37:10 -08:00
Andreas Huber
92860d5d46
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
...
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 16:22:07 -08:00
Irfan Sheriff
19380daaf4
Disable poor network connection alone
...
- Keep the walled garden detection in place
Bug: 5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
2011-12-06 16:21:03 -08:00
Andreas Huber
791a31832a
Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1
2011-12-06 16:20:01 -08:00
Jeff Brown
b42d5e2b9b
Merge "Fix PIN pad."
2011-12-06 16:18:03 -08:00
Jeff Brown
07069a04ef
Fix PIN pad.
...
Some widgets apparently inject keys into the ViewRoot by sending
a DISPATCH_KEY message to its handler. Ugh.
Bug: 5711577
Change-Id: Ibe9aaf705095d152ec866c536f31f5d85e27b97f
2011-12-06 16:15:22 -08:00
Jeff Brown
797e4465fb
Add tap and swipe capabilities to the "input" tool.
...
Change-Id: Ia2950d281ef04232c5134fa045ce18272fbd6f81
2011-12-06 16:06:13 -08:00
James Dong
ed1d1838f0
am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
...
* commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
2011-12-06 16:04:38 -08:00