Bart Sears
654ac45c21
am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
2011-12-07 11:43:54 -08:00
Bart Sears
b56076ac9f
Merge "Fix WebTextView rings" into ics-mr1
2011-12-07 11:41:57 -08:00
Joe Malin
a0221b0fa8
am 7c918ad4: am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '7c918ad493392ccb9cc24d3f2f35cab55916f582':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:34:39 -08:00
Joe Malin
7c918ad493
am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3eebad61b4df7f5b4c898545aa7ec9076bc077d0':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:33:01 -08:00
Joe Malin
3eebad61b4
am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:30:41 -08:00
Joe Malin
3744d1faf5
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
Irfan Sheriff
87f0a7b1aa
Fix CS wakelock handling
...
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
2011-12-07 11:28:21 -08:00
Joe Malin
9e2cf49fa3
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
2011-12-07 11:26:20 -08:00
Alex Sakhartchouk
4a8b4d7a55
am 7cee3183: Merge "Fixing file writing bug"
...
* commit '7cee31835de45eaff5922fc8647545d9bd30b567':
Fixing file writing bug
2011-12-07 11:09:59 -08:00
Alex Sakhartchouk
7cee31835d
Merge "Fixing file writing bug"
2011-12-07 11:07:42 -08:00
Alex Sakhartchouk
c08a1cc38f
Merge "Revert "Removing changes not meant for MR1"" into graphics-dev
2011-12-07 11:06:39 -08:00
Dianne Hackborn
9cade77ef0
am 138d870f: am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '138d870fb7b83bc2af54e87546abb883476298ff':
Truthiness is good.
2011-12-07 10:52:07 -08:00
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
5ad18abbcb
am e6513486: Merge "Minor tweak in getLocationInWindow"
...
* commit 'e6513486ee83e3ce9e99ee3f08f470fc568f120f':
Minor tweak in getLocationInWindow
2011-12-07 10:42:14 -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
4050b7a0a8
am 9cf8c86c: Reconcile with ics-mr1-release
...
* commit '9cf8c86c624b1e76c4adef8fa60f4d5db7abe4da':
2011-12-07 07:48:53 -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
f00f39d473
am 48747bdd: am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
...
* commit '48747bdd5bb06ce4bdf8f9ac379e0c55a3ee2d6f':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
2011-12-07 07:32:08 -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
7830edef71
am b808af7d: Merge "Allow data uris to be data sources"
...
* commit 'b808af7daf74d27d3c745cd6d62007f344d37e53':
Allow data uris to be data sources
2011-12-07 04:18:16 -08: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
7086af8427
am bb60ee97: am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
...
* commit 'bb60ee97664667c7774aa3c45b473332a3757d21':
Disable poor network connection alone
2011-12-06 21:12:06 -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
21aaef403a
am bfda4357: Merge "Remove warnings about unused results."
...
* commit 'bfda435744fc110ba2c6ac070a09394a8608a422':
Remove warnings about unused results.
2011-12-06 18:34:56 -08:00
Stephen Hines
5912157f97
am f7f93048: Merge "NULL should not be const for RS."
...
* commit 'f7f930480c75bcb57ae98d4a0fc59a3fb8e90e3d':
NULL should not be const for RS.
2011-12-06 18:34:54 -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
d11b88dc91
am 2b621bc5: Merge "Disable postponing performTraversals(), for now."
...
* commit '2b621bc5bb52339cc677beb89d0495b8b5d4f444':
Disable postponing performTraversals(), for now.
2011-12-06 18:11:39 -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
Michael Jurka
dd4e3b6054
am 738a154a: Merge "System bar now renders the back button for recents"
...
* commit '738a154a1b27ff908616c336d4adf400a141eebf':
System bar now renders the back button for recents
2011-12-06 17:39:02 -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
a46935e1d0
am 5396ca5d: am 0f668951: am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
...
* commit '5396ca5d7dc6e389c70a602b7dcabde0fc789471':
docs: fix broken links bug: 5542371
2011-12-06 17:19:38 -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