Peter Ng
b80ff91b76
Downscaling circular assets with bilinear to fix jagged edges
...
Bug: 5349016
Change-Id: I4960bf1eb0c65211682573c8d80840b41e103894
2011-09-27 17:00:33 -07:00
Xavier Ducrohet
05aa1fef93
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
Romain Guy
043a6b1e57
Don't use OpenGL ES 2.0 to render the wallpaper on the emulator.
...
Bug #5352896
The emulator doesn't support OpenGL ES 2.0.
Change-Id: I7f647d78d4d8ad87d12a5f009d5d37f6aeaecf72
2011-09-27 15:37:54 -07:00
Andreas Huber
d4fb497cf4
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
2011-09-27 15:26:43 -07:00
Peter Ng
f7def66480
Merge "Lockscreen handle is now a locked icon and not an unlocked"
2011-09-27 15:07:39 -07:00
Andreas Huber
262d7e8e21
Cut down on AwesomePlayer and OMXCodec's verbosity.
...
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
2011-09-27 15:07:36 -07:00
Peter Ng
6cf2c642b6
Lockscreen handle is now a locked icon and not an unlocked
...
Bug: 5231211
Change-Id: I4ee84d142d972c42ec5f28ed921a2edadf11adf7
2011-09-27 14:55:51 -07:00
Eric Fischer
9ee0865ac3
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
ce9756d06d
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
2011-09-27 14:54:12 -07:00
Scott Main
4c08848538
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
Eric Fischer
006e6ef2e6
Import revised translations. DO NOT MERGE
...
Change-Id: Ifb1966956dcc9fe4e082708bb3fb30d5224308e7
2011-09-27 14:29:36 -07:00
Jamie Gennis
feb158b3cb
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
ab7ed38d5f
Merge "Fix issue 5373658: memory leak in AudioFlinger."
2011-09-27 14:07:45 -07:00
Scott Main
2d68a6ba3c
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
Change-Id: Ib89434c78a4ad60b4358dca9a6c335451d1c4125
2011-09-27 14:04:48 -07:00
Andreas Huber
d33b3881f7
Merge "Signal an appropriate error even if there are no active streams yet."
2011-09-27 13:36:22 -07:00
Alon Albert
553e547420
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
Alon Albert
e0bde33e0d
Add Detailed Sync Stats Section
...
Also improve history formatting
Here's a smaple of what it looks like:
Detailed Statistics (Recent history): 20 40s
-------------------------------------------------------------------------------------
com.android.contacts : 9/45% 11/27%
aagmtest1@gmail.com/com.google : 3/15% 4/11%
aagmtest2@gmail.com/com.google : 3/15% 3/9%
aalbert@google.com/com.google : 3/15% 2/6%
-------------------------------------------------------------------------------------
gmail-ls : 6/30% 22/56%
-------------------------------------------------------------------------------------
com.android.calendar : 3/15% 5/14%
aagmtest1@gmail.com/com.google : 1/5% 4/12%
aagmtest2@gmail.com/com.google : 1/5% 0/0%
aalbert@google.com/com.google : 1/5% 0/0%
-------------------------------------------------------------------------------------
com.google.android.apps.plus.content.EsGooglePhotoProvider : 2/10% 0/1%
aagmtest1@gmail.com/com.google : 1/5% 0/1%
aagmtest2@gmail.com/com.google : 1/5% 0/0%
-------------------------------------------------------------------------------------
Recent Sync History
#1 : 2011-09-23 15:18:35 SERVER 0.8s aalbert@google.com/com.google gmail-ls
#2 : 2011-09-23 15:17:56 SERVER 1.3s 00:38
#3 : 2011-09-23 15:17:52 SERVER 4.6s 00:04
#4 : 2011-09-23 15:17:45 SERVER 1.7s 00:06
#5 : 2011-09-23 15:16:51 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts
#6 : 2011-09-23 15:16:51 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts
#7 : 2011-09-23 15:16:50 LOCAL 0.7s aagmtest1@gmail.com/com.google com.android.contacts
#8 : 2011-09-23 15:15:35 LOCAL 0.7s aalbert@google.com/com.google com.android.contacts
#9 : 2011-09-23 15:15:34 LOCAL 0.8s aagmtest2@gmail.com/com.google com.android.contacts
#10 : 2011-09-23 15:15:33 LOCAL 1.9s aagmtest1@gmail.com/com.google com.android.contacts
#11 : 2011-09-23 15:14:37 LOCAL 1.3s aalbert@google.com/com.google com.android.contacts
#12 : 2011-09-23 15:14:35 LOCAL 2.0s aagmtest1@gmail.com/com.google com.android.contacts
#13 : 2011-09-23 15:14:32 LOCAL 2.2s aagmtest2@gmail.com/com.google com.android.contacts
#14 : 2011-09-23 15:13:41 SERVER 1.3s aalbert@google.com/com.google gmail-ls
#15 : 2011-09-23 15:13:34 LOCAL 0.3s aalbert@google.com/com.google com.android.calendar
#16 : 2011-09-23 15:13:34 LOCAL 0.4s aagmtest2@gmail.com/com.google com.android.calendar
#17 : 2011-09-23 15:13:33 SERVER 0.1s aagmtest2@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider
#18 : 2011-09-23 15:13:33 SERVER 0.5s aagmtest1@gmail.com/com.google com.google.android.apps.plus.content.EsGooglePhotoProvider
#19 : 2011-09-23 15:13:29 LOCAL 4.9s aagmtest1@gmail.com/com.google com.android.calendar
#20 : 2011-09-23 15:13:28 SERVER 13.1s aalbert@google.com/com.google gmail-ls
Change-Id: Idc904e2e18a373b6d2d10af65b02683c11fd8d90
2011-09-27 13:15:30 -07:00
Daniel Sandler
097a35b441
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
25bb73eb1b
Merge "Remove "excessive sync" icon." into ics-factoryrom
2011-09-27 13:06:01 -07:00
David 'Digit' Turner
53a7af36f5
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
d7b3c64717
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
da42e0faaa
Merge "SurfaceFlinger: fix setting default buffer size" into ics-factoryrom
2011-09-27 12:28:59 -07:00
Andreas Huber
7922619e9c
Signal an appropriate error even if there are no active streams yet.
...
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug: 5372901
2011-09-27 12:13:37 -07:00
Eric Laurent
4a64a6e32c
Fix issue 5373658: memory leak in AudioFlinger.
...
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.
Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
2011-09-27 12:07:15 -07:00
Adam Powell
2b2adbdda0
Merge "Improve docs in BaseAdapter."
2011-09-27 12:06:33 -07:00
Adam Powell
f5d412a0c7
Improve docs in BaseAdapter.
...
Change-Id: Idbe19f9b01132c28b4960515c23bd28e3729fd5d
2011-09-27 11:32:59 -07:00
Tsu Chiang Chuang
14b4c769be
Merge "adding packet count and removing extra uid stats that were used for debugging."
2011-09-27 11:18:13 -07:00
Steve Block
a3b06ff933
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
53719fc4c5
Merge "Fix issue 5373048: AudioCache decode errors"
2011-09-27 10:32:17 -07:00
Peter Ng
6ce9dfd8a4
Merge "Fixed jaggy circles in pattern unlock"
2011-09-27 10:24:54 -07:00
Eric Laurent
9968a36f29
Fix issue 5373048: AudioCache decode errors
...
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.
Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
2011-09-27 10:23:38 -07:00
The Android Open Source Project
5bc305dc1e
Reconcile with ics-factoryrom-release
...
Change-Id: I9c75782f72a7da6e1e9de183146841f8f4bebc6b
2011-09-27 10:10:44 -07:00
Justin Ho
6e17d8799b
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
5fd141c245
Merge "Updated stat_sys icons" into ics-factoryrom
2011-09-27 09:54:40 -07:00
Daniel Sandler
64061c38f0
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
8d48b75b0c
Merge "Double check the permission before setting the Wake Lock"
2011-09-27 09:07:13 -07:00
Steve Block
9a0cd15eec
Always update the WebView's SSL certificate, regardless of whether a WebViewClient has been set
...
This looks like a copy-paste error from other CallbackProxy methods which call
back to the WebViewClient or WebChromeClient, rather than the WebView.
Also remove '@hide' annotations. These are superfluous as the class is not
public.
Bug: 5287216
Change-Id: If97c4d769cf82563b9c182ba09fc742fbb7e08e9
2011-09-27 16:42:51 +01:00
Steve Block
200ff0a7b1
Remove superfluous synchronized modifier on SslCertLookupTable.getInstance()
...
Also fixes style in SslCertLookupTable and WebViewcore.reportSslCertError().
Bug: 5287216
Change-Id: I1cd975b1c8cecf1ca1dad0643be8ab62f7a950bc
2011-09-27 16:42:45 +01:00
Daniel Sandler
abff032e78
Draw smaller system status icons without scaling.
...
Bug: 5297795
Change-Id: I11dc3a21b2e1111963b1cd9621434747f1757a67
2011-09-27 11:20:17 -04:00
The Android Automerger
a3365668f2
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-27 03:52:49 -07:00
Irfan Sheriff
cbb62bb818
Merge "Switch to cfg based signal_poll command"
2011-09-26 22:11:03 -07:00
Scott Main
e187d8148a
Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5"
2011-09-26 21:55:24 -07:00
Scott Main
4510705b28
docs: fix markup in javadocs
...
Change-Id: I1f9be842f40c813134fbcd5fdbbead5647fb72e5
2011-09-26 21:53:24 -07:00
Jim Miller
a2f00da374
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
d7208b98e9
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
3a6c2e9855
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
994897f0e7
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
02ee442d9a
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
36fd85f67a
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
8f9af0a24d
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