Robert Ly
8e41e13a9b
Merge "Doc change: fixing errors in library proj docs" into honeycomb
2011-02-24 18:07:28 -08:00
Robert Ly
3d5887032a
am 00e08463: Doc change: clarifying nfc tech filter usage
...
* commit '00e08463cb8df0969e71fd731a4e078680c4f2b5':
Doc change: clarifying nfc tech filter usage
2011-02-24 18:02:58 -08:00
Basavapatna Dattaguru
f92ab1c8b0
Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code"
2011-02-24 17:56:15 -08:00
Romain Guy
4b07fe8104
Merge "Correctly blend translucent GIF bitmaps."
2011-02-24 17:45:21 -08:00
Daniel Sandler
75fb678304
Merge "Notification flyover tuning:"
2011-02-24 17:33:41 -08:00
Xavier Ducrohet
5000d24f60
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 17:24:07 -08:00
Xavier Ducrohet
6043f96437
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
...
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
2011-02-24 17:19:38 -08:00
Adam Powell
6e31bee5de
Merge "Ensure WebView passes a complete/in-order event stream to ScaleGestureDetector. Prerequisite for several ScaleGestureDetector bugfixes."
2011-02-24 17:19:20 -08:00
Svetoslav Ganov
f5a68df842
Merge "Exposing the CalendarView of the DatePicker."
2011-02-24 16:48:38 -08:00
Svetoslav Ganov
d3e29cbc0b
Merge "The NumberPicker input cotrols are somtimes not shown."
2011-02-24 16:48:26 -08:00
Jamie Gennis
a0d1fc054e
Merge "Revert "Merge "Expand on the SurfaceTexture API docs."""
2011-02-24 16:48:15 -08:00
Jaikumar Ganesh
203aae27a3
Merge "Refactor android.server.BluetoothService classes."
2011-02-24 16:34:37 -08:00
Andreas Huber
b7a0545851
Merge "Alternate patch for late video issue: seek only the video ahead to the next"
2011-02-24 16:26:14 -08:00
Santosh Madhava
e6fc877616
Merge "Fix for issue 3485010: The project thumbnail is not regenerated"
2011-02-24 16:25:53 -08:00
Mathias Agopian
da26c6662d
Merge "Fix some issues with RefBase debugging."
2011-02-24 16:23:51 -08:00
Xavier Ducrohet
a79113be34
am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit '1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 16:21:41 -08:00
Xavier Ducrohet
c806fe1560
resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp
...
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
2011-02-24 16:15:11 -08:00
Andreas Huber
7f5a4dde54
Merge "Suppress the logging of URLs when in incognito mode."
2011-02-24 14:49:10 -08:00
Xavier Ducrohet
be82ce21d5
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
2011-02-24 14:44:58 -08:00
Xavier Ducrohet
e90a80a73d
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
2011-02-24 14:44:52 -08:00
Xavier Ducrohet
1205610ea2
Merge "LayoutLib: move tests to their own project."
2011-02-24 14:35:01 -08:00
Jamie Gennis
6305946693
Merge "Expand on the SurfaceTexture API docs."
2011-02-24 14:24:04 -08:00
Mike Lockwood
3235a323ef
Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"
2011-02-24 14:05:02 -08:00
Eric Fischer
a4a66641a0
Merge "Import revised translations."
2011-02-24 14:03:30 -08:00
Eric Hassold
ccfa7856be
Merge "Detect out of memory in extractAlpha"
2011-02-24 13:47:16 -08:00
Daniel Sandler
6d07aeb4ee
Merge "Remove commented cruft, TODOs, and dead code."
2011-02-24 13:36:52 -08:00
Christopher Tate
5a5ca785e2
Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"
2011-02-24 13:22:19 -08:00
Christopher Tate
c811e7a775
Binder linkage no longer depends on JNI objrefs as persistent tokens
...
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:
1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se. Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway. Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.
2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object. The implementation now asks Dalvik
whether object references match.
Bug 2090115
Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
2011-02-24 13:15:09 -08:00
Glenn Kasten
bfdabe59f2
Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"
2011-02-24 12:37:02 -08:00
Cary Clark
72c5f74ddb
Merge "center long press to account for sloppy nodes"
2011-02-24 12:19:09 -08:00
Eric Fischer
fc9d6d7d6c
am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '86409c8cb789cd7f672ee6de43e6bf1a337847db':
Import revised translations. DO NOT MERGE
2011-02-24 11:24:39 -08:00
Leon Scroggins
f2d330c789
Merge "Stop the blinking caret when moving to another field."
2011-02-24 11:21:41 -08:00
Eric Fischer
adc551c073
am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
Import revised translations. DO NOT MERGE
2011-02-24 11:18:56 -08:00
Eric Fischer
78948e6830
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-24 11:15:53 -08:00
Patrick Dubroy
c3b6278edc
Merge "Fix 3272590: Long-press on home & menu should be same as click"
2011-02-24 10:55:44 -08:00
Wink Saville
a7237c6e61
am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.
...
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
Do not start RILReceiver if wifi-only.
2011-02-24 10:52:53 -08:00
Wink Saville
2b5819058c
am 0dc8618d: Do not start RILReceiver if wifi-only.
...
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
Do not start RILReceiver if wifi-only.
2011-02-24 10:50:31 -08:00
repo sync
9912896482
am 3905bc6c: (-s ours) am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
...
* commit '3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829':
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:40:50 -08:00
Shimeng (Simon) Wang
f90fe961e8
Merge "Pre-calculate view scale and text wrap scale for webkit."
2011-02-24 10:32:18 -08:00
Gilles Debunne
805d00a660
Merge "Cursors correctly displayed with legacy theme."
2011-02-24 10:29:44 -08:00
Gilles Debunne
b13b9aa296
Merge "Text handles movement improvements."
2011-02-24 10:29:22 -08:00
repo sync
8097bccfd9
am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
...
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:26:49 -08:00
James Dong
612e3f6819
Merge "Fix MP3Extractor"
2011-02-24 10:11:46 -08:00
Glenn Kasten
3477a8cff2
Merge "Bug 3362814 Fix SMP race in access to mRequestExit"
2011-02-24 10:01:31 -08:00
repo sync
492301161b
resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
...
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
2011-02-24 09:58:25 -08:00
Alon Albert
1f3dcff801
Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread
2011-02-24 09:20:46 -08:00
Glenn Kasten
99cdf2d9ba
Merge "Don't crash when parsing DRM MIME types"
2011-02-24 08:17:02 -08:00
Kristian Monsen
820a58675d
Merge "Hiding deprecated classes and methods"
2011-02-24 08:02:34 -08:00
Derek Sollenberger
a467e15fb6
Merge "Skia Merge (revision 808)"
2011-02-24 05:27:34 -08:00
Wu-cheng Li
e2a148fae7
Merge "Add YV12 preview format to camera parameter constants."
2011-02-24 02:51:17 -08:00