ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity
43,049 Commits 2 Branches 0 Tags 54 MiB
3f59ab7cd0
Commit Graph

43049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Steve Block
00469f1940 Rename (IF_)LOG() to (IF_)ALOG() 
Change-Id: If49c81a2793182771c6160fbca93905daa6f44c1
 2012-01-18 11:08:20 +00: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
Glenn Kasten
bc550da6ae Merge "Fix locking for mMasterVolume and mMute" 2012-01-17 07:28:14 -08:00
Glenn Kasten
01317c28fc Merge "Use size_t for frame size" 2012-01-17 07:27:46 -08:00
Glenn Kasten
b8105e3392 Merge "Use audio_stream_type_t consistently" 2012-01-17 07:25:36 -08:00
Glenn Kasten
6447aa80a9 Merge "Add android.os.Process.setThreadScheduler" 2012-01-17 07:20:47 -08:00
Glenn Kasten
380cdee43b Merge "AudioTrack and AudioFlinger send level cleanup" 2012-01-17 07:18:26 -08:00
Scott Main
5b941c3233 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
 2012-01-13 18:27:45 -08:00
Scott Main
2b4332646c 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
 2012-01-13 18:25:44 -08:00
Scott Main
e0edc5b7b7 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
 2012-01-13 18:25:34 -08:00
Dianne Hackborn
8d9c020188 am d4d68fe2: am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'd4d68fe20259e2d6aaae8bc4a38b360aa0b57081':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:25:31 -08:00
Daniel Sandler
aefd164bfa 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
 2012-01-13 18:25:28 -08:00
Scott Main
37a79cfbec Merge "docs: emphasize qualifier order and mention implicit version qualifer" into ics-mr1 2012-01-13 18:23:40 -08:00
Scott Main
3d66c69643 am 40d6e7d9: Merge "docs: mention x86 as a native platform filter" into ics-mr1 
* commit '40d6e7d913fe865accb8313efdb87aacd6d71f18':
  docs: mention x86 as a native platform filter
 2012-01-13 18:23:35 -08:00
Dianne Hackborn
1f7dba4b26 am cc7bd5ab: Merge "Update notification documentation to follow current guidelines." into ics-mr1 
* commit 'cc7bd5ab550855c14c76701709b35d12a9677eb2':
  Update notification documentation to follow current guidelines.
 2012-01-13 18:23:34 -08:00
Daniel Sandler
f176920175 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
 2012-01-13 18:23:33 -08:00
Scott Main
3d3293b131 Merge "docs: mention x86 as a native platform filter" into ics-mr1 2012-01-13 18:21:42 -08:00
Irfan Sheriff
5098fcce97 Merge "cleanup for concurrency" 2012-01-13 16:41:41 -08:00
Dianne Hackborn
55f960feb3 Merge "Update notification documentation to follow current guidelines." into ics-mr1 2012-01-13 16:36:05 -08:00
Michael Kolb
6168fe00b1 Merge "fix layer scrollbar updates" 2012-01-13 16:25:14 -08:00
The Android Automerger
9eb6f85cb5 merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:18:17 -08:00
Jeff Sharkey
1be47191a0 Merge "Introduce FileRotator." 2012-01-13 15:33:42 -08:00