5321 Commits

Author SHA1 Message Date
Jeff Brown
56d4b744b3 Add route description API.
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
2013-05-16 14:41:30 -07:00
Dianne Hackborn
c87c92e079 Add API to retrieve cursor notification URI.
Change-Id: I89f6c4d6ee6ef3675eff62ff6bca691b54c69f75
2013-05-15 15:39:47 -07:00
Kenny Root
92d96fe94f am f35b35df: am cdc457bb: Merge "Tracking change to add AEAD functionality"
* commit 'f35b35df6e5690577a9fbdb8a94903ad65a14a29':
  Tracking change to add AEAD functionality
2013-05-14 18:34:08 -07:00
Kenny Root
f35b35df6e am cdc457bb: Merge "Tracking change to add AEAD functionality"
* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
  Tracking change to add AEAD functionality
2013-05-14 18:29:22 -07:00
Kenny Root
e60bcc63e5 Tracking change to add AEAD functionality
This tracks libcore change d416195acbc08f2b3bdd5d5532d40438465d99e9

Change-Id: I4621472e19f6630da8498cc46221b939f11fba66
2013-05-14 17:54:07 -07:00
Elliott Hughes
112a2b6ca7 am 4d86196f: am b37652a2: Merge "Track libcore API changes."
* commit '4d86196ff289084ff062073832fa3ab737ec0061':
  Track libcore API changes.
2013-05-14 11:48:23 -07:00
Elliott Hughes
4d86196ff2 am b37652a2: Merge "Track libcore API changes."
* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
  Track libcore API changes.
2013-05-14 11:45:38 -07:00
Elliott Hughes
a377b42109 Track libcore API changes.
Change-Id: Ieb4436a5e3162a114b044bd7561bdaa4931afa0f
2013-05-14 10:55:52 -07:00
Conley Owens
7651c69e38 am e5cf479d: am d40c41df: Merge "Track libcore changes."
* commit 'e5cf479deb47ef523c521c23f1fbbaa2171ff370':
  Track libcore changes.
2013-05-13 15:06:22 -07:00
Conley Owens
e5cf479deb am d40c41df: Merge "Track libcore changes."
* commit 'd40c41df0044a155b68f3c6b21ec08bc64f5b6c7':
  Track libcore changes.
2013-05-13 14:59:11 -07:00
Elliott Hughes
0d5dee2bc3 Track libcore changes.
Bug: 3484927
Change-Id: Ifbbde9c7cbba1bccd5e1902ad5a2890bff2b2627
2013-05-13 14:15:39 -07:00
Elliott Hughes
ea47c0bd94 am c56944ed: am ebda92b8: Merge "Track libcore cleanup."
* commit 'c56944ed951771670e0420a1a2b94d01b701f1b3':
  Track libcore cleanup.
2013-05-11 00:10:43 -07:00
Elliott Hughes
c56944ed95 am ebda92b8: Merge "Track libcore cleanup."
* commit 'ebda92b84aeac7a5c5a431d6d9cecea2c3c44a97':
  Track libcore cleanup.
2013-05-11 00:08:30 -07:00
Elliott Hughes
4dbfe64675 Track libcore cleanup.
Change-Id: If9065fd48017af5490d0467a46eacd4ad14e4d96
2013-05-10 23:47:08 -07:00
Elliott Hughes
6a93e8b67a am 9a763630: am 37dbac9c: Merge "Expose @SafeVarargs."
* commit '9a76363016b87a4c2ab02d02ea0aafcc39a6eece':
  Expose @SafeVarargs.
2013-05-10 23:05:50 -07:00
Elliott Hughes
9a76363016 am 37dbac9c: Merge "Expose @SafeVarargs."
* commit '37dbac9c40d0d7163028461697f2adef1ffe6c47':
  Expose @SafeVarargs.
2013-05-10 23:04:41 -07:00
Elliott Hughes
40d6715dbb Expose @SafeVarargs.
Bug: 3484927
Change-Id: I8ac70b6a102ebf87c51c76935bd87a21f6c17506
2013-05-10 17:20:38 -07:00
Jeff Brown
83d551898d am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev
* commit 'f8e54846146c234aa9a201f54eea70df93ee56e2':
  Add an API to determine if a route is connecting.
