Commit Graph

42867 Commits

Author SHA1 Message Date
Glenn Kasten
fb06f08c0a Merge "Replace run-time stream types by compile-time" 2012-01-19 06:08:12 -08:00
Jeff Brown
81e215f3df Merge "Fix issues with reentrant SQLite triggers." 2012-01-18 18:31:06 -08:00
Romain Guy
f1c2f9a22a Merge "Add basic code required for drawPicture()" 2012-01-18 18:14:27 -08:00
Romain Guy
3ed5198bf0 Merge "Don't crash on Canvas.drawPicture()" 2012-01-18 18:11:09 -08:00
Romain Guy
6c05083234 Merge "Full support for Canvas.drawPosText" 2012-01-18 18:01:34 -08:00
Wink Saville
78b9b6f6c6 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
2012-01-18 16:08:04 -08:00
Christopher Tate
033c95cdba Merge "Fix edge cases leading to backup hanging forever" 2012-01-18 16:07:28 -08:00
Wink Saville
0f467dcc93 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
2012-01-18 16:05:43 -08:00
Wink Saville
9b4e98aa15 Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1 2012-01-18 16:03:24 -08:00
Stephen Hines
f724170dc5 Merge "Run ComputePerf multiple times." 2012-01-18 15:42:46 -08:00
Adam Powell
947a9a0fd5 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.
2012-01-18 14:51:35 -08:00
Adam Powell
589629d2de 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.
2012-01-18 14:49:30 -08:00
Adam Powell
9d40d1e8d0 Merge "Fix DeviceDefault theme/style bugs where parent styles were incorrectly specified." into ics-mr1 2012-01-18 14:47:20 -08:00
Jeff Brown
8377e5905a Merge "Improve heuristics for orientation detection." 2012-01-18 14:43:16 -08:00
Michael Kolb
b86560dfb1 Merge "Prevent IME from popping up on startup" 2012-01-18 14:00:52 -08:00
Robert Ly
93ddcfd785 am c891c6ef: am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit 'c891c6eff7ab320092af4ec5b235f83866f66261':
  docs: adding rs api docs
2012-01-18 13:21:54 -08:00
Robert Ly
ee537418cf 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
2012-01-18 13:21:51 -08:00
Robert Ly
3d515c3a2e am 013dbcf0: Merge "docs: adding rs api docs" into ics-mr1
* commit '013dbcf0783f55efbb75e6c2794478c27d172c8c':
  docs: adding rs api docs
2012-01-18 13:19:52 -08:00
Robert Ly
75aa7310ea 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
2012-01-18 13:19:50 -08:00
Robert Ly
103e20348e Merge "docs: adding rs api docs" into ics-mr1 2012-01-18 13:18:11 -08:00
Robert Ly
140608dd28 Merge "update overview page for rs api docs to open iframe links in parent" into ics-mr1 2012-01-18 13:17:51 -08:00
Martijn Coenen
5144ffd264 Merge "Remove LlcpPacket from public namespace." 2012-01-18 13:09:55 -08:00
Joe Fernandez
66558b5989 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
2012-01-18 12:37:22 -08:00
Joe Fernandez
629e3a4885 am dd41d360: Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1
* commit 'dd41d360eac45ceae92963ed3f100f1c39dd5db2':
  docs: Android API 15 SDK r2 Release Notes
2012-01-18 12:35:30 -08:00
Joe Fernandez
617d0b0488 Merge "docs: Android API 15 SDK r2 Release Notes" into ics-mr1 2012-01-18 12:33:45 -08:00
Andreas Huber
b457eff8f3 Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures" 2012-01-18 11:01:00 -08:00
Andreas Huber
e75d488d20 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.)" 2012-01-18 09:29:56 -08:00
Bryan Mawhinney
9644a67eab Merge "Make sure seek triggers a reconnect if needed." 2012-01-18 08:58:19 -08:00
Glenn Kasten
628a011e2b Merge "Track volume cleanup" 2012-01-18 07:46:18 -08:00
Romain Guy
b202c1b9e3 Merge "First pass at implementing Canvas.drawPosText() in GL" 2012-01-17 17:40:24 -08:00
Eric Laurent
e2f3dccf37 Merge "audio framework: manage stream volume per device" 2012-01-17 17:35:03 -08:00
Romain Guy
6843f2593c Merge "Free optimization" 2012-01-17 17:33:15 -08:00
Svetoslav Ganov
09f7079073 Merge "AccessibilityEvent/AccessibilityNodeInfo class name property should be set to only framework classes." 2012-01-17 17:25:56 -08:00
Tadashi G. Takaoka
dfdf4124d1 Merge "Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions" 2012-01-17 16:57:56 -08:00
Teng-Hui Zhu
9ac2f3ce72 Merge "Support javascript to exit full screen video." 2012-01-17 15:35:04 -08:00
Adam Cohen
14d3742b29 Merge "Hinting RemoteViewsAdapter as to which views are visible" 2012-01-17 15:25:22 -08:00
Michael Jurka
bb81c3ef6c Merge "Check if View's alpha must be updated in setter" 2012-01-17 15:05:23 -08:00
Romain Guy
87dd2124dc Merge "Fix text encoding when drawing with drawPosText in software" 2012-01-17 14:54:45 -08:00
Glenn Kasten
4d903d5e90 Merge "Fix build warnings" 2012-01-17 14:41:28 -08:00
Glenn Kasten
edbb9345dc Merge "Remove dead setVolume() and mVolume[2]" 2012-01-17 14:10:07 -08:00
Glenn Kasten
d0a48a2e11 Merge "Move fixed_fft to system/media/audio_utils" 2012-01-17 14:09:55 -08:00
Siva Velusamy
dd9dd44c35 Merge "gltrace: fixup data for glTexSubImage2D & glDeleteBuffers" 2012-01-17 13:47:23 -08:00
Michael Jurka
22dde6d944 Merge "Fix bug where recents stopped showing up" 2012-01-17 12:53:48 -08:00
Siva Velusamy
34c726efb5 gltrace: fixup data for glTexSubImage2D & glDeleteBuffers
Change-Id: I1c1deb8c6026ecf1fa0ed5287ccf601416eba6dc
2012-01-17 12:28:11 -08:00
Fabrice Di Meglio
b714a5bf68 Merge "Fix bug #5870701 Thai text can be clipped when there are more glyphs generated than the initial number of code points" 2012-01-17 11:51:22 -08:00
Glenn Kasten
1d2653288f Merge "Use audio_mode_t consistently" 2012-01-17 11:32:53 -08:00
Romain Guy
ccb0d762cf Merge "Improve GLES20Canvas clip support" 2012-01-17 11:30:22 -08:00
Glenn Kasten
0ebc9501f6 Merge "Rename Visualizer::mLock" 2012-01-17 11:29:01 -08:00
Teng-Hui Zhu
8ffaf7f3b9 Merge "Document update for WebView user to support HTML5 video" 2012-01-17 09:06:02 -08:00
John Reck
c27148e490 Merge "Expand WebKitHitTest and do some preliminary caching" 2012-01-17 09:00:49 -08:00