7120 Commits

Author SHA1 Message Date
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Ruben Brunk
94ecb5506a am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
  camera2: Move DngCreator to hardware/camera2.
2014-05-24 00:30:06 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Christopher Tate
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
2014-05-23 16:07:45 -07:00
Zhijun He
2f6da3e739 am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
2014-05-23 22:48:08 +00:00
Zhijun He
c1631fd890 Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 2014-05-23 22:44:33 +00:00
Glenn Kasten
e01043797d Merge "Remove android.media.AudioFormat default constructor" 2014-05-23 22:14:17 +00:00
Jae Seo
cd39dc783e Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases" into lmp-preview-dev 2014-05-23 21:40:59 +00:00
Zhijun He
8949225294 Camera2: Mark the under-specified tags for FUTURE
Also clean up the tag ids.

Bug: 15168075
Change-Id: I57fb6fb37e512c224370c72d806a4b702360f29f
2014-05-23 13:49:59 -07:00
Igor Murashkin
e48fb064ac am 31771fd6: Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-preview-dev
* commit '31771fd63b8d08207012c4877a08679fa9b9d539':
  camera2: Refactor CameraMetadata.Key out into 3 key classes
2014-05-23 20:13:38 +00:00
Igor Murashkin
d6d65154e5 camera2: Refactor CameraMetadata.Key out into 3 key classes
Before:
* CameraMetadata.Key<T>

After:
* CameraCharacteristics.Key<T>
* CaptureResult.Key<T>
* CaptureRequest.Key<T>

CameraMetadata#get has been removed (each metadata subclass has
its own #get now) due to java generic limitations (in particular
a type bound <T1<T2> extends Key<T2>> is an illegal bound).

CameraMetadataNative gets a new #dumpToLog function to dump the native
metadata to logcat.

Bug: 15091017
Change-Id: Ic56c54c0d184e209e20de374dc8a6d79527c209f
2014-05-23 11:55:29 -07:00
Yuhao Zheng
bd9af35597 Update Hotspot 2.0 SDK APIs
Change-Id: I0528b378219e03f896497127b5c4b191bf014141
2014-05-23 09:25:45 -07:00
Nicolas Prevot
8194899071 Rename code related to cross-profile intents.
For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
2014-05-23 13:16:01 +01:00
Julia Reynolds
6cbbe9ec99 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
(cherry picked from commit be9f43b9618ec25121b151d247eb0285fb6554b3)
2014-05-23 11:14:34 +00:00
Zhijun He
500c2341d3 am 02d13364: Camera2: Add croppingType tag
* commit '02d133644511dbc14deb833c05713a531100e5d4':
  Camera2: Add croppingType tag
2014-05-23 10:16:20 +00:00
Yuhao Zheng
7c28c36634 Update Hotspot 2.0 SDK APIs
- Add / fix java docs
- Add some setters in WifiPasspointCredential for update use

Change-Id: Ifc287ab9d69ea9e02bf036f22171947fde9ee94a
2014-05-22 22:41:13 -07:00
Zhijun He
1498615d56 Camera2: Add croppingType tag
This is to indicate if the camera supports arbitrary cropping.

Bug: 15168075
Change-Id: Ib75f7af629be816229cc686c89980fec101301c0
2014-05-22 21:58:48 -07:00
Philip Milne
5a4a3e9358 Merge "Support for weights in GridLayout" 2014-05-23 01:29:07 +00:00
Amith Yamasani
a02574a09b Merge "Fix current.txt" 2014-05-23 00:46:02 +00:00
Amith Yamasani
e1bba9d469 Fix current.txt
Probably a bad merge from upstream

Change-Id: Ie262b0be6cecd7084cab2b0468820e9d5b9ea670
2014-05-22 17:44:39 -07:00
Philip Milne
87260844af Support for weights in GridLayout
Change-Id: I31993cb7da331e0bcf404e858f2438a579093e7d
2014-05-22 17:41:53 -07:00
Michael Wright
2a89b08eb1 Merge "Add ability to request unbuffered dispatching." 2014-05-23 00:40:12 +00:00
Glenn Kasten
1aa74e4bc2 Remove android.media.AudioFormat default constructor
Change-Id: I2fe65ee7a8087151b44da3b84af357ea8bee80c4
2014-05-22 17:13:06 -07:00
Eino-Ville Talvala
0324a95052 am 7e01420b: Merge "Camera2: New capture session interface" into lmp-preview-dev
* commit '7e01420b8e532694369fc885f83838fc527708dd':
  Camera2: New capture session interface
2014-05-23 00:11:05 +00:00
Griff Hazen
6b7b34849a Merge commit 'e5b73ae2' into manualmerge
Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75
2014-05-22 16:05:19 -07:00
Ruben Brunk
b6079005ed camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
2014-05-22 22:57:11 +00:00
Griff Hazen
e5b73ae234 am c3104157: Api updates for wearable extensions to notifications
* commit 'c3104157d8f12238b0ac8cf6c6f963dadb44167c':
  Api updates for wearable extensions to notifications
2014-05-22 22:44:35 +00:00
Griff Hazen
c3104157d8 Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.

Minor fix to RemoteInput to use flags int for boolean options.

Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-22 14:38:36 -07:00
Eino-Ville Talvala
cca00c614c Camera2: New capture session interface
- Add CameraCaptureSession for all operations that require a
  valid camera configuration
- Deprecate methods in CameraDevice that are moving to CameraCaptureSession
- Document new semantics

