Steve Block
c554b4b4c4
Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set"
2011-09-28 10:11:55 -07:00
Elliott Hughes
d8cf475848
Merge "Add ICS-specific notes to the JNI tips documentation."
2011-09-28 09:56:11 -07:00
Marco Nelissen
9cdf2e0b82
Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634"
2011-09-28 09:41:12 -07:00
Brian Colonna
50c64a3e50
Merge "Added landscape views for Face Unlock"
2011-09-28 06:13:53 -07:00
Brian Colonna
24f5091c00
Merge "Fix 5323545 - FaceLock no longer appears when taking a call"
2011-09-28 06:13:44 -07:00
Chih-Chung Chang
37765bc554
Merge "Fix 5158468: Update floating window size when the anchor view size changes."
2011-09-28 04:48:06 -07:00
Flavio Lerda
09b8c10246
Merge "Do not format numbers starting with hash or star."
2011-09-28 04:38:00 -07:00
Steve Block
30904734a5
Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"
2011-09-28 02:45:28 -07:00
Mathew Inwood
0ea9250b34
Merge "Document thrown IllegalArgumentException."
2011-09-28 01:20:04 -07:00
Fabrice Di Meglio
fe5c09c79f
Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"
2011-09-27 18:45:57 -07:00
Guang Zhu
bf28f07bd1
Merge "Use CPU upload path in DRT"
2011-09-27 18:27:36 -07:00
Romain Guy
66b460c01c
Merge "Add a bit more doc to TextureView"
2011-09-27 17:45:46 -07:00
Romain Guy
fa870606e7
am 0e8fb15d: (-s ours) CherryPick 043a6b from master: do not merge.
...
* commit '0e8fb15da2bd0912aa74ba6709dfe3d5b7c84fde':
CherryPick 043a6b from master: do not merge.
2011-09-27 16:44:28 -07:00
Jesse Wilson
54b6a9bdb9
Merge "Test to demonstrate NPE in DefaultRequestDirector"
2011-09-27 16:31:10 -07:00
Xavier Ducrohet
427a4870dc
Merge "Don't use OpenGL ES 2.0 to render the wallpaper on the emulator. Bug #5352896 "
2011-09-27 15:47:55 -07:00
Andreas Huber
bce07c4ed0
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
2011-09-27 15:26:43 -07:00
Peter Ng
39200c41ac
Merge "Lockscreen handle is now a locked icon and not an unlocked"
2011-09-27 15:07:39 -07:00
Eric Fischer
873ea0407a
am ce9756d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
...
* commit 'ce9756d06dd8aebb7b92879ab3b02bbe8f290992':
Import revised translations. DO NOT MERGE
2011-09-27 14:55:44 -07:00
Eric Fischer
a3cc6e758c
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-27 14:54:12 -07:00
Scott Main
67475479d7
Merge "docs: mix of BT and NFC javadoc updates Add Health profile to various discussions about profiles Add descriptions to NFC interfaces, tweak some desciptions, and fix some broken links"
2011-09-27 14:49:12 -07:00
Jamie Gennis
ed984d9406
Merge changes Ib302d79e,Ib4ee085f
...
* changes:
SurfaceFlinger: set layer names on SurfaceTextures
SurfaceTexture: add name support
2011-09-27 14:24:09 -07:00
Eric Laurent
26f1ba4af0
Merge "Fix issue 5373658: memory leak in AudioFlinger."
2011-09-27 14:07:45 -07:00
Andreas Huber
9a6ca75456
Merge "Signal an appropriate error even if there are no active streams yet."
2011-09-27 13:36:22 -07:00
Alon Albert
ffb329be54
Merge "Add Detailed Sync Stats Section Also improve history formatting Here's a smaple of what it looks like:"
2011-09-27 13:29:11 -07:00
Daniel Sandler
cfad93cf8d
am 25bb73eb: Merge "Remove "excessive sync" icon." into ics-factoryrom
...
* commit '25bb73eb1bc16921cc013b9b150c2d440d650c39':
Remove "excessive sync" icon.
2011-09-27 13:08:54 -07:00
Daniel Sandler
3153a1ca9d
Merge "Remove "excessive sync" icon." into ics-factoryrom
2011-09-27 13:06:01 -07:00
David 'Digit' Turner
850bb94ad8
am 45c65741: am be49703e: am d51ecafa: opengl: Ensure we only load the GLES emulation library when the emulator supports it.
...
* commit '45c657411774f900c79f6cb611bc1dc7887a1865':
opengl: Ensure we only load the GLES emulation library when the emulator supports it.
2011-09-27 12:36:15 -07:00
Jamie Gennis
e790db9980
am da42e0fa: Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
...
* commit 'da42e0faaa95c796dc49f3b38023562dab6584a7':
SurfaceFlinger: fix setting default buffer size
2011-09-27 12:32:17 -07:00
Jamie Gennis
1b5f4e61ff
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
2011-09-27 12:28:59 -07:00
Adam Powell
d812df9035
Merge "Improve docs in BaseAdapter."
2011-09-27 12:06:33 -07:00
Tsu Chiang Chuang
1c7b6d2abb
Merge "adding packet count and removing extra uid stats that were used for debugging."
2011-09-27 11:18:13 -07:00
Steve Block
d1855d659d
Merge changes If97c4d76,I1cd975b1
...
* changes:
Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
2011-09-27 10:52:50 -07:00
Eric Laurent
5b873c06e0
Merge "Fix issue 5373048: AudioCache decode errors"
2011-09-27 10:32:17 -07:00
Peter Ng
93c9b169fe
Merge "Fixed jaggy circles in pattern unlock"
2011-09-27 10:24:54 -07:00
The Android Open Source Project
14251e5a96
Reconcile with ics-factoryrom-release
...
Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
2011-09-27 10:10:44 -07:00
Justin Ho
278dcb97a8
am 5fd141c2: Merge "Updated stat_sys icons" into ics-factoryrom
...
* commit '5fd141c245051f2fa84bf2559a417577391e40df':
Updated stat_sys icons
2011-09-27 09:56:25 -07:00
Justin Ho
b454e0bb97
Merge "Updated stat_sys icons" into ics-factoryrom
2011-09-27 09:54:40 -07:00
Daniel Sandler
351d6551f5
am abff032e: Draw smaller system status icons without scaling.
...
* commit 'abff032e783398be7a1c6b7e1e25a73a8467adcf':
Draw smaller system status icons without scaling.
2011-09-27 09:23:05 -07:00
Teng-Hui Zhu
4771fb3a86
Merge "Double check the permission before setting the Wake Lock"
2011-09-27 09:07:13 -07:00
The Android Automerger
5a6325d512
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-27 03:52:49 -07:00
Irfan Sheriff
ae5b91c679
Merge "Switch to cfg based signal_poll command"
2011-09-26 22:11:03 -07:00
Scott Main
7f5520be41
Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
2011-09-26 21:55:24 -07:00
Jim Miller
23b2ef6864
am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom
...
* commit 'b4f0a9f3894c1f039168ad672f4aa194999c7cdd':
Fix 5326463: rework sim state handling in lockscreen
2011-09-26 20:40:59 -07:00
Christopher Tate
6d1e9efcde
am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" into ics-factoryrom
...
* commit '7462251b0a3f2601236b599bcabf54451143b704':
Don't hang in restore if the transport reports failure
2011-09-26 20:40:56 -07:00
Fabrice Di Meglio
f5c89e2af2
am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom
...
* commit 'a200a23af10dfcbbe46d10e868c2eae9f2c794a4':
Bug 5332065: IOOB in case the suggestionSpan has been removed
2011-09-26 20:40:54 -07:00
Mathias Agopian
5dfe70df37
am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom
...
* commit '8632561e14c5cc546cec39edd213ea8cc7aea2f9':
Make the status and navigation bars OPAQUE.
2011-09-26 20:40:50 -07:00
Mathias Agopian
2634dac75c
am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not used" into ics-factoryrom
...
* commit 'a2a3f1e7e6a31f1109a3c25a48c33d3d67cb1adc':
don't clear the framebuffer when the framebuffer is not used
2011-09-26 20:40:48 -07:00
Mathias Agopian
e693beecf8
am a7969d91: Merge "Do not blend opaque windows." into ics-factoryrom
...
* commit 'a7969d91ad7547e5a83d54df835ca6820fef0927':
Do not blend opaque windows.
2011-09-26 20:40:47 -07:00
Mathias Agopian
f22710b394
am 781fea80: Region cannot handle malformed Rects. Abort the Region op in that case.
...
* commit '781fea802b6b1c2e33a35dfe24c6ec29ed73a9c2':
Region cannot handle malformed Rects. Abort the Region op in that case.
2011-09-26 20:40:46 -07:00
Mathias Agopian
5f5b9173a7
am 04ba6d0e: (-s ours) Make sure Region handles invalid rectangles
...
* commit '04ba6d0ebd6a750d2ab2794af5bc4a8406178f00':
Make sure Region handles invalid rectangles
2011-09-26 20:40:45 -07:00