OSDN Git Service
Gilles Debunne [Thu, 19 Jan 2012 18:23:32 +0000 (10:23 -0800)]
Merge "Touch slop added to double tap detection"
Gilles Debunne [Thu, 19 Jan 2012 18:23:18 +0000 (10:23 -0800)]
Merge "Fixes around extract mode"
Teng-Hui Zhu [Thu, 19 Jan 2012 18:00:40 +0000 (10:00 -0800)]
Merge "Support full screen back to back playing using javascript"
Glenn Kasten [Thu, 19 Jan 2012 14:10:37 +0000 (06:10 -0800)]
Merge "Fix incorrect includes of AudioTrack.h"
Glenn Kasten [Thu, 19 Jan 2012 14:09:20 +0000 (06:09 -0800)]
Merge "Simplify range check for audio_mode_t (continued)"
Glenn Kasten [Thu, 19 Jan 2012 14:09:05 +0000 (06:09 -0800)]
Merge "Add units to time periods"
Glenn Kasten [Thu, 19 Jan 2012 14:08:53 +0000 (06:08 -0800)]
Merge "Use const const strings for arrays and pointers to strings"
Glenn Kasten [Thu, 19 Jan 2012 14:08:40 +0000 (06:08 -0800)]
Merge "For booleans, use ! instead of == false"
Glenn Kasten [Thu, 19 Jan 2012 14:08:12 +0000 (06:08 -0800)]
Merge "Replace run-time stream types by compile-time"
Jeff Brown [Thu, 19 Jan 2012 02:31:06 +0000 (18:31 -0800)]
Merge "Fix issues with reentrant SQLite triggers."
Romain Guy [Thu, 19 Jan 2012 02:14:27 +0000 (18:14 -0800)]
Merge "Add basic code required for drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:11:09 +0000 (18:11 -0800)]
Merge "Don't crash on Canvas.drawPicture()"
Romain Guy [Thu, 19 Jan 2012 02:01:34 +0000 (18:01 -0800)]
Merge "Full support for Canvas.drawPosText"
Wink Saville [Thu, 19 Jan 2012 00:08:04 +0000 (16:08 -0800)]
am
7b6231a4: am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Christopher Tate [Thu, 19 Jan 2012 00:07:28 +0000 (16:07 -0800)]
Merge "Fix edge cases leading to backup hanging forever"
Wink Saville [Thu, 19 Jan 2012 00:05:43 +0000 (16:05 -0800)]
am
aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
* commit '
aba798510129327a046d57844381382fb1faa3ba':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
Wink Saville [Thu, 19 Jan 2012 00:03:24 +0000 (16:03 -0800)]
Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1
Stephen Hines [Wed, 18 Jan 2012 23:42:46 +0000 (15:42 -0800)]
Merge "Run ComputePerf multiple times."
Adam Powell [Wed, 18 Jan 2012 22:51:35 +0000 (14:51 -0800)]
am
a6a0d134: am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
a6a0d134ebfb0931473c5e54f21ff543e08b4a91':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:49:30 +0000 (14:49 -0800)]
am
04f38489: Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
* commit '
04f3848986efda8cf006f575d2e4990f120a1bc8':
Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified.
Adam Powell [Wed, 18 Jan 2012 22:47:20 +0000 (14:47 -0800)]
Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1
Jeff Brown [Wed, 18 Jan 2012 22:43:16 +0000 (14:43 -0800)]
Merge "Improve heuristics for orientation detection."
Michael Kolb [Wed, 18 Jan 2012 22:00:52 +0000 (14:00 -0800)]
Merge "Prevent IME from popping up on startup"
Robert Ly [Wed, 18 Jan 2012 21:21:54 +0000 (13:21 -0800)]
am
c891c6ef: am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
c891c6eff7ab320092af4ec5b235f83866f66261':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:21:51 +0000 (13:21 -0800)]
am
43fda84e: am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
43fda84e91b1fe356af35386d2f304d3ab71529e':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:19:52 +0000 (13:19 -0800)]
am
013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '
013dbcf0783f55efbb75e6c2794478c27d172c8c':
docs: adding rs api docs
Robert Ly [Wed, 18 Jan 2012 21:19:50 +0000 (13:19 -0800)]
am
6ad9ea7d: Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
* commit '
6ad9ea7deb669eca68c58f001c935255c3294cfe':
update overview page for rs api docs to open iframe links in parent
Robert Ly [Wed, 18 Jan 2012 21:18:11 +0000 (13:18 -0800)]
Merge "docs: adding rs api docs" into ics-mr1
Robert Ly [Wed, 18 Jan 2012 21:17:51 +0000 (13:17 -0800)]
Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1
Martijn Coenen [Wed, 18 Jan 2012 21:09:55 +0000 (13:09 -0800)]
Merge "Remove LlcpPacket from public namespace."
Joe Fernandez [Wed, 18 Jan 2012 20:37:22 +0000 (12:37 -0800)]
am
58f9c3da: am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
58f9c3da340eb36051bc20d6b8cec6b982852ee0':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:35:30 +0000 (12:35 -0800)]
am
dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit '
dd41d360eac45ceae92963ed3f100f1c39dd5db2':
docs: Android API 15 SDK r2 Release Notes
Joe Fernandez [Wed, 18 Jan 2012 20:33:45 +0000 (12:33 -0800)]
Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
Andreas Huber [Wed, 18 Jan 2012 19:01:00 +0000 (11:01 -0800)]
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
Andreas Huber [Wed, 18 Jan 2012 17:29:56 +0000 (09:29 -0800)]
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
Bryan Mawhinney [Wed, 18 Jan 2012 16:58:19 +0000 (08:58 -0800)]
Merge "Make sure seek triggers a reconnect if needed."
Glenn Kasten [Wed, 18 Jan 2012 15:46:18 +0000 (07:46 -0800)]
Merge "Track volume cleanup"
Romain Guy [Wed, 18 Jan 2012 01:40:24 +0000 (17:40 -0800)]
Merge "First pass at implementing Canvas.drawPosText() in GL"
Eric Laurent [Wed, 18 Jan 2012 01:35:03 +0000 (17:35 -0800)]
Merge "audio framework: manage stream volume per device"
Romain Guy [Wed, 18 Jan 2012 01:33:15 +0000 (17:33 -0800)]
Merge "Free optimization"
Svetoslav Ganov [Wed, 18 Jan 2012 01:25:56 +0000 (17:25 -0800)]
Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes."
Tadashi G. Takaoka [Wed, 18 Jan 2012 00:57:56 +0000 (16:57 -0800)]
Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions"
Teng-Hui Zhu [Tue, 17 Jan 2012 23:35:04 +0000 (15:35 -0800)]
Merge "Support javascript to exit full screen video."
Adam Cohen [Tue, 17 Jan 2012 23:25:22 +0000 (15:25 -0800)]
Merge "Hinting RemoteViewsAdapter as to which views are visible"
Michael Jurka [Tue, 17 Jan 2012 23:05:23 +0000 (15:05 -0800)]
Merge "Check if View's alpha must be updated in setter"
Romain Guy [Tue, 17 Jan 2012 22:54:45 +0000 (14:54 -0800)]
Merge "Fix text encoding when drawing with drawPosText in software"
Glenn Kasten [Tue, 17 Jan 2012 22:41:28 +0000 (14:41 -0800)]
Merge "Fix build warnings"
Glenn Kasten [Tue, 17 Jan 2012 22:10:07 +0000 (14:10 -0800)]
Merge "Remove dead setVolume() and mVolume[2]"
Glenn Kasten [Tue, 17 Jan 2012 22:09:55 +0000 (14:09 -0800)]
Merge "Move fixed_fft to system/media/audio_utils"
Siva Velusamy [Tue, 17 Jan 2012 21:47:23 +0000 (13:47 -0800)]
Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers"
Michael Jurka [Tue, 17 Jan 2012 20:53:48 +0000 (12:53 -0800)]
Merge "Fix bug where recents stopped showing up"
Siva Velusamy [Tue, 17 Jan 2012 20:28:11 +0000 (12:28 -0800)]
gltrace: fixup data for glTexSubImage2D & glDeleteBuffers
Change-Id: I1c1deb8c6026ecf1fa0ed5287ccf601416eba6dc
Fabrice Di Meglio [Tue, 17 Jan 2012 19:51:22 +0000 (11:51 -0800)]
Merge "Fix bug #
5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points"
Glenn Kasten [Tue, 17 Jan 2012 19:32:53 +0000 (11:32 -0800)]
Merge "Use audio_mode_t consistently"
Romain Guy [Tue, 17 Jan 2012 19:30:22 +0000 (11:30 -0800)]
Merge "Improve GLES20Canvas clip support"
Glenn Kasten [Tue, 17 Jan 2012 19:29:01 +0000 (11:29 -0800)]
Merge "Rename Visualizer::mLock"
Teng-Hui Zhu [Tue, 17 Jan 2012 17:06:02 +0000 (09:06 -0800)]
Merge "Document update for WebView user to support HTML5 video"
John Reck [Tue, 17 Jan 2012 17:00:49 +0000 (09:00 -0800)]
Merge "Expand WebKitHitTest and do some preliminary caching"
Glenn Kasten [Tue, 17 Jan 2012 15:28:14 +0000 (07:28 -0800)]
Merge "Fix locking for mMasterVolume and mMute"
Glenn Kasten [Tue, 17 Jan 2012 15:27:46 +0000 (07:27 -0800)]
Merge "Use size_t for frame size"
Glenn Kasten [Tue, 17 Jan 2012 15:25:36 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 15:20:47 +0000 (07:20 -0800)]
Merge "Add android.os.Process.setThreadScheduler"
Glenn Kasten [Tue, 17 Jan 2012 15:18:26 +0000 (07:18 -0800)]
Merge "AudioTrack and AudioFlinger send level cleanup"
Scott Main [Sat, 14 Jan 2012 02:27:45 +0000 (18:27 -0800)]
am
2afcd2d1: am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
2afcd2d1a29f4417425630916e1ab93aa383cf1e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:25:44 +0000 (18:25 -0800)]
am
3938e4fb: Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
* commit '
3938e4fbaae132db9b4676ba26f6b3c042a6879e':
docs: emphasize qualifier order and mention implicit version qualifer
Scott Main [Sat, 14 Jan 2012 02:25:34 +0000 (18:25 -0800)]
am
114875e8: am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
114875e837163e1029536439ec3891bc2582acf2':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:25:31 +0000 (18:25 -0800)]
am
d4d68fe2: am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
d4d68fe20259e2d6aaae8bc4a38b360aa0b57081':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:25:28 +0000 (18:25 -0800)]
am
80c4cd1f: am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
80c4cd1fd7d44fcacbff7d4903ce227eb3add1e3':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:23:40 +0000 (18:23 -0800)]
Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1
Scott Main [Sat, 14 Jan 2012 02:23:35 +0000 (18:23 -0800)]
am
40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1
* commit '
40d6e7d913fe865accb8313efdb87aacd6d71f18':
docs: mention x86 as a native platform filter
Dianne Hackborn [Sat, 14 Jan 2012 02:23:34 +0000 (18:23 -0800)]
am
cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1
* commit '
cc7bd5ab550855c14c76701709b35d12a9677eb2':
Update notification documentation to follow current guidelines.
Daniel Sandler [Sat, 14 Jan 2012 02:23:33 +0000 (18:23 -0800)]
am
bd9d9d3a: cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
* commit '
bd9d9d3ae2a758139c7dd722c4836a33b9b059a8':
cherrypick from hc-mr2, updated adk installation instructions Change-Id: I6a0e21a79b81c3383d1fa05a4893bab5626dbe05
Scott Main [Sat, 14 Jan 2012 02:21:42 +0000 (18:21 -0800)]
Merge "docs: mention x86 as a native platform filter" into ics-mr1
Irfan Sheriff [Sat, 14 Jan 2012 00:41:41 +0000 (16:41 -0800)]
Merge "cleanup for concurrency"
Dianne Hackborn [Sat, 14 Jan 2012 00:36:05 +0000 (16:36 -0800)]
Merge "Update notification documentation to follow current guidelines." into ics-mr1
Michael Kolb [Sat, 14 Jan 2012 00:25:14 +0000 (16:25 -0800)]
Merge "fix layer scrollbar updates"
Jeff Sharkey [Fri, 13 Jan 2012 23:33:42 +0000 (15:33 -0800)]
Merge "Introduce FileRotator."
Jeff Brown [Fri, 13 Jan 2012 23:16:59 +0000 (15:16 -0800)]
Merge "Fix compilation with Clang."
Jeff Brown [Fri, 13 Jan 2012 23:16:28 +0000 (15:16 -0800)]
Merge "Fix a few memory leaks in the input dispatcher."
Gilles Debunne [Fri, 13 Jan 2012 22:53:54 +0000 (14:53 -0800)]
Merge "Sub display list in TextView"
David 'Digit' Turner [Fri, 13 Jan 2012 22:32:50 +0000 (14:32 -0800)]
Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
Stephen Hines [Fri, 13 Jan 2012 21:57:24 +0000 (13:57 -0800)]
Merge "Add support for new root.expand() calls."
Glenn Kasten [Mon, 19 Dec 2011 21:55:34 +0000 (13:55 -0800)]
Get AID_GRAPHICS from right place
Change-Id: I97b1754dc7260fec083275c71a8f71ebfb2cefa8
Kenny Root [Fri, 13 Jan 2012 21:39:28 +0000 (13:39 -0800)]
resolved conflicts for merge of
e80341c8 to master
Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef
Kenny Root [Fri, 13 Jan 2012 21:12:34 +0000 (13:12 -0800)]
am
2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
* commit '
2ddf6ea6dc67043fb9f91df366187c2153c30d30':
Fix issue with selecting proper JNI libraries
Kenny Root [Fri, 13 Jan 2012 21:11:02 +0000 (13:11 -0800)]
Merge "Fix issue with selecting proper JNI libraries" into ics-mr1
Dianne Hackborn [Fri, 13 Jan 2012 21:01:48 +0000 (13:01 -0800)]
am
10065177: am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
100651779fde99f7ae2a10719d688b51115f08e9':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:58:45 +0000 (12:58 -0800)]
am
2e282f35: Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
* commit '
2e282f35b009fe4c23daca35592dae2032641643':
Fix issue #
5823276: home repaints after full-screen app is exited
Dianne Hackborn [Fri, 13 Jan 2012 20:56:40 +0000 (12:56 -0800)]
Merge "Fix issue #
5823276: home repaints after full-screen app is exited" into ics-mr1
Bart Sears [Fri, 13 Jan 2012 20:37:53 +0000 (12:37 -0800)]
am
bcce2a19: am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
bcce2a195390c3f5fc235c3fa551d3d725a7f88a':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:35:07 +0000 (12:35 -0800)]
am
da7b7700: Merge "Update to latest version of Roboto" into ics-mr1
* commit '
da7b7700d0f499ac9b0bac51365b3da235388ae6':
Update to latest version of Roboto
Bart Sears [Fri, 13 Jan 2012 20:32:43 +0000 (12:32 -0800)]
Merge "Update to latest version of Roboto" into ics-mr1
Christopher Tate [Fri, 13 Jan 2012 20:18:55 +0000 (12:18 -0800)]
am
89620c5d: am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
89620c5d982858f590f3740169c9f69ee380be3e':
Streamline package-installed handling by the Backup Manager
Romain Guy [Fri, 13 Jan 2012 20:13:52 +0000 (12:13 -0800)]
Merge "Remove unused parameter"
Christopher Tate [Fri, 13 Jan 2012 20:08:09 +0000 (12:08 -0800)]
am
2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
* commit '
2cf18d28785fdd188641867503586627cb212302':
Streamline package-installed handling by the Backup Manager
Christopher Tate [Fri, 13 Jan 2012 19:49:20 +0000 (11:49 -0800)]
Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1
John Huang [Fri, 13 Jan 2012 19:41:01 +0000 (11:41 -0800)]
am
e6572304: am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:39:03 +0000 (11:39 -0800)]
am
2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
* commit '
2753e826b2d0e7a4c5f80c3e825afa4aa579942b':
Fix teardown of secondary connections on CDMA
John Huang [Fri, 13 Jan 2012 19:37:15 +0000 (11:37 -0800)]
Merge "Fix teardown of secondary connections on CDMA" into ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:28:09 +0000 (11:28 -0800)]
am
c0ef548c: am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
c0ef548c748f0c3bc917eff7b50941f9cbe1df86':
stagefright aacenc/amrwbenc: Remove trailing whitespace