Jean-Baptiste Queru
13fd790454
am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
64b556bdc9
am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
58b879a8f6
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Irfan Sheriff
e166ea9ebf
Merge "Update scan results when frequency band is set"
2010-12-06 12:47:31 -08:00
Nick Pelly
68edd6222e
am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
2010-12-06 11:55:08 -08:00
Nick Pelly
5f87205146
resolved conflicts for merge of 28e8c66d to master
...
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
2010-12-06 11:50:47 -08:00
Guang Zhu
90b9841cef
Merge "disable HW acceleration"
2010-12-06 11:36:54 -08:00
Xavier Ducrohet
41738e7862
Merge "LayoutLib: Update font object when text info changes in paint delegate"
2010-12-06 11:32:43 -08:00
Guang Zhu
18fcfbd028
Merge "change how assets are copied out of apk"
2010-12-06 11:28:49 -08:00
Daniel Sandler
b9cc5de33e
Merge "Hide navigation buttons and clock on lockscreen."
2010-12-06 11:15:45 -08:00
Jean-Baptiste Queru
32f0f53d40
am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
2010-12-06 11:05:47 -08:00
Jean-Baptiste Queru
9d2e1882cb
am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
907333ec69
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Irfan Sheriff
3e327fbdf2
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
...
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
2010-12-06 10:42:58 -08:00
Xavier Ducrohet
27a3d00657
Merge "LayoutLib: Fix logging."
2010-12-06 10:40:38 -08:00
Andy Stadler
60795d399e
Merge "Fix notification/builder defaults"
2010-12-06 10:38:04 -08:00
John Wang
a3b13513ab
Merge "Block incoming calls for non-voice-device."
2010-12-06 10:29:49 -08:00
Gilles Debunne
d94276f9ed
Merge "Made TextView use the new localState API for drag info"
2010-12-06 10:22:12 -08:00
Kenny Root
fa522704e7
Merge "Add measurement API to DefaultContainerService"
2010-12-06 10:21:47 -08:00
Irfan Sheriff
49820a1267
Merge "Hold network hand-off wakelock only when connected"
2010-12-06 10:17:57 -08:00
Yu Shan Emily Lau
c9f2c1d7e8
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
2010-12-06 10:14:16 -08:00
Fred Quintana
f0ac1cfc86
Merge "add caching to the AccountManagerService"
2010-12-06 09:55:54 -08:00
Robert Greenwalt
55e52e3e04
Merge "Don't clobber the net hostname if it's already set."
2010-12-06 09:54:16 -08:00
Iain Merrick
c4b91d0497
Merge "Call flushCookieStore() from CookieSyncManager."
2010-12-06 05:40:48 -08:00
satok
7ca57ea784
Merge "Fix null pointer exception"
2010-12-05 21:38:30 -08:00
Jeff Hamilton
a01ed4d6ac
am c1576ad6: Update the docs to clarify the ordering constraints.
...
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
2010-12-05 20:03:59 -08:00
Jason Sams
174a6c9dd8
Merge "Prevent message overrun in LocklessCommandFifo."
2010-12-05 19:54:18 -08:00
Nick Pelly
be0ed98e3a
am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
2010-12-05 18:13:10 -08:00
Nick Pelly
4995b0cd7e
Merge gingerbread-nfc into gingerbread
2010-12-05 18:08:16 -08:00
Adam Powell
fe08222c03
Merge "Add dividers to action bar navigation. Lighter dividers for holo themes."
2010-12-05 16:49:40 -08:00
Nick Pelly
3d3f99de94
am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
...
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
2010-12-05 14:49:00 -08:00
Nick Pelly
54c9d4a79a
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc
Merge branch gingerbread-nfc into gingerbread.
...
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Dianne Hackborn
cbef6ddfd3
Merge "Fix up API definitions in master."
2010-12-05 14:12:19 -08:00
James Dong
f0e7dcba61
Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()"
2010-12-05 14:07:58 -08:00
Adam Powell
390924d5da
Merge "Fix bug 3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize"
2010-12-05 13:54:07 -08:00
Adam Powell
7d41fe4e8c
Merge "Add public style for tabby-looking views"
2010-12-05 13:13:19 -08:00
Dianne Hackborn
1bacbd9185
Merge "Update 9.xml to match the real GB 9.xml."
2010-12-05 13:11:57 -08:00
Irfan Sheriff
fe1b942d68
am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
...
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
2010-12-04 23:45:18 -08:00
Shimeng (Simon) Wang
5e5138c88b
Merge "Make sure the returned web view width is at least 0."
2010-12-03 18:22:29 -08:00
Irfan Sheriff
10484ac22a
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
2010-12-03 17:58:17 -08:00
Mathias Agopian
22c67843be
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
...
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.
Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
2010-12-03 17:35:07 -08:00
Mathias Agopian
30eb1b1803
[3171580] Add transform field to native buffers. (DO NOT MERGE)
...
This field indicate how the content of the buffer
needs to be transformed.
Change-Id: Ide3e980a90599e931406135693231276626adbbb
2010-12-03 17:35:07 -08:00
Mathias Agopian
733189d408
[3171580] Fix two typos related to fixed-size buffers
...
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.
Layer::drawForSreenShot() had a typo that had no effect.
mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.
Now we enable filtering based on the size of the buffer vs. the size of the layer.
Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
2010-12-03 17:35:06 -08:00
Mathias Agopian
678bdd6349
[3171580] don't automatically log GraphicBuffer allocation failures
...
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.
Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
2010-12-03 17:33:09 -08:00
Romain Guy
09f6be55ff
Merge "Don't render degenerate triangles in 9patches. Bug #3251983 "
2010-12-03 16:49:45 -08:00
Joe Onorato
545f5d0ee8
Merge "make screencap able to save pngs."
2010-12-03 16:49:39 -08:00
James Dong
0fe4dc6a27
Merge "Prepare for publishing MediaMetadataRetriever as public API"
2010-12-03 15:36:06 -08:00
Chet Haase
4bb4ca416e
Merge "Fix invalidation issue for optimized/GL case."
2010-12-03 15:17:01 -08:00
Adam Powell
368bbee5e9
Merge "Fix bug 3248342 - resource not found for non-xlarge"
2010-12-03 14:42:11 -08:00