Commit Graph

24973 Commits

Author SHA1 Message Date
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
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