Patrick Dubroy
4b4a005a89
Merge "Allow a JNI local ref to be passed directly into globalRef()."
2010-12-15 15:33:29 -08:00
Andreas Huber
d090b053ea
Merge "Initial support for a true streaming player for mpeg2 transport streams."
2010-12-15 15:22:29 -08:00
Brad Fitzpatrick
ca9f16af54
Merge "Put Log.wtf's terrible failure in logcat -b main."
2010-12-15 15:16:42 -08:00
Svetoslav Ganov
f6b7f552cb
Merge "Updating the light Date picker theme. Some UI fixes."
2010-12-15 15:13:49 -08:00
Andreas Huber
a1aca6f49f
Merge "Proper recovery of timestamp information in the transport stream parser."
2010-12-15 14:55:29 -08:00
Jim Miller
b97eeb43b9
Merge "Fix 3148496: Update LockScreen assets & layouts"
2010-12-15 14:55:04 -08:00
Daniel Sandler
fe950dc019
Merge "Remove unused assets in SystemUI."
2010-12-15 14:54:52 -08:00
Scott Main
fb515f22e9
am 61aeb2b7: (-s ours) am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
...
* commit '61aeb2b7212cae211ce68b3600ddbe69c6e98bb3':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
2010-12-15 14:39:33 -08:00
Mathias Agopian
589cf24909
Merge "Fix a problem where hwc and GL composition could show a different buffer"
2010-12-15 14:38:57 -08:00
Jim Miller
733ea55ebf
Merge "Fix 3201849: Tweak WaveView animation; update resource."
2010-12-15 14:12:21 -08:00
Scott Main
46c3ecd9f4
am b094b0c4: modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
...
* commit 'b094b0c4a4309f48d9da7253de78ebda20a8a81c':
modifications to webinars: add the ability to add an upcoming webinar event to Google Calendar; add some introduction text; adjust some markup
2010-12-15 14:11:08 -08:00
Jim Miller
ee12e19186
Merge "Fix 3253629: Tweaks to recent apps"
2010-12-15 14:10:49 -08:00
Xavier Ducrohet
114b271e90
Merge "LayoutLib: replace the stack of Graphics2D with custom snapshots."
2010-12-15 13:50:37 -08:00
Adam Cohen
c74bb5e79e
Merge "Fix in StackView layout"
2010-12-15 13:18:33 -08:00
Dianne Hackborn
ee9b385a89
am b32ea255: am 7daaa98c: Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
...
* commit 'b32ea25529589a77ede8faf278068157107ba897':
Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity
2010-12-15 13:00:52 -08:00
Dianne Hackborn
17b34c8155
am 7daaa98c: Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
...
* commit '7daaa98c6531373a2a742c1360f0a2795de0619f':
Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity
2010-12-15 12:58:54 -08:00
Dianne Hackborn
a43aa9c8fc
Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
2010-12-15 12:56:53 -08:00
Patrick Dubroy
223a11d9eb
Merge "Turn fatal assertion in decodeRegion into a warning."
2010-12-15 12:44:32 -08:00
Scott Main
da7d566709
Merge "docs: updates to menu resource doc for new attributes"
2010-12-15 12:11:10 -08:00
Scott Main
6f8730da02
am 9278d321: am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '9278d3216837ad45eae13b87f04f050acb4ddafa':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 12:01:58 -08:00
Scott Main
2f1543e56b
am d88c90fb: am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit 'd88c90fb0805b2dda5664f413b32ada5a5fa6fdc':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 12:01:53 -08:00
Scott Main
eafa4d5b19
am 8591872a: am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '8591872a5c37754aa3be3ef575d3de667f8ee70c':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:59:16 -08:00
Scott Main
4e9f47951d
am 52078255: cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
...
* commit '52078255dacabe9b779613b032a4dc3706b2b5d3':
cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
2010-12-15 11:56:04 -08:00
Scott Main
2a0c84911a
am 6390fa6b: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
...
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37':
cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
2010-12-15 11:56:00 -08:00
Scott Main
fcdb5893fa
am 92b03085: cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
...
* commit '92b0308530d21195425c918cbe6057dd84f37992':
cherrypick Change-Id: I19d2be00c807b6cbdab357b32a7dd13f98a5433e docs: update to adt 8.0.1; delete ADT archive page, put a redirect in its place; update tools release notes and sys reqs to require ant 1.8
2010-12-15 11:53:20 -08:00
Eric Laurent
200d9b28c8
Merge "Change audio routing policy for HDMI"
2010-12-15 11:48:46 -08:00
Adam Cohen
801a28e6b2
Merge "New stack visualization"
2010-12-15 11:20:43 -08:00
Irfan Sheriff
97656c362e
Merge "Use clear names for native API"
2010-12-15 11:18:04 -08:00
Robert Greenwalt
e9cce1f5a2
Merge "Fix some older (depricated) API so they work."
2010-12-15 11:13:21 -08:00
Alex Sakhartchouk
6cda55c4a2
Merge "Cleanup and refactoring of an earlier cl."
2010-12-15 11:05:23 -08:00
Irfan Sheriff
efecc3ded6
Merge "Handle supplicant stop correctly"
2010-12-15 09:58:12 -08:00
Huahui Wu
ad934fab96
Merge "b/2864818 Prompt the SSL error dialog to user and proceed or cancel the request. C++ side cl: https://android-git.corp.google.com/g/#change,84529 "
2010-12-15 09:42:35 -08:00
Andreas Huber
5340982fc0
Merge "Emit better (correct) timestamps that respect AAC upsampling."
2010-12-15 09:17:21 -08:00
Ben Murdoch
eb1fbbdbc5
Merge "Remove fragment as well as the query from URLs when resolving MIME type"
2010-12-15 09:07:02 -08:00
Leon Scroggins
082adfbb37
Merge "Make a long press on a textfield work."
2010-12-15 07:07:51 -08:00
Jason Sams
5cab4b4e18
Merge "Fix mipmap bug introduced with Allocation cleanup. Add syncAll to rsg headers."
2010-12-15 02:11:26 -08:00
Dianne Hackborn
ca6b5a3011
Merge "Fix launching of activities that I broke."
2010-12-15 00:22:43 -08:00
James Dong
625ad2b024
Merge "Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature"
2010-12-14 22:25:02 -08:00
satok
1625f7a9ae
Merge "Fix the bug that IME switch button is shown when there are two IME is installed but only one IME is enabled."
2010-12-14 21:01:05 -08:00
Mathias Agopian
420a283c4d
Fix a problem where hwc and GL composition could show a different buffer
...
if a surface's buffers are reallocated, the current active buffer will
end-up pointing on one of these until a new buffer is retired.
we're now keeping a reference to the actual buffer until we retire a
new one.
Change-Id: Ib1703947e7a0340694d846e0962576318863b935
2010-12-14 20:30:37 -08:00
Romain Guy
91830abcd9
Merge "Cleanup OpenGLRenderer::drawLines()"
2010-12-14 20:13:18 -08:00
Mike Lockwood
9164500964
Merge "Clean up USB notifications:"
2010-12-14 19:23:02 -08:00
Romain Guy
ca4f54975d
Merge "Fix the build."
2010-12-14 18:43:44 -08:00
Mathias Agopian
c6e048dce0
Merge "fix debug.sf.showbackground"
2010-12-14 18:40:18 -08:00
Mathias Agopian
ebeb709596
fix debug.sf.showbackground
...
Change-Id: Ie4eeca006ad6d8030900d8cb0029e4d1c22474fb
2010-12-14 18:38:36 -08:00
Adam Powell
9361c65169
Merge "Fix bug 3274422 - Prevent pop-in of items in certain lists"
2010-12-14 18:01:36 -08:00
Vasu Nori
d25fd4f29c
Merge "bug:3264401 changes to support usage of new downloads dir in /data"
2010-12-14 17:57:41 -08:00
Patrick Dubroy
14d1cf528f
Merge "Fix build break due to additional arg in Bitmap ctor"
2010-12-14 17:57:00 -08:00
Dianne Hackborn
c40cd42a6c
Merge "Fix Dialog generating multiple onCancel()."
2010-12-14 17:51:44 -08:00
Scott Main
0fa9dd8638
am f6847bf3: am e09009d6: cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
...
* commit 'f6847bf386bc063f178ae2aabfff040ef90bd7d7':
cherrypick Change-Id: I719d9a9929a56c0586a7daba8f889706ec7b2bc1 docs: remove adt.jd and place a redirect in its place to go to ADT Plugin doc
2010-12-14 17:48:50 -08:00