keunyoung
28ba176957
am 14a3d969: am a90c8cba: am 64c0b0b6: Merge "rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP" into lmp-dev
...
* commit '14a3d9696ae79fa774b9787fd4e658b1018886f0':
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
2014-08-13 20:06:00 +00:00
Ihab Awad
d27d0bd43a
am 1f6d358a: am 162c1c06: am 5ba3f456: Merge "Final structural tweaks to Telecomm API (1/8)" into lmp-dev
...
* commit '1f6d358a4e54e41ddaea59711fb9f1ebfa5be0ca':
Final structural tweaks to Telecomm API (1/8)
2014-08-13 19:14:10 +00:00
ztenghui
91390fc899
am 4beef40b: am 7fec32e6: am cd65c61f: Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
...
* commit '4beef40b0c81f78f0ad2da2c868aecdb7432dfab':
Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
2014-08-13 17:54:59 +00:00
ztenghui
eceec05d4c
Revert "Revert "Update attrs / public.xml for VectorDrawable opacity removal""
...
This reverts commit d0a9544a772c906ed68793209d1e4a809174cca2.
2014-08-13 17:25:15 +00:00
Jean-Michel Trivi
684ac24bd9
am 4998fa89: am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
...
* commit '4998fa89e9978c7d84614f70c0cd56420538c13d':
Add support for AudioAttributes in android.media.Ringtone
2014-08-13 16:11:29 +00:00
Dianne Hackborn
0216f0dbee
am c0c41df5: am 905f8e8b: am 50d61878: Merge "Add 560dpi, and some other stuff." into lmp-dev
...
* commit 'c0c41df5452175e1441837aeed2d0bdabaed6e59':
Add 560dpi, and some other stuff.
2014-08-13 05:20:20 +00:00
Alan Viverette
4466a68ed0
am 8a3b0af1: am ae1970d9: am 48286f82: Merge "Add API for obtaining max text length for accessibility" into lmp-dev
...
* commit '8a3b0af14cf9f6b844f4cd78bd69677e10aa99d1':
Add API for obtaining max text length for accessibility
2014-08-13 00:43:53 +00:00
Tenghui Zhu
1faed98027
am 62a7114f: am 5b6ddc78: am d0a9544a: Revert "Update attrs / public.xml for VectorDrawable opacity removal"
...
* commit '62a7114f673dc75ecd35383e84204ff2a3ec630f':
Revert "Update attrs / public.xml for VectorDrawable opacity removal"
2014-08-13 00:09:46 +00:00
Tenghui Zhu
3caecc6ea2
Revert "Update attrs / public.xml for VectorDrawable opacity removal"
...
This reverts commit 9c44a95d5168c219facb39e7cca275d1e0a02cee.
Change-Id: If328d3101ce44c63d643217218109bb82e4f20ae
2014-08-12 16:48:46 -07:00
keunyoung
c093bf2645
rename UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK to ENABLE_CAR_MODE_ALLOW_SLEEP
...
bug: 16959030
Change-Id: I413a2ba676488bfc18e393465b98681682ec88d4
2014-08-13 18:58:03 +00:00
Ihab Awad
b19a0bcdd8
Final structural tweaks to Telecomm API (1/8)
...
Bug: 16416927
Bug: 16494880
Change-Id: I45fbe287c410cbb5e1b985f320b862d732811f43
2014-08-13 11:16:46 -07:00
Jean-Michel Trivi
ceb4d41846
Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
2014-08-12 23:14:35 +00:00
Dianne Hackborn
deb434ca08
Merge "Add 560dpi, and some other stuff." into lmp-dev
2014-08-12 23:14:35 +00:00
Alan Viverette
f2546bf423
Merge "Add API for obtaining max text length for accessibility" into lmp-dev
2014-08-12 23:14:35 +00:00
Jean-Michel Trivi
81f871e2b9
Add support for AudioAttributes in android.media.Ringtone
...
Deprecate use of stream types.
Map deprecated API to AudioAttributes.
Add new methods to specify AudioAttributes on a Ringtone instance.
Bug 16790748
Change-Id: Ifb3c2e838e1f119614459ad7d71d83a4d7c9ffdb
2014-08-12 15:53:15 -07:00
Dianne Hackborn
a3fb40d5f4
Add 560dpi, and some other stuff.
...
Like new settings actions for some of the new settings panels.
And fix voice interaction services so they require a recognizer.
And tweak array map doc to be correct.
Blah blah blah.
Change-Id: Ib5e66b574b10e7b3fa39723b21046a74e6ead204
2014-08-12 15:38:19 -07:00
Alan Viverette
029942f77d
Add API for obtaining max text length for accessibility
...
BUG: 16736956
Change-Id: I15ffb9bf68e074adf3e0dbcd230367e115c03e3c
2014-08-12 14:55:56 -07:00
Jean-Michel Trivi
cb02627f24
am 38c611a6: am 47aea2a3: am 6fdf173c: Merge "HDMI plug intent and associated information" into lmp-dev
...
* commit '38c611a6da750b1ba834199c0ade96b527e830fc':
HDMI plug intent and associated information
2014-08-12 18:05:44 +00:00
Jean-Michel Trivi
37d7804627
HDMI plug intent and associated information
...
Read HDMI device information from audio ports and add it as
extras in the connection intent.
Document the new extras in the connection intent.
Make Intent.ACTION_HDMI_AUDIO_PLUG public.
Bug 10549017
Change-Id: I6236b5363f00c433e443195fae8c43af2fc834f7
2014-08-12 17:16:30 +00:00
Robin Lee
3c7bb1f9c5
am 2f5c37d1: am a4ca4bc5: am 40bdb1f7: Clean up DevicePolicyManager CA certificate APIs
...
* commit '2f5c37d122b6ddbb7e78773138ffe7e9c7ee5bf1':
Clean up DevicePolicyManager CA certificate APIs
2014-08-12 16:13:05 +00:00
Robin Lee
7e67871174
Clean up DevicePolicyManager CA certificate APIs
...
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.
Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.
@bug 16488006
Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
2014-08-12 16:54:40 +01:00
George Mount
5c0f210cee
am f00ff757: am a4854090: am 6a2026dc: Merge "Custom snapshot capture and reconstitution." into lmp-dev
...
* commit 'f00ff7572dc30de5041d06f9b25dd9f2b8590b2c':
Custom snapshot capture and reconstitution.
2014-08-11 23:21:50 +00:00
George Mount
480ca829e2
Custom snapshot capture and reconstitution.
...
Bug 16865996
Bug 14450297
Bug 16866642
Added a mechanism for custom capture and restore of snapshot
Views. By default, it captures a Bitmap and restores a View
using that Bitmap as a background.
Change-Id: I77c2c62df53b552872e467380565bbe0e6d5c114
2014-08-11 14:28:45 -07:00
Sandeep Siddhartha
ccc11c26a0
am 2a792dcc: am 650c3649: am 361c8fbd: Merge "Remove direct field access from event payload" into lmp-dev
...
* commit '2a792dcc45c80a44a4527fae02665f4695d626e1':
Remove direct field access from event payload
2014-08-11 17:31:28 +00:00
Sandeep Siddhartha
d5730bc88c
Remove direct field access from event payload
...
Change-Id: I0b4462e56a977bfbaaebd2dd31d9246051af1b99
2014-08-11 09:53:44 -07:00
Vinit Deshpande
351c427fae
am 19a39a12: am cfa27b6d: am 70825f5c: Merge "Support EAP-SIM and EAP-AKA" into lmp-dev
...
* commit '19a39a12c54cd90a05c1dadabf4bc5719c39125d':
Support EAP-SIM and EAP-AKA
2014-08-10 20:34:15 +00:00
Tyler Gunn
0582d3da2b
am cca2ff3a: am a75300ec: am d9593758: Merge "Adding camera failure/ready session events." into lmp-dev
...
* commit 'cca2ff3ace0ecff9d108b82aa5282fae41fec3a1':
Adding camera failure/ready session events.
2014-08-10 09:04:02 +00:00
Rachad
44ff250f37
am ee1fb33f: am a6b1d678: am eca07a16: Merge "Added Tunneled video playback support to MediaCodec" into lmp-dev
...
* commit 'ee1fb33f9fa10b2f3060d989ca32cecc36a9b54c':
Added Tunneled video playback support to MediaCodec
2014-08-09 05:23:03 +00:00
Rachad
73fc533b2e
Added Tunneled video playback support to MediaCodec
...
Bug:16132368
Change-Id: I8c28cd9fbf3ca2d441f5ffa6892fbc5f70184908
2014-08-09 01:29:43 +00:00
Tyler Gunn
c4d63d705c
Merge "Adding camera failure/ready session events." into lmp-dev
2014-08-09 00:40:15 +00:00
Adam Lesinski
2586c89656
am 0bb27d84: am ed9be6fb: am 38daa3c5: Merge "Second iteration of the UsageStats API" into lmp-dev
...
* commit '0bb27d848264459c08f3d81406edb591c54aad87':
Second iteration of the UsageStats API
2014-08-08 22:49:43 +00:00
Sandeep Siddhartha
eaaaab8165
am 7a1f38c6: am eb2af5c2: am 0edd1360: Merge "Add the capture session (and its availability) in the EventPayload" into lmp-dev
...
* commit '7a1f38c6ab92d0600d533996ed976fd9fb7ba0b8':
Add the capture session (and its availability) in the EventPayload
2014-08-08 22:37:53 +00:00
Tyler Gunn
7edbe283be
Adding camera failure/ready session events.
...
The VT provider can use these to inform In-Call of a camera failure and
the camera becoming ready again after recovery.
Bug: 16900653
Change-Id: I279176860b30d02f55732b327ac3385eff8d19a8
2014-08-08 15:22:40 -07:00
Svetoslav
4412771589
am 01c2a68a: am 32c7fd28: am 3b94d0d8: Merge "Polish the new cross-profile app widget APIs" into lmp-dev
...
* commit '01c2a68a4ebdc01ff8bc4c6789f3d99ce997d82a':
Polish the new cross-profile app widget APIs
2014-08-08 21:24:52 +00:00
ztenghui
f0d5c7bc5a
am c04a21f8: am bbbe3d7b: am 6ab0f21f: Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev
...
* commit 'c04a21f84b466ea54d46f4fd3bb26fb0b7c6f90c':
Update attrs / public.xml for VectorDrawable opacity removal
2014-08-08 21:16:51 +00:00
Winson Chung
265b6fc548
am 8aa64bdf: am 0ecbe9d6: am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
...
* commit '8aa64bdf9fb4d37fda6590b709f63204693bde17':
Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
2014-08-08 21:06:14 +00:00
John Spurlock
df6a28475b
am ba5c934c: am fa8faa9b: am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev
...
* commit 'ba5c934c7e3562df7492b77ecb7904847011eedf':
New api to sync zen mode state from listeners.
2014-08-08 20:25:07 +00:00
Adam Lesinski
81f6d857c1
Merge "Second iteration of the UsageStats API" into lmp-dev
2014-08-08 18:15:47 +00:00
Adam Lesinski
3516800b61
Second iteration of the UsageStats API
...
Based on feedback from API council, updated the API.
Also added support for querying the event log.
Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
2014-08-08 12:08:15 -07:00
John Spurlock
5c8ea2c369
Merge "New api to sync zen mode state from listeners." into lmp-dev
2014-08-08 18:15:47 +00:00
RoboErik
c660d0266c
am 7e63287b: am 7a312929: am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
...
* commit '7e63287b7d1732df3015d102b508fff9eb3a3afd':
Combine MediaSession Callback and TransportControlsCallback
2014-08-08 17:52:46 +00:00
RoboErik
5ee166565c
am aa69645e: am d5a2bc2d: am b64e9e56: Unhide MediaMetadata.Description
...
* commit 'aa69645edfab276c4884a5d78331f92c35858a81':
Unhide MediaMetadata.Description
2014-08-08 17:47:51 +00:00
ztenghui
61a6184681
Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev
2014-08-08 17:26:08 +00:00
ztenghui
d0d0f1ff59
Update attrs / public.xml for VectorDrawable opacity removal
...
bug:16850076
Change-Id: Ib6fea828b14e85cacccc8a901227a8fb068f9121
2014-08-08 19:48:36 +00:00
RoboErik
6d9fe654b5
Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
2014-08-08 17:26:08 +00:00
RoboErik
67098d0963
Unhide MediaMetadata.Description
...
This unhides the method and inner class for getting a small version
of the metadata for display.
Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
2014-08-08 17:16:37 +00:00
Winson Chung
4f70cacd45
Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
2014-08-08 16:09:03 +00:00
Winson Chung
e9217a0729
Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
2014-08-08 11:27:41 -07:00
Dan Sandler
3487508f8f
am a3108454: am 41c58fcd: am b3bf3230: Publicize Material notification text styles.
...
* commit 'a310845481e6db9b5ed61ab75af1d7e7d702690e':
Publicize Material notification text styles.
2014-08-08 13:25:20 +00:00
Dan Sandler
dd06d04064
Publicize Material notification text styles.
...
Important for anyone attempting to make custom content views
that match the Material style of Builder-created
notifications.
Bug: 16520833
Change-Id: Ifc6c54cc50aaceed252dfbab7459b15216d53df1
2014-08-08 09:01:50 -04:00