John Reck
55b039f1b7
Merge "Support for correctly scaling text selection handles"
2011-09-28 11:11:57 -07:00
Steve Block
0a20d6a4c3
Merge "Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set"
2011-09-28 10:11:55 -07:00
Elliott Hughes
87e12b05f1
Merge "Add ICS-specific notes to the JNI tips documentation."
2011-09-28 09:56:11 -07:00
Marco Nelissen
8df38890d4
Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634"
2011-09-28 09:41:12 -07:00
Marco Nelissen
8dc208476f
Log a warning when a MediaPlayer is finalized without having being released.
...
b/5382634
Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
2011-09-28 09:21:11 -07:00
Brian Colonna
9a3d51ed10
Merge "Added landscape views for Face Unlock"
2011-09-28 06:13:53 -07:00
Brian Colonna
0c66f05267
Merge "Fix 5323545 - FaceLock no longer appears when taking a call"
2011-09-28 06:13:44 -07:00
Chih-Chung Chang
d83baa4ef3
Merge "Fix 5158468: Update floating window size when the anchor view size changes."
2011-09-28 04:48:06 -07:00
Flavio Lerda
d0bc6afbbd
Merge "Do not format numbers starting with hash or star."
2011-09-28 04:38:00 -07:00
Chih-Chung Chang
85d4ea6fe4
Fix 5158468: Update floating window size when the anchor view size changes.
...
Originally when surfaceChanged() happens, we remove the old window and
create a new window. This causes flickering. Now we just update the window
layout according to the size of the anchor view.
Change-Id: Id741dac07872e473f2c9829b626c5c9568e7e22d
2011-09-28 18:00:29 +08:00
Steve Block
aae19fb90c
Merge "Hook up WebView.clearSslPreferences() for the Chromium HTTP stack"
2011-09-28 02:45:28 -07:00
Steve Block
a0d767c822
Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
...
This makes sure that the page's SSL certificate is cleared when the page load
starts.
Follows on from https://android-git.corp.google.com/g/#/c/138147 .
Bug: 5287216
Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
2011-09-28 10:44:11 +01:00
Kristian Monsen
d9151bf1cc
Hook up WebView.clearSslPreferences() for the Chromium HTTP stack
...
Note that this is an incomplete fix, as we do not clear the responses for
connections currently in use, as they maintain their own cache. See
http:/b/5324235.
Bug: 5287216
Change-Id: I18f6638efeff0bee1e7ffed606be1444d683bebd
2011-09-28 10:44:11 +01:00
Mathew Inwood
d0e8fb431a
Merge "Document thrown IllegalArgumentException."
2011-09-28 01:20:04 -07:00
John Reck
1cfe8ddf62
Support for correctly scaling text selection handles
...
Bug: 5367280
Change-Id: If32fdc9cd82d1a66bc96446a123c44d9edd9d340
2011-09-27 20:14:39 -07:00
Fabrice Di Meglio
8f0bb4bc17
Merge "Fix bug # 5376028 Arabic text is kinda broken - disappearing glyphs"
2011-09-27 18:45:57 -07:00
Guang Zhu
25438e2199
Merge "Use CPU upload path in DRT"
2011-09-27 18:27:36 -07:00
Guang Zhu
ef4d25c885
Use CPU upload path in DRT
...
This makes it the same as default browser settings (for now). Otherwise
the test may crash due to GPU OOM.
This is to be a workaround only, and should be reverted after the bug is
fixed.
Bug: 5382134
Change-Id: I82a8dd83b69c8fceb657af9e32a2c5fa66ead2ce
2011-09-27 18:23:10 -07:00
Romain Guy
816b776be1
Merge "Add a bit more doc to TextureView"
2011-09-27 17:45:46 -07:00
Romain Guy
462785fa25
Add a bit more doc to TextureView
...
Change-Id: Ib76c80d8f70ede1bb63db319bca1e93c489def4d
2011-09-27 17:42:10 -07:00
Romain Guy
fd9932d153
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
70980383de
Merge "Test to demonstrate NPE in DefaultRequestDirector"
2011-09-27 16:31:10 -07:00
Jesse Wilson
de5d7d2508
Test to demonstrate NPE in DefaultRequestDirector
...
When the HTTP client encountered a server failure while
talking through a proxy, it fails with an NullPointerException
and not an IOException.
Change-Id: I4b287105bf78b832d034557e37e74ce576c7894d
Bug: http://b/5372438
2011-09-27 19:28:32 -04:00
Elliott Hughes
868d74eb3f
Add ICS-specific notes to the JNI tips documentation.
...
Change-Id: I9be8f2452063363d9f2b6c28b5a2eacac09308a1
2011-09-27 16:27:31 -07:00
Romain Guy
0e8fb15da2
CherryPick 043a6b from master: do not merge.
...
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: I3d60f8e4b5c5431e9e21471c576f4a9382f4693f
2011-09-27 15:59:53 -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
Brian Colonna
982813c3df
Added landscape views for Face Unlock
...
- Uses grid view to cover PIN/pattern area in the same way it does
for potrait layouts
Change-Id: I64672f3052c136901850baf73c8242930df7a64f
2011-09-27 17:38:22 -04: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