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
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
Jason Sams
d216fbd947
Merge "More API updates."
2010-12-13 23:53:35 -08:00
satok
4e4bbb9f3e
Merge "Hide ime switch icon when there are only one IME and no enabled subtypes"
2010-12-13 22:15:17 -08:00
Mike Lockwood
dfa46356d7
Merge "MTP: check for replacing existing files via the database instead of the file system"
2010-12-13 22:03:14 -08:00
Dianne Hackborn
90ad5ef66f
Merge "Fix issue #3258849 : Grab thumbnail when exiting an app via back"
2010-12-13 20:54:48 -08:00
Irfan Sheriff
a20bbf9396
Merge "WPS fixes and refactor"
2010-12-13 19:25:59 -08:00
Roman Nurik
ff6b9b1395
am 483654fb: am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
...
* commit '483654fb724c7aab619303b50025b6bb25431e87':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
2010-12-13 19:18:26 -08:00
Roman Nurik
da03387dc8
am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
...
* commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
2010-12-13 19:15:28 -08:00
Roman Nurik
992b150891
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
2010-12-13 19:12:42 -08:00
Jeff Brown
5b57dd6493
Merge "Make framework modifier key handling more precise."
2010-12-13 18:33:00 -08:00
Romain Guy
c6eb6e5854
Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."
2010-12-13 18:30:15 -08:00
Xavier Ducrohet
ecc699b80a
Merge "LayoutLib: implement more of Canvas/Paint."
2010-12-13 18:24:11 -08:00
Gilles Debunne
b0f0fb8b33
Merge "setTextIsSelectable documentation updated."
2010-12-13 18:11:51 -08:00
Adam Powell
b847db0efb
Merge "Fix bug 3281956 - Cherry-picked from GB"
2010-12-13 18:06:00 -08:00
Jaikumar Ganesh
1182c70f3f
Merge "Remove delay with auto connection."
2010-12-13 16:49:50 -08:00
Scott Main
bdc5c4631e
Merge "docs: remove getting started guide for preview"
2010-12-13 16:48:43 -08:00
Chet Haase
2f0346d46d
Merge "Fix artifact with concurrent add/remove LayoutTransitions"
2010-12-13 16:47:00 -08:00
Brad Fitzpatrick
fcf8fc7564
am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
...
* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899':
Fix StrictMode javadoc copy/paste error.
2010-12-13 16:30:17 -08:00
Nick Kralevich
43ec91762b
am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
...
* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
Avoid leaking sockets.
2010-12-13 16:30:10 -08:00
Dianne Hackborn
3c4fe4b1f3
Merge "resolved conflicts for merge of 78e9f4cb to master"
2010-12-13 16:28:01 -08:00
Brad Fitzpatrick
9336c2b4bf
am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
...
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
Fix StrictMode javadoc copy/paste error.
2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
7ed1f656a6
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
2010-12-13 15:25:09 -08:00
Alex Sakhartchouk
9ed3d102b5
Merge "Perf test"
2010-12-13 15:24:20 -08:00
Nick Kralevich
82a2c8230a
am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
...
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
Avoid leaking sockets.
2010-12-13 15:05:20 -08:00
Nick Kralevich
7fcd6df049
Merge "Avoid leaking sockets." into gingerbread
2010-12-13 15:03:28 -08:00
Dianne Hackborn
aa8de55632
resolved conflicts for merge of 78e9f4cb to master
...
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
2010-12-13 14:55:25 -08:00
Romain Guy
ed8e999604
Merge "Improve error detection in HardwareRenderer.draw(). Bug #3280872 "
2010-12-13 14:43:41 -08:00
Dianne Hackborn
b8083135a8
am e4a59519: Fix issue #3154576 : battery stats checkin should include UID -> packages+ map
...
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
Fix issue #3154576 : battery stats checkin should include UID -> packages+ map
2010-12-13 14:37:09 -08:00
Brian Carlstrom
c690807777
Merge "Update API for CopyOnWriteArrayList "synchronized" changes"
2010-12-13 14:30:39 -08:00