7059 Commits

Author SHA1 Message Date
Jean-Michel Trivi
33bbf3f323 am d4accb98: Merge "Define audio attributes"
* commit 'd4accb989aa92ca16a7806db9bad2425ac81028f':
  Define audio attributes
2014-05-12 17:55:09 +00:00
Jean-Michel Trivi
bdad5cb124 Merge "Define audio attributes" 2014-05-12 17:47:20 +00:00
Jean-Michel Trivi
d60e875a97 Define audio attributes
AudioAttributes is a class to associate a collection of attributes
  describing information about an audio player.

Change-Id: I031aca1c79353abdfa0d7272c5dee0c2376c519a
2014-05-12 09:54:51 -07:00
Adam Powell
6fe526b980 am 7b7d5e43: Merge "New, inkier EdgeEffect visual style"
* commit '7b7d5e4347ca9f7cddbec07cea752756f8c1ac47':
  New, inkier EdgeEffect visual style
2014-05-11 22:42:23 +00:00
Adam Powell
c501db9f44 New, inkier EdgeEffect visual style
Remove the two-part gradient and edge glow and replace it with a
circular ink-like style instead. This now follows the theme color
palette so that it can be more in tune with the app's overall visual
design.

Add API to EdgeEffect to specify a horizontal displacement for the
effect. This lets the larger middle section follow relevant touch
points.

Fix a bug that caused EdgeEffect pulls to stutter in ListView/GridView
as a result of some annoying state-fluttering.

Change-Id: Ief144b06bd9d3dbe85d3154585a703fa552b0808
2014-05-11 15:27:57 -07:00
Svetoslav
5114a68665 am d4de9b44: Merge "Adding shell command execution to UiAutomation."
* commit 'd4de9b446ece4f4bdf16e05bb72bc5bb0199c9ae':
  Adding shell command execution to UiAutomation.
2014-05-11 17:40:49 +00:00
Svetoslav
a500874265 Merge "Adding shell command execution to UiAutomation." 2014-05-11 17:37:17 +00:00
Elliott Hughes
f86468252f am 133d4e92: Merge "Fix Os.link apicheck breakage."
* commit '133d4e9291bb62658c6f9bf37ce914578f9d50e7':
  Fix Os.link apicheck breakage.
2014-05-10 03:29:54 +00:00
Elliott Hughes
ff3ca6f61a Fix Os.link apicheck breakage.
Change-Id: I4fa4c21b3c373e18209ea88d72714e4f7f8a7bb4
2014-05-09 20:25:38 -07:00
Adam Powell
7e53b6389a am faf2e7ff: Merge "Revert "Remove the View#initializeScrollbars API""
* commit 'faf2e7ffa99643144db4a3857e002e6ad31be355':
  Revert "Remove the View#initializeScrollbars API"
2014-05-10 01:55:07 +00:00
Adam Powell
17048b84ec Merge "Revert "Remove the View#initializeScrollbars API"" 2014-05-10 01:51:54 +00:00
Adam Powell
d20aa6c531 Revert "Remove the View#initializeScrollbars API"
Looks like there are some bugs in the API checker for @removed.

This reverts commit 172c26e20fd71a2b4489a80b96ea5f6292db6430.

Change-Id: Ia4e610f71af19c5521fc019b9a6c26d0c11f23f1
2014-05-10 01:51:27 +00:00
Adam Powell
0a2fc15370 am 82902c45: Merge "Remove the View#initializeScrollbars API"
* commit '82902c457f76971763758c67d5ef6068d9069239':
  Remove the View#initializeScrollbars API
2014-05-10 01:09:29 +00:00
Adam Powell
0604dbc18e Merge "Remove the View#initializeScrollbars API" 2014-05-10 01:03:52 +00:00
Adam Powell
5d4c35d1ea Remove the View#initializeScrollbars API
This was never a safe API for apps to call since the TypedArray
parameter must have been obtained by filtering on
android.R.styleable.View, which is not public. Any behavior in the
wild has therefore been undefined.

Change-Id: Id19f571c92748ef2a8c036072fd83a417527f779
2014-05-09 17:32:38 -07:00
Lajos Molnar
cd306b4ca7 am 53e4004b: Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp"
* commit '53e4004becc176288ed3cecdf2d9e22ec4cbf51e':
  Added MediaCodec.releaseOutputBuffer() method with render timestamp
2014-05-09 22:26:00 +00:00
Alan Viverette
9edceb71d0 am 9f4c7f31: Animated state transition drawable
* commit '9f4c7f31b47680973e4e2a23f09e4d5281a40ed0':
  Animated state transition drawable
2014-05-09 22:25:42 +00:00
Lajos Molnar
0f94e3f5ed Merge "Added MediaCodec.releaseOutputBuffer() method with render timestamp" 2014-05-09 20:58:57 +00:00
Lajos Molnar
7c513b6bef Added MediaCodec.releaseOutputBuffer() method with render timestamp
Bug: 11784827
Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
2014-05-09 20:43:30 +00:00
Mike Reed
3c35b57cbb document and deprecated Rasterizer
Change-Id: I02f6a47aeb96b27c3fb9f6d003648f794e3d7cf4
2014-05-09 16:35:57 -04:00
Alan Viverette
5e92c95d84 Animated state transition drawable
Change-Id: I6c795d55cd7ab9163fdd6fe6ce3771bbd7015d62
2014-05-09 13:03:12 -07:00
Chris Wren
f953664dc1 notification ranking infrastructure
Added an ordered list of notifications (n.b. a complete ordering).
Added a mechanism for ranking to be updated asynchronously
Added onNotificationRankingUpdate to NotificationListeners
Added an opaque order update object and a convenience comparator that
  uses it to sort notifications for listeners

