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
Vinod Krishnan
07bb4c3063
Merge "resolved conflicts for merge of 88aa8aab to master"
2014-05-09 21:11:08 +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
Vinod Krishnan
4a3735d081
resolved conflicts for merge of 88aa8aab to master
...
Change-Id: I6d3a9885f8cf3b632267b5722e59d4968efe17f7
2014-05-09 13:23:41 -07:00
Jorim Jaggi
f992066731
Merge "Reparent status bar icons into header when expanded."
2014-05-09 20:16:56 +00:00
Jorim Jaggi
0d74eeb9ec
Reparent status bar icons into header when expanded.
...
This change moves the status bar icons into the quick settings header
when the status bar is expanded. Also, the universal header is now
showing on the Keyguard.
Change-Id: Ib91f7e0b8de9f852676a11b500c4419183db1b90
2014-05-09 22:05:24 +02:00
Alan Viverette
5e92c95d84
Animated state transition drawable
...
Change-Id: I6c795d55cd7ab9163fdd6fe6ce3771bbd7015d62
2014-05-09 13:03:12 -07:00
Dan Sandler
3f4c72f42b
Merge "Fix misaligned vectors. #cannotunsee"
2014-05-09 19:39:59 +00:00
Dan Sandler
0b9c9f745c
Fix misaligned vectors. #cannotunsee
...
Change-Id: Idacc34dc77a811b6355a19b4715309f4e4e29fde
2014-05-09 15:38:30 -04:00
Yin-Chia Yeh
e2e5527ef3
Merge "Camera2: Minor update for exposureCompensation spec"
2014-05-09 19:02:09 +00:00
Yin-Chia Yeh
a4227dfe48
Camera2: Minor update for exposureCompensation spec
...
doc change only
Change-Id: I4bcc461cd9d592d5b15beda45f2b6176d7efde37
2014-05-09 12:01:10 -07:00
Jorim Jaggi
3084a2996f
Revert "Fix measure performance of whole status bar window."
...
This reverts commit 5ef8eb5661f1b3c0723348f723778be247a2f365.
2014-05-09 20:52:00 +02:00
Vinod Krishnan
88aa8aab3d
am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
...
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
Adding a margin for the AlertDialog to work on circular UI.
2014-05-09 18:09:53 +00:00
Vinod Krishnan
c4ebd014ce
Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev
2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d
Adding a margin for the AlertDialog to work on circular UI.
...
- also removing the background completely for sdk >= 20
Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
2014-05-09 11:03:20 -07:00
Chris Craik
e1f788b3e2
Merge "Rename matrices for consistency"
2014-05-09 18:02:53 +00:00
Brian Carlstrom
809146690d
am 09d11896: am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit '09d1189668a74b2cd4a6af124e95c9e6786499f2':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:42:50 +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
Brian Carlstrom
09d1189668
am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit 'edc31509c2ff8cba86f30c836934d32a3e249dec':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:38:10 +00:00
Brian Carlstrom
edc31509c2
am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything"
...
* commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03':
If PackageUsage information is missing, treat as first boot and compile everything
2014-05-09 17:33:04 +00:00
Brian Carlstrom
b98ca5b0dd
Merge "If PackageUsage information is missing, treat as first boot and compile everything"
2014-05-09 17:29:06 +00:00
Jorim Jaggi
0557476eb0
Merge "Remove expansion and clear button."
2014-05-09 17:17:05 +00:00
Jorim Jaggi
b5e17a0422
Merge "Make header card look clickable."
2014-05-09 17:16:48 +00:00
Jorim Jaggi
bff1f071f3
Remove expansion and clear button.
...
...
Change-Id: I965317ba221092f970dc9324dd538a7bde5c0642
2014-05-09 19:16:16 +02:00
Jason Monk
c241db85c9
Merge "Fix badness from proxy refactoring."
2014-05-09 17:11:15 +00:00
Brian Carlstrom
7c5c864c8a
If PackageUsage information is missing, treat as first boot and compile everything
...
Bug: 14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
2014-05-09 09:52:09 -07: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
Jorim Jaggi
6b5c8e207a
Make header card look clickable.
...
Change-Id: I8b131e8fa1a6b8e83201c23a6dc74008dc73b2c7
2014-05-09 18:42:23 +02:00
Christoph Studer
2509be2bb7
Merge "Preserve notification stats on update"
2014-05-09 16:35:21 +00:00
Mikhail Naganov
3b2f548b67
am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit 'a08771edfaabab8c2f1f1d552f788c9c4a4162f9':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:26:19 +00:00
Mikhail Naganov
a08771edfa
am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:19:12 +00:00
Mikhail Naganov
fa75ff626c
am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit 'b76bc8e06e456715a36edd92cb4ea5437d5306e4':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:14:16 +00:00
Mikhail Naganov
b76bc8e06e
am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
...
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:08:58 +00:00
Svetoslav
954e3fbccc
Merge "Teach accessibility manager services about user profiles."
2014-05-09 16:06:19 +00:00
Jorim Jaggi
a082c9ac62
Merge "Fix measure performance of whole status bar window."
2014-05-09 16:00:33 +00:00
Svetoslav
0425d7f56b
Teach accessibility manager services about user profiles.
...
For user profiles the accessibility layer will use the accessibility
state of the their owner. A profile cannot have its own plugins or
settings. The rationale behind this is that if a user with impaired
vision is using the device with different profiles linked to his
main one, then he/she should be able to interact with the device no
matter what profile the app is being run with. Hence, The behavior
of the accessibility features should be consistent across apps run
with different profile.
bug:14564491
Change-Id: Id19ce81e1a2dfa48015c7ab3053d66c058be3e46
2014-05-09 08:58:39 -07:00
Eino-Ville Talvala
6515444dee
am 8bfb3513: (-s ours) am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature.
...
* commit '8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1':
DO NOT MERGE: Add android.hardware.camera.external feature.
2014-05-09 15:55:43 +00:00
Jorim Jaggi
c580cbfe9c
Fix measure performance of whole status bar window.
...
Change-Id: If66f6d2ad414d75397bd849509903a9ed777e58e
2014-05-09 17:53:48 +02: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
Jessica Hummel
91da58ded2
Allow setting password restrictions from a managed profile.
...
A managed profile will now share password settings with its parent.
- the current password is always stored in the parent
- admins of profiles are notified if that password changes
- checks for password quality now take the requirements of admins on
the parent and its profiles into account
Todo:
- Currently KeyguardSecurityContainer wipes the whole device when
the maximum fails has been reached on any profile.
We need to limit the wipe to the profile for which the fails exceeded
the maximum number.
- Intents with ACTION_SET_NEW_PASSWORD need to be forwarded to the parent
of the profile when sent from a managed profile
Change-Id: I8532c59f753f8d9c61200f553f275214ad90276e
2014-05-09 16:16:02 +01:00
Jorim Jaggi
943ac44a68
Merge "Fix lockscreen occluded states #2."
2014-05-09 14:13:15 +00:00
Jorim Jaggi
43bdbbdad6
Fix lockscreen occluded states #2 .
...
Bug: 14656767
Bug: 14294001
Change-Id: Ibc428cbba8b48b6adc26756d8276a63183b8a690
2014-05-09 16:05:53 +02:00
Jason Monk
5df281a570
Fix badness from proxy refactoring.
...
When no PAC file getPacFileUrl() can return null now, which you
cannot call toString() on.
Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
2014-05-09 09:53:08 -04: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
Christoph Studer
061dee22df
Preserve notification stats on update
...
Change-Id: I519b31e83c32ac00e7c5838abbc5e3127430106b
2014-05-09 12:46:44 +02: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
Jessica Hummel
a8c5f577d0
Merge "Add api for getting the parent of a profile."
2014-05-09 09:33:28 +00:00