Jean-Michel Trivi
74e56f1929
Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev
2013-04-15 17:13:46 +00: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
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
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
Dianne Hackborn
f7be4800df
Add new resources trace, also trace apk dex loading.
...
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
2013-04-12 14:53:10 -07:00
Scott Main
044d08b0f1
am 7d62462b: am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)
...
* commit '7d62462bacc4235d4e99dfe7a75783a70688537d':
moar doc tags for search suggestions (Design docs)
2013-04-12 14:50:15 -07:00
Scott Main
7d62462bac
am 8ab0f12f: am 64d51032: moar doc tags for search suggestions (Design docs)
...
* commit '8ab0f12f5ea44f5eb0f7c0cb6f05c289c33774d3':
moar doc tags for search suggestions (Design docs)
2013-04-12 14:48:13 -07:00
Scott Main
8ab0f12f5e
am 64d51032: moar doc tags for search suggestions (Design docs)
...
* commit '64d51032cc1f20ae496ba49ca975e822dea02b7c':
moar doc tags for search suggestions (Design docs)
2013-04-12 14:46:19 -07:00
Robert Greenwalt
e203384f16
Merge "Disconnect from AP when teardown requested." into jb-mr2-dev
2013-04-12 21:10:53 +00:00
Kristian Monsen
03499a23f9
Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev
2013-04-12 21:05:15 +00:00
Scott Main
64d51032cc
moar doc tags for search suggestions (Design docs)
...
Change-Id: I842bc00f7ede23b1bebe4bf2e54ba32d026cf04c
2013-04-12 14:00:30 -07:00
Romain Guy
dec4bb9e4b
Merge "Trace ValueAnimator based animations in systrace" into jb-mr2-dev
2013-04-12 20:58:36 +00:00
Romain Guy
50b68bf836
Merge "Add async events tracing to android.os.Trace" into jb-mr2-dev
2013-04-12 20:58:00 +00:00
Chet Haase
430742f090
API and doc cleanup, plus small animation/UI features
...
Adding features which round out the animation APIs (missing
getters, etc.). Also fix doc typos.
Issue #8350510 Add APIs needed for future animation capabilities
Change-Id: I063736848ba26e6d6c809b15fc3a103c74222f46
2013-04-12 13:44:22 -07:00
Emily Bernier
ce70311b67
Merge "Add user restrictions (credentials, user removal)" into jb-mr2-dev
2013-04-12 20:21:36 +00:00
Scott Main
e527d256dc
am 4a88777e: am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
...
* commit '4a88777e53ae26768255feeb49b46e2f7698d62e':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
2013-04-12 13:14:43 -07:00
Scott Main
d8b52ee675
am 8a18006e: am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
...
* commit '8a18006e9de3901d1ee32eace9f37d638df27b1f':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
2013-04-12 13:14:39 -07:00
Scott Main
4a88777e53
am 2ad00035: am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
...
* commit '2ad0003576dccedcfe5bff0af9bfbb6db97a2351':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
2013-04-12 13:11:30 -07:00
Scott Main
8a18006e9d
am e54d44b3: am ab23611c: am 816e905a: am 32bd5495: add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
...
* commit 'e54d44b35bc87bd8c44a3657f65c19754a5d5ae9':
add redirect for file from I3a3d0e5b805aecd4e25fe5b46327a5fa28dbe478
2013-04-12 13:11:26 -07:00
Raph Levien
6c0724010f
Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev
2013-04-12 20:08:33 +00:00
Scott Main
2ad0003576
am 6c79bc7e: am bfc4e4eb: am c9762f20: Merge "exclude IAB docs and various SDK docs from search suggestions Also delete several useless files" into jb-mr1.1-docs
...
* commit '6c79bc7ed1bea9013884907261cb1cd465c13741':
exclude IAB docs and various SDK docs from search suggestions Also delete several useless files
2013-04-12 13:04:58 -07:00