Romain Guy
6b12dcd2aa
Merge "Continue cleanup refactoring in OpenGLRenderer."
2010-12-14 16:05:50 -08:00
Mathias Agopian
e48994fe82
Merge "fix [3223749] media server crashes when switching mode from video capture to still image capture"
2010-12-14 16:04:44 -08:00
Louis Huemiller
750cc17e85
Merge "HWC Stress Test - relocate print msg"
2010-12-14 16:01:45 -08:00
Mathias Agopian
da9584dc29
fix [3223749] media server crashes when switching mode from video capture to still image capture
...
there was an issue were in some situation SF would call prepare() on hwc
with a NULL handle and never call prepare again.
in this situation, we onw set the SKIP flag to make sure that hwc
won't process this layer and as soon as we receive our first buffer we
trigger a recompute of the visible regions which will end-up calling
prepare() again.
Change-Id: I6b400b2df79712408b9315a9859290c7fcb1609e
2010-12-14 15:53:39 -08:00
Mathias Agopian
fb88981051
Merge "fix [3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app"
2010-12-14 15:51:41 -08:00
Mathias Agopian
5eee3d2b13
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so."
2010-12-14 15:51:32 -08:00
Mathias Agopian
90f96b8383
Merge "dump callstack on Surface use error"
2010-12-14 15:51:22 -08:00
Jesse Wilson
638d08f2e2
Merge "Move 41 tests to libcore, closer to the tested code. (2nd half)"
2010-12-14 15:41:44 -08:00
Amith Yamasani
1d88a8c8c9
Merge "Add a way to insert a parent bread crumb so that deep linked settings can navigate up."
2010-12-14 15:34:08 -08:00
Xavier Ducrohet
dfc58622a1
Merge "Create some layout files for HwAccelerationTest"
2010-12-14 15:33:54 -08:00
Robert Greenwalt
59d37b0b68
Merge "Fix some IpV4-only code."
2010-12-14 15:28:01 -08:00
Xavier Ducrohet
7e29dd6e86
Merge "LayoutLib: Fix gradient rendering."
2010-12-14 15:03:26 -08:00
Jeff Brown
ea76ffcd97
Merge "Improve documentation on Vibrator.vibrate."
2010-12-14 15:02:52 -08:00
Louis Huemiller
1812cfde39
HWC Stress Test - relocate print msg
...
Change-Id: I95f9f5c6edffff8c737c4a6996f97e69bccc0448
2010-12-14 14:58:55 -08:00
Adam Powell
2492c866e4
Merge "Fix bug 3210201 - Popup window wrong size/position when IME hidden"
2010-12-14 14:51:13 -08:00
Adam Powell
6e81208c02
Merge "Updated spinner assets from UX"
2010-12-14 14:50:09 -08:00
Robert Greenwalt
f0c7d11e1e
Merge "DHCP core classes, defining data, behavior, and state transitions for the DHCP protocol. The DHCP client and DHCP server classes are not included in this commit: still working out some integration issues with ethernet & wifi services"
2010-12-14 14:40:49 -08:00
Jason Sams
b2f411d93f
Merge "Add support for non-malloc backed textures."
2010-12-14 14:32:36 -08:00
Xavier Ducrohet
91398fb7ba
Merge "LayoutLib: Misc fix to rendering."
2010-12-14 14:32:09 -08:00
Mike Lockwood
5ac45b5ae3
Merge "MTP: Make recursive delete more efficient"
2010-12-14 14:20:35 -08:00
Dianne Hackborn
ad02795d4e
am 042042b8: am 2bd83c00: Merge "Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"" into gingerbread
...
* commit '042042b809e3a0ff6cea915ccc7b176948833be9':
Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"
2010-12-14 14:18:33 -08:00
Dianne Hackborn
2f64cb31a8
am 2bd83c00: Merge "Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"" into gingerbread
...
* commit '2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704':
Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"
2010-12-14 14:15:16 -08:00
Dianne Hackborn
a2037834cf
Merge "Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"" into gingerbread
2010-12-14 14:12:37 -08:00
Louis Huemiller
243b62faec
Merge "HWC Stres Test Enhancments"
2010-12-14 14:08:09 -08:00
Jeff Brown
d2bb5dd5e1
Merge "Expose split touch API on PopupWindow."
2010-12-14 14:04:59 -08:00
Jesse Wilson
bd638df84e
Merge "Move HashMapTest from frameworks/base to libcore (second half)"
2010-12-14 14:02:55 -08:00
Romain Guy
d1e927839c
Merge "Colors are in the [0..1] range, not [0..255]"
2010-12-14 13:45:07 -08:00
Gilles Debunne
2cfcdd940b
Merge "Heterogeneous comment for convertView in getView documentation"
2010-12-14 13:32:23 -08:00
James Dong
1183482369
Merge "Fix an issue where a fixed number of bits per sample is used for seek position calculation."
2010-12-14 12:28:31 -08:00
Jeff Brown
21447c3dfd
Merge "Update shortcuts."
2010-12-14 12:12:07 -08:00
Xavier Ducrohet
9bff6840c6
Merge "LayoutLib: Use the new ninepatch API to suppor density."
2010-12-14 12:03:21 -08:00
Gilles Debunne
4e521922f4
Merge "Removed no longer used longPressCallback in TextView"
2010-12-14 11:59:01 -08:00
Romain Guy
2257e73b8f
Merge "OpenGLRenderer would not render colors < ALPHA_THRESHOLD Bug #3282805 "
2010-12-14 11:52:02 -08:00
Alon Albert
4813994a2e
Merge "Do not increase backoff before it expires"
2010-12-14 11:32:45 -08:00
Shih-wei Liao
b350a8a827
Merge "1. Add Context to a RenderScript or RenderScriptGL instance. This is to allow RenderScript to better interact with the Android environment. E.g., per-app cache. 2. Plumbing, testing. 3. Added getApplicationContext in RenderScript.java."
2010-12-14 11:32:43 -08:00
Dan Morrill
903d98de37
am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
...
* commit '0ccc8b7345eac0b507c221be47e55926cbda8957':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
2010-12-14 11:31:29 -08:00
Dan Morrill
73b0f04171
am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
...
* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
2010-12-14 11:28:50 -08:00
Dan Morrill
78bcc605dd
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
2010-12-14 11:27:20 -08:00
Christopher Tate
72587b9fb7
Merge "Time out orphaned / unresponsive restore sessions"
2010-12-14 10:32:05 -08:00
Louis Huemiller
5d86b53dc1
HWC Stres Test Enhancments
...
+ YV12 width/height divisable by 2
+ Row width determined by getStride()
+ Misc comment and whitespace fixes
+ printf changed to testPrintI
Change-Id: I27551141bafbfb258eb1b6b7f63c5295b1f9501a
2010-12-14 10:31:57 -08:00
Christopher Tate
bc08f3782e
Merge "Don't restore wildly wrong sized wallpapers"
2010-12-14 10:31:56 -08:00
Costin Manolache
996c0014ef
am 7afa1613: am a848d344: Merge "Fix bug in permission grant system." into gingerbread
...
* commit '7afa161368308e78bb4a66b4fd32558dfd556776':
Fix bug in permission grant system.
2010-12-14 10:20:41 -08:00
Costin Manolache
03eb37e4dd
am a848d344: Merge "Fix bug in permission grant system." into gingerbread
...
* commit 'a848d3445090e114cbfe61f1c7449122a665fba6':
Fix bug in permission grant system.
2010-12-14 10:14:10 -08:00
Andreas Huber
7f260f57df
Merge "Properly signal the condition if we run out of input data."
2010-12-14 10:11:28 -08:00
Andreas Huber
b02e0cbc72
Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."
2010-12-14 10:11:11 -08:00
Costin Manolache
eaefb93b61
Merge "Fix bug in permission grant system." into gingerbread
2010-12-14 10:07:26 -08:00
Brad Fitzpatrick
1b60843547
Framework-side support for Dalvik "isSensitiveThread" hook.
...
Used in lock contention stats.
Bug: 3226270
Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
2010-12-14 09:28:16 -08:00
Chet Haase
f5da3fd78a
Merge "Adding TimeAnimator capability (hidden for now)"
2010-12-14 09:18:33 -08:00
satok
15a6cf370d
Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY""
2010-12-14 05:45:44 -08:00
Joe Onorato
7bf1974b52
Merge "notification panel animations"
2010-12-14 01:22:23 -08:00