59014 Commits

Author SHA1 Message Date
Justin Ho
5132fa6933 Merge "Downscaling circular assets with bilinear to fix jagged edges" 2011-09-28 15:08:24 -07:00
Andreas Huber
2378341174 Support multiple NAL fragments per .mkv payload
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.

Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug: 5337218
2011-09-28 15:06:46 -07:00
Justin Ho
5fba7e525e Updated menu icon
Bug: 5388009

Change-Id: I3bc43a707f4fdb38021cf0cf9f76784f5e1192d9
2011-09-28 14:56:47 -07:00
Justin Ho
55cea04465 Updated overflow menu icon
Bug: 5388009

Change-Id: I667d6ecf0e897c073c669b2b88ffe06a71ca704d
2011-09-28 14:55:01 -07:00
Michael Chan
d4ad7b4984 Merge "Changed translation for the day of the week zh-rTW" 2011-09-28 14:44:39 -07:00
Michael Chan
cbd7ec7aeb Changed translation for the day of the week zh-rTW
Specifically replace 周 with 週

BUG: 5383038
Change-Id: If3589d0390f04d391487f545b79d4d7bfd567e97
2011-09-28 14:31:54 -07:00
Jesse Wilson
2ff591ffb6 Merge "Format NaN and Infinity as Doclava expects." 2011-09-28 14:19:02 -07:00
Jesse Wilson
9c5cacc71a Format NaN and Infinity as Doclava expects.
Change-Id: I500e049132b3254e3b78e08c1875e0dc451b70b6
2011-09-28 17:04:52 -04:00
James Dong
5e28463dc4 Merge "Flush resets the count of played audio frames" 2011-09-28 13:46:49 -07:00
Andreas Huber
781ae92f11 Merge "Support AMR, G.711 and vorbis audio in ACodec and friends." 2011-09-28 13:13:33 -07:00
Xia Wang
0a6cd02b48 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
b2d17234b7 Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 2011-09-28 12:38:15 -07:00
Andreas Huber
3e408f39ef Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
2011-09-28 12:37:36 -07:00
Fred Quintana
40047fa14d 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
272101b308 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
Jean-Michel Trivi
26b3d1ff38 Fix bug 5357295 NPE on display when remote control client dies
When a IRemoteControlClient dies, that client is set to null
 in the stack of remote control entries (mRCStack). This is done
 by calling registerRemoteControlClient() with a null client.
The bug is that registerRemoteControlClient(), after storing
 the new client, uses it to let it know what the current
 remote control display is. When that display is non null, the
 client is sent the current display. So when a client died
 when there was a display, the client reference was accessed
 in the part of the method where we haven't yet checked whether
 it is null or not.
The fix consists in moving the setting of the display on the
 client (method plugRemoteControlDisplay) only after having
 checked that the client is non-null.

Change-Id: Ic74d6cba9e3a3a16e78cd80a1ae5901abfeb3905
2011-09-28 11:43:36 -07:00
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
4284e9d19a Pulled out part of onScreenTurnedOn() into show() function
The onScreenTurnedOn() function in LockPatternKeyguardView was
actually being called in two cases - when the screen was turned on,
AND when the show() function was called in KeyguardViewManager, which
actually happens just before the screen is turned off.  Face Unlock
functionality was added to the onScreenTurnedOn() function, not
expecting that the function was also being called just before the
screen turns off.  This causes Face Unlock to run when the screen is
turned off, preventing it from running when the screen is turned on.
This was not obvious during testing because it's not a problem when
testing from the lock screen.  To reproduce the problem you must log
in successfully, then turn the screen off, wait, and turn it back on.

The solution was to pull the non-face unlock functionality from
onScreenTurnedOn() into its own function called show(), which is
called from the KeyguardViewManager show() function and also called
from onScreenTurnedOn().  In this way, the onScreenTurnedOn()
functionality is not changed, but the show() function can be used
for the onScreenTurnedOn() functionality minus the Face Unlock stuff.

One exception to note - I left setting mScreenOn inside of
onScreenTurnedOn() and didn't pull it into show()...that seems like
the correct thing to do.

Change-Id: I9dcc144c7842112c4d35eb3f8b4ab1cd42c05675
2011-09-28 12:08:58 -04:00
Steve Block
85aa944888 Fix HTML5Audio to call WebView.isPrivateBrowsingEnabled() on the UI thread
Bug: 5384494
Change-Id: I2587cf0e898f67becb9dbc2067fb1b0a6a37e124
2011-09-28 14:39:41 +01: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
Luca Zanolin
58707d6212 Change the width of the suggestion item to match the one of the suggestion pop-up
Bug: 5267313
Change-Id: Ic7151398872459459f2537322961092d3ccffd1c
2011-09-28 09:27:49 +01:00
Mathew Inwood
d0e8fb431a Merge "Document thrown IllegalArgumentException." 2011-09-28 01:20:04 -07:00
James Dong
dbf85120b8 Flush resets the count of played audio frames
Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug: 5331470
2011-09-27 22:47:25 -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
Fred Quintana
9bbdd0bf50 Fix a bug in the account chooser where relaunching an in-progress flow
results in a blank screen.

The fix involves making the first activity just call the account
type chooser to get the account type to add, rather than having
the account type chooser also kick off the AccountManager.addAccount()
request itself. Instead the first activity will get the type
back and then call AccountManager.addAccount()

Bug: 5346810
Change-Id: I4a0cf2370971b98f8ee0910f5401d97e999e546b
2011-09-27 17:24:32 -07:00
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
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
Eric Fischer
914f7e683a Don't lose product variant strings that also vary between locales.
Localized strings with product variants were not being included in the APK,
apparently because the check to ensure that a different variation of the
string had not already been included in the APK was matching the version
of it from the default, untranslated configuration.

Now check to make sure that the string not only exists but also exists in
the correct configuration.

Bug 5372711

Change-Id: I52975570b75e0f11827dc6bcf1cb4a987d0541aa
2011-09-27 16:09:41 -07:00
Xia Wang
db6028508c Reorganize media framework functional tests.
Group tests into sub-packages

Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
2011-09-27 16:00:20 -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