Bug: 14964443
Change-Id: I53b2b71ed2b746cfcf76a01483f499765eb5047b
2014-05-22 20:52:36 +00:00
Jae Seo
7752244e47 DO NOT MERGE. Add more columns to TV metadata to enable newly requested use cases
Added the following columns to the Channels table:
 searchable - Used to hide certain channels from search.
 locked - Used to prevent unauthorized users from watching certain
          channels by requiring passcode.

Added the following columns to the Programs table:
 genre - Used to describe the categorical genre.
 audio_language - Used to list up available audio languages.

Bug: 14833588, Bug: 14123945, Bug: 14069779
Change-Id: Id01483f56ecf3b665e3d4dbcea1a4800ff7f031d
(cherry picked from commit 3532899452d62b6f2cd9250cb48ec204862fb3b2)
2014-05-22 20:46:48 +00:00
Winson Chung
f13cd857e0 Merge "Removing unnecessary public values. (Bug 14995844)" 2014-05-22 19:20:14 +00:00
Aravind Akella
94e4d29eff Merge "Hide Sensor.getRequiredPermission API." 2014-05-22 19:11:53 +00:00
Jae Seo
b138300a27 Merge "Add more columns to TV metadata to enable newly requested use cases" 2014-05-22 19:02:46 +00:00
Winson Chung
6784f1c623 Removing unnecessary public values. (Bug 14995844) 2014-05-22 11:22:41 -07:00
Julia Reynolds
1e95839823 Create deviceowner gated APIs for creating and removing users in devicepolicymanager.
This will allow DMAgent to manage users for EDU's cart model user case.
Bug: 15015887

Change-Id: I1eadf1701cb75fc4b50eb1a0df1525eff818286e
2014-05-22 12:02:23 -04:00
Alan Viverette
db2ed8fdd1 Merge "Move setTint into Drawable, unhide getDirtyBounds on Drawable" 2014-05-22 06:51:10 +00:00
Alan Viverette
e7772d313b Move setTint into Drawable, unhide getDirtyBounds on Drawable
BUG: 15089957
Change-Id: Ib622ba24b3f4bcf430e1d524895ac5cb104a232e
2014-05-21 23:50:03 -07:00
Todd Poynor
d0045026b6 BatteryProperty: Fix ENERGY_COUNTER property id
Change-Id: I0490c0d589c637744c3db73596d34c1c4772074b
2014-05-22 05:53:09 +00:00
Jeff Sharkey
9f561c367b Merge "Support for renaming documents." 2014-05-22 05:45:29 +00:00
Dan Sandler
842dd77bb9 Introducing Notification.MediaStyle.
Allows you to create a nice music player with all the
trimmings, including:

  * up to 5 actions in the bigContentView, styled as
    transport control buttons
  * up to 2 of those actions in the 1U (!)
  * a nice custom progress bar
  * a tinted background (taken from your Notification.color)
  * a special place to put your MediaSessionToken

Bug: 15147533
Change-Id: Ic20a2b369eb6c5fe4853987a44ffd9bace720c7f
2014-05-22 01:36:46 -04:00
Jeff Sharkey
b7e1255d5c Support for renaming documents.
DocumentsProviders can mark documents as supporting rename, and they
have the opportunity to change the DOCUMENT_ID as a side effect of
the rename.  This supports providers that embed the display name
into DOCUMENT_ID.  Issues a URI permission grant to the new document,
if any.

Adds renaming support to platform ExternalStorageProvider.  Also
adds directory deletion support.

Bug: 12350110
Change-Id: Ica4b1ae6769ee994f70f6b6b2402213eebd064e0
2014-05-21 22:24:45 -07:00
Jesse Hall
7de53d693e Merge changes Iad983802,Icda236ee
* changes:
  opengl: Fix #include style in generated JNI code
  opengl: Un-hide GLES31 and GLES31Ext classes
2014-05-22 04:41:19 +00:00
Jinsuk Kim
9302a733b0 Fix broken build
Change-Id: Icff98663842482149d8c5c5371327121a1adff3d
2014-05-22 04:35:08 +00:00
Jesse Hall
61b2dfe224 opengl: Un-hide GLES31 and GLES31Ext classes
Bug: 15028495
Change-Id: Icda236ee12a06ef2eb9902253d272dee2b61f6ef
2014-05-21 21:04:20 -07:00
Jose Lima
e9e3b3b919 Added Notification.EXTRA_BACKGROUND_IMAGE_URI
Added new EXTRA field to notification to be used to specify
an image that can be displayed to the user when the notification
is selected.

Change-Id: I3f79cf363d885fe2742e74a7d29d7e22ea1e6f60
2014-05-21 20:52:57 -07:00
Jinsuk Kim
dbbceffd9b Merge "Add feature actions for HDMI-CEC playback device" 2014-05-22 03:19:23 +00:00
Jinsuk Kim
78d695d8ba Add feature actions for HDMI-CEC playback device
- OneTouchPlayAction
- DevicePowerStatusAction
- addHotplugEventListener
- removeHotplugEventListener

Change-Id: Ia7f31507ca62127efbacbbfe07ab43ba1f9bd4cf
2014-05-22 11:15:51 +09:00
Alan Viverette
190dad4317 Merge "Style and asset cleanup" 2014-05-22 01:11:20 +00:00
Alan Viverette
0a1c6f021b Style and asset cleanup
Updates button drawable and colors, cleans up Quantum styles, updates
highlight attribute name and color, fixes popup backgrounds.

Also fixes GradientDrawable opacity check.

Change-Id: I75dd35e815a8a33ec9f0b16e881e774edfb8c092
2014-05-21 18:10:53 -07:00