2013-05-10 16:16:45 -07:00
Conley Owens
9926960d13 am e6abfd96: am d702e48c: Merge "Expose AutoCloseable."
* commit 'e6abfd96564b464a3ac583ac0644d3680b8a9cdf':
  Expose AutoCloseable.
2013-05-10 16:16:27 -07:00
Jeff Brown
f8e5484614 am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev
* commit '9766caedf0657615f739d4e441ab9f2fa71aa709':
  Add an API to determine if a route is connecting.
2013-05-10 16:13:44 -07:00
Jeff Brown
9766caedf0 Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 2013-05-10 23:10:33 +00:00
Conley Owens
e6abfd9656 am d702e48c: Merge "Expose AutoCloseable."
* commit 'd702e48c1394e4e0fc4db8ffc83e4b9ef6e6a40d':
  Expose AutoCloseable.
2013-05-10 15:26:26 -07:00
Elliott Hughes
10b802889b Expose AutoCloseable.
Bug: 3484927
Change-Id: I769c19ffbefb29ce11b828589f3533c24d134242
2013-05-10 14:21:30 -07:00
Marco Nelissen
c08d4d99e2 am 1d3488cb: am 86e0b491: Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev
* commit '1d3488cba90bea114c9c5e8f0d4a008d2aa34bfd':
  Add VideoView.getAudioSessionId()
2013-05-10 12:46:36 -07:00
Marco Nelissen
86e0b491d1 Merge "Add VideoView.getAudioSessionId()" into jb-mr2-dev 2013-05-10 14:12:13 +00:00
Jeff Brown
a27b8fb429 Add an API to determine if a route is connecting.
Bug: 8175766
Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
2013-05-09 21:56:42 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
2013-05-09 17:09:24 -07:00
Marco Nelissen
13bfebd6b7 Add VideoView.getAudioSessionId()
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565

Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
2013-05-09 15:50:38 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans.
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
2013-05-09 14:44:08 -07:00
John Spurlock
ad3e6cb4db Navigation hideybar via new system ui opt-in flag.
Apps using SYSTEM_UI_FLAG_HIDE_NAVIGATION to hide the nav bar
or SYSTEM_UI_FLAG_FULLSCREEN to hide the status bar can now
opt into hideybars by also using a new public sysui flag:
  View.SYSTEM_UI_FLAG_ALLOW_OVERLAY

When opting in, apps accept the fact that bars can be overlayed
over their content, but gain the ability to use the entire gesture
space - something that was not possible before, particularly when
hiding the nav bar.

Swiping from the nav bar edge of the screen will reveal the new hidey
version of the nav bar, if applicable.

Bug: 8682181
Change-Id: I6405bee50e6516667ba6b9a62d4f1e43490b5562
2013-05-08 12:22:16 -04:00
Dianne Hackborn
3aa49b6fec New UndoManager.
Basic implementation of an undo manager.  Supports
multi-level undo/redo, building on the top undo state
as edits occur, managing multiple distinct entities in
the undo state (such as embedded objects in a document),
and saving/restoring the full undo state.  Still some
work remaining on correctly dealing with dependencies
between undo states that hold multiple owners.

Also do a simple implementation of undo state in TextView
to see how things actually work.  The implementation here
is very primitive: it needs a lot more work to correctly
identify when to merge undo ops, is not trying to do
anything smart with style spans, etc.

Change-Id: Ie30f4e133351e2f569ffb48c6c44a2b19cadee27
2013-05-07 15:05:09 -07:00
Jesse Hall
9ee0999bcb resolved conflicts for merge of 78df7b5e to master
Change-Id: I27076f5e6f747a006dcac7cd334cacf56dd57bd5
2013-05-06 16:04:53 -07:00
Svetoslav
100ed154b7 am b0675df8: am faa47b52: Merge "Idle maintenance scheduling broken." into jb-mr2-dev
* commit 'b0675df8fd377230edc392e02ba0eba275b57992':
  Idle maintenance scheduling broken.
