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
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
Daniel Sandler
5b94114fa4
Fix build.
...
Change-Id: I2e41f312f51c3fd72ed63bc544b4fa815c2c3ba4
2013-04-25 17:13:53 -04:00
Daniel Sandler
6064df5c64
am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev
...
* commit 'fa1c443063f3d3a98c4f3bb71689fb3e1d4c6c37':
New NotificationListener API: getActiveNotifications()
2013-04-25 13:50:40 -07:00
Amith Yamasani
4699b68859
am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev
...
* commit '269c068de9ffb44aefa0bca99c77636263f8b8fb':
Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
2013-04-25 13:50:26 -07:00
Amith Yamasani
2555dafce8
Hide isLinkedUser()
...
It's not the best API to use to determine anything. Defer to other
APIs such as UserManager.getUserRestrictions()
Bug: 8720520
Change-Id: Ie49589056ab52b4fdbcc736f8cdefadb8ba5d9d8
2013-04-25 13:39:27 -07:00
Daniel Sandler
a7b6cbf1a3
Merge "API cleanup: NotificationListener" into jb-mr2-dev
2013-04-25 20:16:49 +00:00
Daniel Sandler
e6f7f2e3a0
API cleanup: NotificationListener
...
- Wrap all public member variables in getters and make
slots private
- Rename clear* methods to cancel* to be more consistent
with existing public Notification API
Bug: 8656860
Change-Id: I84f7e71fbb627f859352a93089c6a531b44dac95
2013-04-25 15:51:08 -04:00
Daniel Sandler
5e97c317e0
Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-dev
2013-04-25 19:41:10 +00:00
Amith Yamasani
d5e946a52c
Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.
...
Bug: 8704663
Change-Id: Ia9931e3844305c8f84c127506ffedf3a17eeb80d
2013-04-24 21:37:36 -07:00
Daniel Sandler
25cf8cee6f
New NotificationListener API: getActiveNotifications()
...
This allows a listener service to catch up on the current
state of the notification panel at any time, including at
startup.
Bug: 8656860
Change-Id: I1a3d665d84576e17870929a63dda334afc696010
2013-04-24 23:19:08 -04:00
Matthew Xie
ae8ffa0f4e
am 2e0a94d2: am b442d074: Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
...
* commit '2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76':
Add hardware feature android.hardware.bluetooth.le
2013-04-23 15:54:55 -07:00
Matthew Xie
b442d07469
Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev
2013-04-23 22:47:52 +00:00
Ian Rogers
023c1f4a1e
am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."
...
* commit '896ee5b6f8354567464a371025088156ed49bc32':
Adding matching @deprecated.
2013-04-23 15:01:30 -07:00
Matthew Xie
a722772b28
Add hardware feature android.hardware.bluetooth.le
...
The feature is used to differ platforms that support bluetooth low
engery radio
bug 8369273
Change-Id: Ibe23da73f7ecfa854bdb8b8bfc1a32b8e3aeee56
2013-04-23 11:53:41 -07:00
Ian Rogers
282a7e1b1d
Adding matching @deprecated.
...
Bug: 8657266
(Cherry-pick of c2a3adbd56e763ef0ad045fd8c58a54e41d1639d)
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
2013-04-23 11:36:28 -07:00
Svetoslav
7ac47e8acb
am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." into jb-mr2-dev
...
* commit '7bf02d1255e86becb225ba70ca3ea8b2af90c166':
Making new node id APIs return strings.
2013-04-23 11:16:05 -07:00
Dianne Hackborn
eadbcd3352
resolved conflicts for merge of 8c3cb811 to master
...
Change-Id: I1cd4186b6b2dcb3d1d7d21c346384dbcc6e6a8df
2013-04-23 10:56:23 -07:00
Ian Rogers
896ee5b6f8
am be4536d2: Merge "Adding matching @deprecated."
...
* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
Adding matching @deprecated.
2013-04-23 09:15:58 -07:00
Svetoslav
a61464d7ad
Merge "Making new node id APIs return strings." into jb-mr2-dev
2013-04-23 00:01:36 +00:00
Dianne Hackborn
d2eeed635d
JB MR2 == API 18.
...
Change-Id: Ia62a81f8ebc79ae0e01b181f4ef47ef192c71592
2013-04-22 13:28:47 -07:00
Svetoslav
9fa1ee563b
Making new node id APIs return strings.
...
The node id does not have to be decorated with spans like spannable
so it makes no sense to have these APIs use anything else but string.
bug:8657338
Change-Id: I2e7c31128ee9f2933bd0d58beac4ba31a498bb09
2013-04-22 12:43:07 -07:00
Fabrice Di Meglio
16cea16570
am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
...
* commit 'b241f60fe76677d106d472d4118d1e6959563331':
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-20 21:37:04 -07:00
Fabrice Di Meglio
8c08fc9a86
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
...
- clean BidiFormatter APIs
Change-Id: I8591ce3c3e8f2de4138698aa14ddb38b933de5e1
2013-04-19 17:34:01 -07:00
Jeff Tinker
89249e90fa
am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
...
* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
Correct algorithm property name and clarify javadoc description of device unique id property.
2013-04-19 14:38:39 -07:00
Jeff Tinker
26a54ecaa5
Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev
2013-04-19 20:32:35 +00:00
Jason Sams
6a341fc793
am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev
...
* commit 'dd240d9a30578930bbf63b6bd9998e940dd16160':
Updating API based on feedback
2013-04-19 13:17:10 -07:00
Jason Sams
0935f258dc
Merge "Updating API based on feedback" into jb-mr2-dev
2013-04-19 20:09:55 +00:00
Jason Sams
f64cca905c
Updating API based on feedback
...
bug 8656887
This hides the methods used to support Camera
Fixes the oversight in LaunchControl
Documents some missing functions
Change-Id: I5b19b65dd5ddf9917100192c180bb63d89c80679
2013-04-19 12:56:37 -07:00
Amith Yamasani
8dc25e0680
am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-dev
...
* commit 'ba56701493ede3f5f338a03173da0327a215b223':
Improve API and documentation
2013-04-19 12:49:40 -07:00
Jeff Sharkey
50474f91e3
am dde9559b: am 24b55f25: Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
...
* commit 'dde9559b78a93344ec0b568c2bac7329621de31f':
Deprecate StatFs methods returning small values.
2013-04-19 12:49:34 -07:00
Amith Yamasani
e37c8f781a
Merge "Improve API and documentation" into jb-mr2-dev
2013-04-19 19:10:02 +00:00
Amith Yamasani
3b458ad9ee
Improve API and documentation
...
API for querying accounts visible to a specific package.
Improve API and docs for device owner.
Bug: 8657158
Change-Id: I01b8701534f64b383391508a49ae93ed21f22ae0
2013-04-19 12:07:46 -07:00
Ian Rogers
c2a3adbd56
Adding matching @deprecated.
...
Bug: 8657266
Change-Id: Idbd22dc647f11441d15da12eb23723539768cf4c
2013-04-19 11:31:48 -07:00
Jeff Sharkey
24b55f25c1
Merge "Deprecate StatFs methods returning small values." into jb-mr2-dev
2013-04-19 18:21:09 +00:00
Kenny Root
4696f85aad
am 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev
...
* commit '78017d2e0fc81d1b07b26b358fe24b9af1d7d490':
Rename API AndroidKey* -> Key*
2013-04-19 11:03:21 -07:00
Irfan Sheriff
dd03fcc713
am 68757ef6: am 63e550f2: Merge "Add getters and private constructor" into jb-mr2-dev
...
* commit '68757ef6bcee725f983fd4c793d7be11fbdd3cd6':
Add getters and private constructor
2013-04-19 11:03:18 -07:00
Philip Milne
1027ea4743
am 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism for android controls."" into jb-mr2-dev
...
* commit '696b15e52659abdf8852dc60f09fe79edba435e0':
Revert "Simple MVC based binding mechanism for android controls."
2013-04-19 10:59:43 -07:00