Repurpose scorers to be ranking preprocessors.  The preprocessors will
perform heavy-weight validation of the notification object and memoize
the results to improve efficiency of the ranking comparator.

Current internal comparator implements status quo ordering, except
that notes with a valid contact sort to the top of their priority
bucket.

Change-Id: I7244c65944a9657df41fb313b3cb5a52e149709d
2014-05-09 15:48:53 -04:00
Glenn Kasten
40cf0590b6 am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT"
* commit '750a2b05a54612c6ed2aa8796e659b00bf21caa0':
  Unhide AudioTrack support for ENCODING_PCM_FLOAT
2014-05-09 17:48:49 +00:00
Craig Mautner
8ce0279fa5 am 87bf3b28: Merge "Introduce persistent forms of Activity lifecycle calls."
* commit '87bf3b28f3b94464384c8f6adb7867233c960543':
  Introduce persistent forms of Activity lifecycle calls.
2014-05-09 17:44:37 +00:00
Glenn Kasten
4b0c34600c Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT" 2014-05-09 17:42:04 +00:00
Craig Mautner
d9ddf2e9d0 Merge "Introduce persistent forms of Activity lifecycle calls." 2014-05-09 17:38:53 +00:00
Craig Mautner
a002604af0 Introduce persistent forms of Activity lifecycle calls.
When an Activity is created with R.attr.persistable true different
forms of activity lifecycle methods including PersistableBundle will
be used.

Fixes bug 13736007.

Change-Id: I7e92917b300b76964257cfcc26c24e76aa19bd16
2014-05-09 09:42:37 -07:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
2014-05-09 15:47:58 +00:00
Ben Murdoch
f127d9eb63 am b1786021: Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
* commit 'b17860213f101a17f95d2ca95dce7171dd62bf6a':
  Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
2014-05-09 14:01:26 +00:00
Ben Murdoch
b2e56e34de Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
We haven't hooked this constant up yet, so @hide from the API until
it's ready.

Bug: 14668406
Change-Id: Ia0bb2ac1deaa0575d5ceb509997ca27f930040b0
2014-05-09 13:25:48 +01:00
Yohei Yukawa
baabe3ecc2 am e6d58c4c: Merge "Introduce new API for floating window support"
* commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6':
  Introduce new API for floating window support
2014-05-09 10:47:09 +00:00
Yohei Yukawa
2ac9979179 Merge "Introduce new API for floating window support" 2014-05-09 10:43:44 +00:00
Yohei Yukawa
c2ddd60236 Introduce new API for floating window support
This CL introduces a new API IMM#updateCursorAnchorInfo for
floating window support.

BUG: 14579622
Change-Id: I61dec2f8fa671ba891da1d4af08975750e3acb04
2014-05-09 19:17:15 +09:00
Elliott Hughes
92c45b222c resolved conflicts for merge of 6a4c12da to master-nova
Change-Id: I108a86d599b0d692f8d13f8f3d29187db45c6467
2014-05-08 20:23:39 -07:00
Elliott Hughes
242c14bee5 Merge "Unhide android.system.Os." 2014-05-09 03:08:38 +00:00
Elliott Hughes
8c126621ef Unhide android.system.Os.
Change-Id: I35fc0cfc723155e7562f711fa52b1df6694f3d2e
2014-05-08 19:03:06 -07:00
Svetoslav
121e0c0739 Adding shell command execution to UiAutomation.
The UiAUtomation APIs are an extension object on instrumentation and
is not null only if the instrumentation was started from the shell.
The UiAutomation APIs allow performing privileged operations for testing.
Since UiAutomation tests are just regular instrumentation tests they
cannot take advantage of the rich set of command line utilities on the
platform. This change adds a capability to UiAutomation to execute
shell commands.

bug:12927198

Change-Id: Ifb764c8e89943654f3e35d7a0c65b0b730db672f
2014-05-08 18:59:53 -07:00
Glenn Kasten
7d60bcd2d9 Unhide AudioTrack support for ENCODING_PCM_FLOAT
Change-Id: I77423ff1845d0e05c117ab2a0b31699b32b871be
2014-05-08 16:39:19 -07:00
Martijn Coenen
66f29aa4a5 am 5aa45ef5: Merge "HCE/SE foreground support."
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
  HCE/SE foreground support.
2014-05-08 23:37:00 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +00:00
Eino-Ville Talvala
0a7540c53a am 59969600: Merge "Add android.hardware.camera.external feature."
* commit '599696000400582773dcff7b6142b603ef68ec6b':
  Add android.hardware.camera.external feature.
2014-05-08 21:50:32 +00:00
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
2014-05-08 21:47:36 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
justinzhang
a0111698d4 am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task"
* commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc':
  DevicePolicyManager Authentication for Lock Task
2014-05-08 20:38:45 +00:00
justinzhang
ed32c842c6 Merge "DevicePolicyManager Authentication for Lock Task" 2014-05-08 20:35:12 +00:00
Emily Bernier
530f133a3f am f5a4eabb: Merge "New user restrictions for EDU"
* commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168':
  New user restrictions for EDU
2014-05-08 19:55:39 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
justinzhang
511e0d8323 DevicePolicyManager Authentication for Lock Task
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.

Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug: 14611303
2014-05-08 15:00:14 -04:00
Eino-Ville Talvala
9131da28e1 Add android.hardware.camera.external feature.
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
2014-05-08 11:53:01 -07:00
ztenghui
f563ef8102 am 3225a6b5: Further cleaning on animated part of VectorDrawable.
* commit '3225a6b5b09c8ec78071186bfb20289600812c21':
  Further cleaning on animated part of VectorDrawable.
2014-05-08 17:40:09 +00:00