2013-05-06 13:56:14 -07:00
Jesse Hall
02b7128f87 Merge "Add android.opengl.EGLExt class for EGL extensions" into jb-mr2-dev 2013-05-04 17:50:48 +00:00
Svetoslav
6a08a12b8e Idle maintenance scheduling broken.
1. The scheduling was relying on receiving battery level broadcasts
   which however are not sent if the device is asleep. The maintenance
   window was not bound and we could miss a frame if the user did
   not interact the device longer than the min time between two
   maintenance windows.

2. Hide the idle maintenance intents since this will be rewritten
   to user services.

bug:8688454

Change-Id: I17b421b09823cb46ec218cabda19e02432d94f8c
2013-05-03 14:03:06 -07:00
Jeff Sharkey
9cbe2ae3ae Merge "Unhide extra to fix docs build." 2013-05-02 01:15:25 +00:00
Jeff Sharkey
9ab3fd4565 Unhide extra to fix docs build.
Change-Id: Ib757b5d62e6ff7f4623680fb5faba337de46aa02
2013-05-01 18:14:16 -07:00
Jeff Sharkey
863b117a3a Merge "Start fleshing out new storage APIs." 2013-05-02 00:22:10 +00:00
Jeff Sharkey
9ecfee03fa Start fleshing out new storage APIs.
Introduces new DocumentsContract which storage backends must
implement.  Backends surface a simple directory-like organizational
structure that enables a document to appear at multiple locations in
that hierarchy.  Querying a document or the contents of a directory
will return a Cursor populated with DocumentColumns, which includes
simple metadata.

Adds new OPEN_DOC and CREATE_DOC Intents, and permission to protect
storage backends.

Change-Id: Ib4984bc980182b2cedbe552908e5be94604ef085
2013-05-01 17:21:06 -07:00
Jeff Tinker
e0eb0e9063 am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev
* commit '9ba564c7e205c4b278be61eec773a90a94451251':
  MediaDrm API: Add two exceptions to handle error path scenarios
2013-05-01 15:04:36 -07:00
Jeff Tinker
48f2b548ed Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev 2013-05-01 22:01:16 +00:00
Jesse Hall
0c79d808cb Add android.opengl.EGLExt class for EGL extensions
Add the ES-relevant constants from the EGL_KHR_create_context
extension. These allow apps to check which EGLConfigs (if any) support
ES3 contexts. Otherwise, the app has to create a context with an
EGLConfig and then check whether it is an ES2 or ES3 context.

Also move eglSetPresentationTimeANDROID from EGL14 to EGLExt, since it's an
extension function. It's new in API 18.

Bug: 8678160
Change-Id: I3cba6e59ebb0a3a4c4012aa54a36b940c288bcec
2013-05-01 13:46:58 -07:00
Jeff Tinker
1d7c218ba2 MediaDrm API: Add two exceptions to handle error path scenarios
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
2013-04-30 12:39:04 -07:00
Mike Lockwood
853ad6fbe3 Remove obsolete OMA-DRM support
Change-Id: Ic6008d4c9f8b9cd9fd4efec070260227af70559c
2013-04-29 16:48:13 -07:00
Jeff Sharkey
32559e191f Decorate AssetFileDescriptor with Closeable.
Change-Id: I1f5f462b781a6e8fad77337006febd9c54694c0b
2013-04-29 11:22:20 -07:00
Amith Yamasani
fe9270712e am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-dev
* commit '83a6142173fbd3ddf5c4285e2b6359e44beaddb0':
  Hide isLinkedUser()
2013-04-25 21:26:59 -07:00
Amith Yamasani
bbd90f8e70 Merge "Hide isLinkedUser()" into jb-mr2-dev 2013-04-26 01:42:20 +00:00
Daniel Sandler
0c482b3c96 am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-dev
* commit '56f7afb05685f293551dd33d1b52e42114857bc2':
  Fix build.
2013-04-25 17:01:15 -07:00
Daniel Sandler
06cacff626 am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-mr2-dev
* commit '4064af9b096dfdf317d158c8aafd396c86f3fd0a':
  API cleanup: NotificationListener
2013-04-25 17:01:10 -07:00
Daniel Sandler
cc165d165e Merge "Fix build." into jb-mr2-dev 2013-04-25 21:16:56 +00:00