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
Irfan Sheriff
630421c188
Merge "Fix configuration change handling"
2010-12-03 14:29:08 -08:00
Jim Miller
44f9b1d1d2
Merge "Fix 3201849: Remove builder pattern from DrawableHolder setters"
2010-12-03 14:21:42 -08:00
Mathias Agopian
644bb2a29e
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
...
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
2010-12-03 14:15:40 -08:00
Dianne Hackborn
cb64238d53
Merge "Fix issue #3175809 : system_server crash with SEGV_MAPERR (IKXEVEREST-1372)"
2010-12-03 13:16:38 -08:00
Xavier Ducrohet
cc75abe972
Merge "LayoutLib: Animation support in insert/move/removeChild actions."
2010-12-03 12:27:27 -08:00
Xavier Ducrohet
fb8a2e8806
Merge "LayoutLib: Create new layoutparams when moving a child"
2010-12-03 12:27:14 -08:00
Wink Saville
ad2cb389a1
Merge "Cleanup logging."
2010-12-03 12:16:50 -08:00
Jeff Brown
a78549f464
Merge "Add method for sending wallpaper commands directly to an engine."
2010-12-03 11:52:38 -08:00
Gilles Debunne
9015204447
Merge "Removed unused text_select_handle asset"
2010-12-03 11:33:51 -08:00
Kenny Root
ca2cd7c428
Merge "Move disk usage utilities to its own library"
2010-12-03 11:23:48 -08:00
Amith Yamasani
90fed4f627
Merge "Use SearchView in SearchDialog for legacy apps using the old model."
2010-12-03 11:22:48 -08:00
Steve Block
1c4ae39b5b
Merge "Update WebView.addJavascriptInterface() to ignore null instances"
2010-12-03 03:38:00 -08:00
Ben Murdoch
450a84de9c
Merge "Add a value for the dimensions of xlarge app icons."
2010-12-03 03:05:54 -08:00
Bjorn Bringert
fd150bb907
Merge "Only decrement mRemaining once in read()."
2010-12-03 01:28:05 -08:00
Wink Saville
cb15287ce0
Merge "Add reason field to DEACTIVATE_DATA_CALL request."
2010-12-02 21:43:00 -08:00
satok
b5ed87349d
Merge "Make the size of "shirt pocket" 0 when the icon of "shirt pocket" is invisible"
2010-12-02 19:23:29 -08:00
Xavier Ducrohet
74fce51121
Merge "LayoutLib: Update to use the new moveChild API."
2010-12-02 18:06:23 -08:00
Hung-ying Tyan
081b96a751
am 7da1ffc9: am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
...
* commit '7da1ffc9d2a51ef6120389a06351fd770ab45f46':
Set AudioGroup mode according to audio settings
2010-12-02 18:02:58 -08:00
Hung-ying Tyan
d76844ac80
am e2abd103: Merge "Set AudioGroup mode according to audio settings" into gingerbread
...
* commit 'e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c':
Set AudioGroup mode according to audio settings
2010-12-02 17:56:40 -08:00
Hung-ying Tyan
33f4f32967
Merge "Set AudioGroup mode according to audio settings" into gingerbread
2010-12-02 17:50:33 -08:00
Joe Onorato
889e10549e
Merge "Tweak the settings panel assets / layout. Not done yet."
2010-12-02 17:29:41 -08:00
Joe Onorato
5b20c1212b
Merge "Make AbsSeekBar support having setThumb called after initialization is done."
2010-12-02 17:29:29 -08:00
Joe Onorato
f2c71034ac
Merge "Brightness and volume controls in the quick settings panel."
2010-12-02 17:29:12 -08:00
Joe Onorato
24b26c0766
Merge "New SeekBar assets."
2010-12-02 17:29:02 -08:00
Joe Onorato
de463ed34b
Merge "Show the operator or wifi ssid in the status bar panel."
2010-12-02 17:28:47 -08:00
Romain Guy
ebb3927950
Merge "Correctly index transparent quads when generating 9patch meshes. Bug #3250026 "
2010-12-02 17:15:05 -08:00
Gilles Debunne
a05de480f2
Merge "Fix in vertical measurement in text lines with different text sizes"
2010-12-02 16:47:50 -08:00
Xia Wang
189a31474e
Merge "Add Wi-Fi connection test for static IP"
2010-12-02 16:39:53 -08:00
Brad Fitzpatrick
ae28fc8d30
Merge "sampling profiler hz -> ms"
2010-12-02 16:10:02 -08:00
Jeff Brown
80cdb94144
Merge "Improve support for external keyboards."
2010-12-02 16:03:05 -08:00