Adam Powell
73fbc6320f
Merge "Fix bug 5386180 - Wire up action bar home/up for dialogs"
2011-09-28 16:02:13 -07:00
Justin Ho
510703270f
am 24664c00: Merge "Updated menu icon Bug: 5388009" into ics-factoryrom
...
* commit '24664c0003f964ffe9f4fc98d69c802cddd0d7b0':
Updated menu icon Bug: 5388009
2011-09-28 15:25:49 -07:00
Justin Ho
49941d56a8
am 3b5a379d: Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom
...
* commit '3b5a379dda952faa6266c8fa794c6f0d3a192c13':
Updated overflow menu icon Bug: 5388009
2011-09-28 15:25:48 -07:00
Justin Ho
58bd71095f
Merge "Updated menu icon Bug: 5388009" into ics-factoryrom
2011-09-28 15:24:09 -07:00
Justin Ho
b917577a94
Merge "Updated overflow menu icon Bug: 5388009" into ics-factoryrom
2011-09-28 15:23:57 -07:00
Justin Ho
e4cdd0b642
Merge "Downscaling circular assets with bilinear to fix jagged edges"
2011-09-28 15:08:24 -07:00
Michael Chan
a05091c7e2
Merge "Changed translation for the day of the week zh-rTW"
2011-09-28 14:44:39 -07:00
Jesse Wilson
8fbb9d8972
Merge "Format NaN and Infinity as Doclava expects."
2011-09-28 14:19:02 -07:00
James Dong
2b410fff34
Merge "Flush resets the count of played audio frames"
2011-09-28 13:46:49 -07:00
Andreas Huber
cb53c49e99
Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
2011-09-28 13:13:33 -07:00
Xia Wang
66294a8dc6
am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
...
* commit 'b2d17234b77cda555905e0da997f543708374246':
Reorganize media framework functional tests. Group tests into sub-packages
2011-09-28 12:40:07 -07:00
Xia Wang
6414d0bff1
Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom
2011-09-28 12:38:15 -07:00
Fred Quintana
e4e35a0aea
am 272101b3: Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom
...
* commit '272101b308c7eb0a4639bed0106830a8d6b0f2a1':
Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen.
2011-09-28 11:47:46 -07:00
Fred Quintana
ec0350cdd2
Merge "Fix a bug in the account chooser where relaunching an in-progress flow results in a blank screen." into ics-factoryrom
2011-09-28 11:45:52 -07:00
John Reck
1b1cfbcca9
Merge "Support for correctly scaling text selection handles"
2011-09-28 11:11:57 -07:00
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
The Android Automerger
45e32f9012
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-28 06:09:16 -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
The Android Automerger
5322146952
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-27 13:32:06 -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