Dianne Hackborn
29a781c814
Merge "DO NOT MERGE. Integrate add new screen width/height in "dp" configs." into honeycomb-mr2
2011-05-13 11:16:42 -07:00
Guang Zhu
535504c37f
Merge "even more logging"
2011-05-13 11:12:48 -07:00
Fabrice Di Meglio
3014b5879b
Merge "Prepare OpenGLRenderer to use glyphs from TextLayoutCache"
2011-05-13 11:09:19 -07:00
Scott Main
40b3400124
am 4c53fc7e: am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit '4c53fc7ec921c0959f021a475fe0d91b7e6ddc2d':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:03:27 -07:00
Scott Main
1e27f48ccd
am 2a959725: am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit '2a959725f569147878b3a78fae77e8679c8e16fa':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 11:01:25 -07:00
Scott Main
fcfe82e63f
am 78b875e7: am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit '78b875e7e65ee90e44872d6542c5eb4213ba0dfb':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 11:00:27 -07:00
Scott Main
6145b9defc
am d32aeafc: am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit 'd32aeafc41b018b7efbddd1b90e17424bf1cf1e7':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:58:29 -07:00
Scott Main
74c4d84a19
am edab852f: Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
...
* commit 'edab852fe11f12ad5a0a66f79462ed7474ba9e5a':
docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff
2011-05-13 10:56:52 -07:00
Scott Main
9fed145eb4
am 432fbcc5: docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
...
* commit '432fbcc55ff3e0900a50b70b9d5dbdab77a276f7':
docs: enforce alphanumeric strings for video id to prevent XSS bug 4399806
2011-05-13 10:55:09 -07:00
Scott Main
f87d9feac1
Merge "docs: update uses-feature doc with USB features, add TOC at the top and revise some other stuff" into honeycomb-mr1
2011-05-13 10:54:00 -07:00
Eric Laurent
a6b5e50451
Merge "Fix audio effect framework issues"
2011-05-13 10:24:24 -07:00
Alex Sakhartchouk
20f4dc045f
Merge "Cleanup mesh creation."
2011-05-13 10:24:19 -07:00
Gilles Debunne
5d06b75659
Merge "SuggestionSpans are preserved when picked."
2011-05-13 09:41:57 -07:00
Wink Saville
e7afca1967
am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
...
* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
2011-05-13 09:20:08 -07:00
Wink Saville
b6a14cb262
Merge "Add getLteOnCdamMode." into honeycomb-LTE
2011-05-13 09:09:43 -07:00
Steve Block
b9699ec798
Merge "Fix WebCore include paths due to merge to WebKit r75315"
2011-05-13 06:44:57 -07:00
Dianne Hackborn
88c0d696cc
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
...
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
2011-05-12 18:39:51 -07:00
Dianne Hackborn
9b1fa3477e
resolved conflicts for merge of ec85619f to master
...
Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa
2011-05-12 18:37:33 -07:00
Christopher Tate
ffd242ed55
Use pax extended tar format to support long filenames etc.
...
'tar' supports only 100-character paths; 'ustar' supports only
155+100 character prefix + paths; neither supports files larger
than about 8 gigabytes. We now use the POSIX.1-2001 'pax'
extended tar format for those files in the backup stream that
are too large or have too-long paths for the 'ustar' format.
Change-Id: I2f256823091deaec9b1ccea685d2344753c6cb67
2011-05-12 18:07:57 -07:00
Dianne Hackborn
f128af5346
am dda64e9a: am 51454295: am df9799f0: Fix build.
...
* commit 'dda64e9a4af2e7dbc75a3b2fc7c41b9d63848a59':
Fix build.
2011-05-12 17:42:14 -07:00
Dianne Hackborn
27800cb19d
am d46849a5: am a8138732: MR2 is going to be API 13.
...
* commit 'd46849a535ab64fd47fc8e9c557ca5f4da9e977b':
MR2 is going to be API 13.
2011-05-12 17:39:30 -07:00
Dianne Hackborn
661b5e1bad
am 51454295: am df9799f0: Fix build.
...
* commit '51454295a5813627a91dd5cf6b486a70a0b389cb':
Fix build.
2011-05-12 17:39:22 -07:00
Irfan Sheriff
12a7204246
am 91a46046: (-s ours) am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
...
* commit '91a460469a20529938e0f740ce24e0fdaddb7fa6':
DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:39:07 -07:00
Irfan Sheriff
6a622ba66a
am 2cd423a0: Merge commit \'01ea7f01\' into manualmerge1
...
* commit '2cd423a049aeeb0c07f7a556f3a6f701b504606f':
DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:37:06 -07:00
Dianne Hackborn
dfce045584
am a8138732: MR2 is going to be API 13.
...
* commit 'a8138732a01b92f0a40f72050b74a3bd4cf6d215':
MR2 is going to be API 13.
2011-05-12 17:35:35 -07:00
Dianne Hackborn
8fbbfe5bac
am df9799f0: Fix build.
...
* commit 'df9799f0fc3ef04d9b004ebbda44883f85321b24':
Fix build.
2011-05-12 17:35:20 -07:00
Irfan Sheriff
eb06280c29
am 55fa681a: (-s ours) am bb09485b: Merge commit \'09564fbb\' into manualmerge
...
* commit '55fa681ac774240509def9d75ad7e16ea5515dd1':
DO NOT MERGE Define Protocol class
2011-05-12 17:31:25 -07:00
Jean-Baptiste Queru
ff10dada83
Merge from honeycomb-plus-aosp
...
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
2011-05-12 17:25:33 -07:00
Jean-Baptiste Queru
374e00c9a8
Merge from honeycomb-plus-aosp
...
Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d
2011-05-12 17:23:41 -07:00
Irfan Sheriff
a4bb9e57a5
Merge commit '01ea7f01' into manualmerge1
2011-05-12 17:19:56 -07:00
Dianne Hackborn
3158e56e9b
Merge "resolved conflicts for merge of 0e59729b to master"
2011-05-12 17:15:22 -07:00
John Reck
a41db3722f
Merge "Adding functions to query the state of a WebElement."
2011-05-12 17:00:38 -07:00
Chia-chi Yeh
e71c36df7e
Merge "Add a method to create ParcelFileDescriptors from DatagramSockets."
2011-05-12 16:55:58 -07:00
Dima Zavin
1d68c8ce9a
Merge "update for new audio.h header location"
2011-05-12 16:06:20 -07:00
Irfan Sheriff
fd7d4cf691
am bb09485b: Merge commit \'09564fbb\' into manualmerge
...
* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
DO NOT MERGE Define Protocol class
2011-05-12 16:02:43 -07:00
Jean-Baptiste Queru
194cda3d98
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"
...
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
Adapt to latest skia
2011-05-12 15:54:13 -07:00
Jean-Baptiste Queru
38b210943c
am a84d29cb: am 6714e677: Merge "Ninepatch tweaks for better interop"
...
* commit 'a84d29cb0494310e9472884c7a459603eb305e38':
Ninepatch tweaks for better interop
2011-05-12 15:52:16 -07:00
Jean-Baptiste Queru
6e6afad3f0
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
...
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:52:12 -07:00
Jean-Baptiste Queru
58e19ce8eb
am e8b669cb: (-s ours) am 71d25778: Merge "Switch to SkSafeUnref for better portability"
...
* commit 'e8b669cbd7b690349c908ce6c9ce3b342139de04':
Switch to SkSafeUnref for better portability
2011-05-12 15:52:03 -07:00
Irfan Sheriff
cc13621e36
Merge commit '09564fbb' into manualmerge
2011-05-12 15:47:28 -07:00
Dianne Hackborn
f543d5de23
resolved conflicts for merge of 0e59729b to master
...
Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b
2011-05-12 15:39:41 -07:00
Jean-Baptiste Queru
d6c51aef6b
am f247e545: Merge "Adapt to latest skia"
...
* commit 'f247e545b521584bb778e79710c1e60ab814839e':
Adapt to latest skia
2011-05-12 15:38:18 -07:00
Jean-Baptiste Queru
40951a8cf1
am 6714e677: Merge "Ninepatch tweaks for better interop"
...
* commit '6714e6774063aae7a8a7a80c36c89ec60170cb27':
Ninepatch tweaks for better interop
2011-05-12 15:38:15 -07:00
Jean-Baptiste Queru
0e4b2d5826
am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
...
* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
Tweak audio APIs for better forward/backward/sideways compatibility.
2011-05-12 15:38:11 -07:00
Jean-Baptiste Queru
6546fee8cc
am 71d25778: Merge "Switch to SkSafeUnref for better portability"
...
* commit '71d25778c61327bf82d0e81cd78175a9ee74420a':
Switch to SkSafeUnref for better portability
2011-05-12 15:38:07 -07:00
Jean-Baptiste Queru
d698b563da
Merge "Adapt to latest skia"
2011-05-12 15:09:51 -07:00
Teng-Hui Zhu
094766172f
am a0e661b4: am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
...
* commit 'a0e661b4e4f489fa7c5c2ebadcffc8e6f71132eb':
Fix the Uri parsing issue
2011-05-12 15:05:29 -07:00
Dianne Hackborn
d040883030
am 97280816: am 0f1de9ad: New compat mode front end: UI and persistence.
...
* commit '972808164adde6c0784e9c836d06219a9cf7eb7f':
New compat mode front end: UI and persistence.
2011-05-12 15:05:19 -07:00
Teng-Hui Zhu
b9c36527f1
am c1a005c3: Merge "Fix the Uri parsing issue" into honeycomb-mr2
...
* commit 'c1a005c356c18ffb676f16b2f6d6d8f361abafe2':
Fix the Uri parsing issue
2011-05-12 15:01:56 -07:00
Dianne Hackborn
aef4c4a98f
am 0f1de9ad: New compat mode front end: UI and persistence.
...
* commit '0f1de9adde0b52d2a385a76232bd7ac30c3eeea2':
New compat mode front end: UI and persistence.
2011-05-12 15:01:53 -07:00