Dianne Hackborn
1c5383ce0b
Fix issue #8512015 : VideoView's window animates when its position changes
...
Change-Id: I79eee6b9672b7d72eabe5d20be639c05a6f3d72b
2013-04-15 15:07:21 -07:00
Jeff Tinker
7fa9667f63
Merge "Clarify how release of offline keys is handled in the MediaDrm API" into jb-mr2-dev
2013-04-15 20:11:18 +00:00
Kenny Root
e47539684e
Merge "Remove old KeyStore call sites" into jb-mr2-dev
2013-04-15 19:54:55 +00:00
Jason Sams
097ed01adc
Merge "Revert GC thread changes" into jb-mr2-dev
2013-04-15 19:40:47 +00:00
Baligh Uddin
ce37067178
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-15 19:25:11 +00:00
Scott Main
fb5e6bbd2b
Merge "fix javadoc build" into jb-mr2-dev
2013-04-15 18:13:17 +00:00
Scott Main
e63b0609c3
fix javadoc build
...
Change-Id: I9b86dda5aea075832d5e165043f45c8d507b5c16
2013-04-15 11:11:44 -07:00
Scott Main
d7f67d6f0b
am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
...
* commit '80f8c84e0cf9b2703939af6bb4aeff7000e3fd9e':
add oppo and xiaomi driver links bug: 8523141
2013-04-15 11:04:33 -07:00
Daniel Sandler
bd573049ec
Merge "Putting the gesture debugging back in the box." into jb-mr2-dev
2013-04-15 18:02:52 +00:00
Scott Main
80f8c84e0c
am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
...
* commit '0451003f681c830fe626e4e0e6861c0bca8de51f':
add oppo and xiaomi driver links bug: 8523141
2013-04-15 11:00:06 -07:00
Scott Main
0451003f68
am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
...
* commit 'c06776912d75190966c5f00e617edffbfe01851c':
add oppo and xiaomi driver links bug: 8523141
2013-04-15 10:56:42 -07:00
Scott Main
c06776912d
am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
...
* commit '92fd5508aae8f8b43164405a5b725d0e60e464e1':
add oppo and xiaomi driver links bug: 8523141
2013-04-15 10:52:40 -07:00
Scott Main
92fd5508aa
am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
...
* commit 'c70e0f5e182ab209ab9b272c1408ac3170ca6345':
add oppo and xiaomi driver links bug: 8523141
2013-04-15 10:49:35 -07:00
Scott Main
c70e0f5e18
Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs
2013-04-15 17:45:22 +00:00
Jean-Michel Trivi
74e56f1929
Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev
2013-04-15 17:13:46 +00:00
Baligh Uddin
87d19d04ea
Import translations. DO NOT MERGE
...
Change-Id: Ifcb746e1bec6ba3252d57feef425738ef84636e6
Auto-generated-cl: translation import
2013-04-15 08:59:28 -07:00
Ben Murdoch
7e157f321c
Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev
2013-04-15 15:48:25 +00:00
Andreas Huber
2de0771da2
Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev
2013-04-15 15:16:27 +00:00
Andreas Huber
5c5c3f3abd
Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev
2013-04-15 15:15:41 +00:00
Jason Sams
330a9fe323
Merge "Unhide new RS APIs." into jb-mr2-dev
2013-04-15 02:22:14 +00:00
Jean-Michel Trivi
9157477300
Public APIs for media position in RemoteControlClient
...
New APIs in android.media.RemoteControlClient to support application
exposing their current media playback position and speed, and
let the framework request position changes.
Bug 8120740
Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
2013-04-14 12:17:56 -07:00
Jason Sams
9bf189228f
Revert GC thread changes
...
This is not quite a straight revery, some manual edits were necessary.
The original CL didn't undergo sufficient design review or testing. Revert until the regressions can be sorted out.
Bug 8585185
This reverts commit 6dacf8355a0692b52c49f603f43317772cb36175
This reverts commit f8c033db1edf36a0ab09568c3142054f0be2d1a1
Change-Id: Ie7215bdf881332e822603547e92f810f595077fc
2013-04-14 02:56:03 +00:00
Jason Sams
02d56d90e0
Unhide new RS APIs.
...
This exposes the fast path handling of YUV data.
bug 8566866
Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0
2013-04-14 02:51:57 +00:00
Amith Yamasani
e1375908a5
Rename isUserLimited to isLinkedUser
...
A linked user is derived from another user and shares their accounts.
Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
2013-04-13 16:48:35 -07:00
Amith Yamasani
e188c984dd
Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev
2013-04-13 22:54:01 +00:00
Xavier Ducrohet
a068eeddc9
Revert "Make --non-constant-id generates non final IDs for styleable."
...
This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
2013-04-13 09:48:01 -07:00
Kenny Root
b2c0ff64d8
Remove old KeyStore call sites
...
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.
Bug: 8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
2013-04-12 18:09:04 -07:00
Dianne Hackborn
301e95f2e1
Merge "Add a little more resource load tracing." into jb-mr2-dev
2013-04-13 01:03:47 +00:00
Amith Yamasani
ccbe389b4d
Introducing manifest flag requiredAccountType
...
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.
Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
2013-04-12 17:52:42 -07:00
Dianne Hackborn
0acc1931d3
Add a little more resource load tracing.
...
Change-Id: Id797adb67ab411d5b1a1c223863d3bb4655d10b1
2013-04-12 17:49:17 -07:00
Romain Guy
80fccb4dda
Merge "There should be a mandatory coder's license. Bug #8586560 " into jb-mr2-dev
2013-04-13 00:37:37 +00:00
Xavier Ducrohet
629b1c4f20
Merge "Make --non-constant-id generates non final IDs for styleable." into jb-mr2-dev
2013-04-13 00:35:54 +00:00
Mathias Agopian
1763d6f957
Merge "always trigger a re-draw when updating the transparent region hint" into jb-mr2-dev
2013-04-13 00:28:16 +00:00
Jaikumar Ganesh
02087754fb
Merge "Fix race condition and disable call." into jb-mr2-dev
2013-04-13 00:22:07 +00:00
Svetoslav Ganov
26257a09a5
Merge "Allow for setting test type as a monkey." into jb-mr2-dev
2013-04-13 00:15:40 +00:00
Svetoslav
72ab9b8017
Merge "Respect custom view drawing order when dispatching hover events." into jb-mr2-dev
2013-04-13 00:14:56 +00:00
Kenny Root
8692685a54
Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev
...
* changes:
AndroidKeyStore: Add encrypted flag
keystore: Add flag for blobs to be unencrypted
2013-04-13 00:04:17 +00:00
Mathias Agopian
54e3d38490
always trigger a re-draw when updating the transparent region hint
...
since SF now relies on receiving a frame for latching the
transparent region hint, we make sure we will indeed redraw
something.
Bug: 8581533
Change-Id: Ia12ddf5654a7deeac7628b799bfde4b8c16c992b
2013-04-12 17:01:44 -07:00
Svetoslav
0e5e9aa8e5
Respect custom view drawing order when dispatching hover events.
...
1. The event dispatch methods should respect the child drawing order.
Hover event dispatch in ViewGroup was not repsecting this order.
bug:8606799
Change-Id: Ie2fd3aff1292c21df23a04ca0aa03a97813c44ef
2013-04-12 16:59:03 -07:00
Dianne Hackborn
15fed390c4
Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
2013-04-12 23:58:50 +00:00
Romain Guy
4abab937bf
There should be a mandatory coder's license.
...
Bug #8586560
And I don't deserve to pass the test.
Change-Id: Ic7886205511f16145a925fc860e4a03dfaf473d5
2013-04-12 16:51:21 -07:00
Romain Guy
efcb252f76
Merge "Properly computer gradient textures width" into jb-mr2-dev
2013-04-12 23:39:27 +00:00
Romain Guy
95aeff8f11
Properly computer gradient textures width
...
Only on devices that do not have the npot extension
Change-Id: I472a13dc707d2abaf5fcc06f99c9da343b333558
2013-04-12 16:32:05 -07:00
Xavier Ducrohet
8730f46ae5
Make --non-constant-id generates non final IDs for styleable.
...
This was already done for all other types of resources, but not
for styleable (or the constants for the styleable array indices).
This fixes this. This only affects the SDK as this is used by the
SDK toolchain only.
Change-Id: Idfc2f7915be2b0e88590f38fd660610ffc7e160c
2013-04-12 16:02:54 -07:00
Amith Yamasani
e107aa4386
Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev
2013-04-12 22:33:05 +00:00
Kenny Root
2eeda7286f
AndroidKeyStore: Add encrypted flag
...
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.
Bug: 8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
2013-04-12 15:19:48 -07:00
Chet Haase
0a41431d69
Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev
2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87
Rename isUserRestricted to isUserLimited
...
Avoid confusion with user restrictions which can be applied to
non-limited users as well.
Updated the java docs.
Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
2013-04-12 15:13:53 -07:00
Scott Main
faaaa22399
am 27248105: am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)
...
* commit '27248105a17eb64564cb904d6c9019afbfc5ac0f':
moar doc tags for search suggestions (Design docs)
2013-04-12 14:57:34 -07:00
Scott Main
27248105a1
am 044d08b0: am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)
...
* commit '044d08b0f10ca3a9e45c35bd6638763915c1f253':
moar doc tags for search suggestions (Design docs)
2013-04-12 14:54:27 -07:00