5711 Commits

Author SHA1 Message Date
Tom O'Neill
d0e2a2e7a9 Merge "Improve constant names for settings injection API" into klp-dev 2013-09-03 20:25:56 +00:00
Martijn Coenen
dca11c9913 am e22cb840: am b143c669: Merge "Add drawable for Apdu Services, fix build." into klp-dev
* commit 'e22cb840d5691c073d24cfa56c0df7f706fa4405':
  Add drawable for Apdu Services, fix build.
2013-09-03 12:35:13 -07:00
Martijn Coenen
c85fb576b8 Add drawable for Apdu Services, fix build.
Change-Id: I7c138adb60b2efe19377b58b35360cd234628424
2013-09-03 12:24:18 -07:00
Martijn Coenen
db587b6bfa am a3c92d65: am fb2f8337: NFC: @hide and remove abstract from processCommandApdu().
* commit 'a3c92d65de85a8b861f9aa3d5f7fb32732e73747':
  NFC: @hide and remove abstract from processCommandApdu().
2013-09-03 11:52:32 -07:00
Martijn Coenen
fb2f8337f6 NFC: @hide and remove abstract from processCommandApdu().
Replaced by new version with Bundle extras.

Bug: 10550349
Change-Id: If5f284c6d9b14ab32670ebc84881f459813b5b56
2013-09-03 11:40:35 -07:00
Mindy Pereira
ff4dd908c3 am 47fd3257: am 5c2dfa8a: Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev
* commit '47fd3257795e24c01308618bcd90fdfa537b1502':
  Fix build; add new ScaleGestureDetector constructor
2013-09-03 11:37:05 -07:00
Mindy Pereira
5c2dfa8a21 Merge "Fix build; add new ScaleGestureDetector constructor" into klp-dev 2013-09-03 18:32:02 +00:00
Mindy Pereira
6ad955ef97 Fix build; add new ScaleGestureDetector constructor
Change-Id: I1b6e7ef36ce79852acd6cefe03fc94143641ff0e
2013-09-03 11:27:02 -07:00
Mindy Pereira
a3ec1537b0 am 197602de: am 510caf30: Merge "Add doubletap swipe to scalegesturedetector" into klp-dev
* commit '197602ded7531ad2dc094975003d9b3e01f07a97':
  Add doubletap swipe to scalegesturedetector
2013-09-03 10:53:24 -07:00
Kenny Root
9b376a861e am 627f28c0: resolved conflicts for merge of 7e0609eb to klp-dev-plus-aosp
* commit '627f28c015b847b6026e0b86d0941728e69d7a38':
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
2013-09-03 10:49:43 -07:00
Mindy Pereira
510caf30d2 Merge "Add doubletap swipe to scalegesturedetector" into klp-dev 2013-09-03 17:38:36 +00:00
Martijn Coenen
edba13549f am ca12d455: am dd592e2a: Merge "HCE API review." into klp-dev
* commit 'ca12d4556ce19e64c8601de7299b05cfe5dfcbe6':
  HCE API review.
2013-09-03 10:31:10 -07:00
Kenny Root
7e0609eb67 Merge changes Ic710807d,I88dfcc8c into klp-dev
* changes:
  Unhide functions to allow ECDSA support
  Add support for DSA and ECDSA key types
2013-09-03 17:28:41 +00:00
Jean-Michel Trivi
5382bf11d2 am 85d8eb69: am 4a5931e2: Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev
* commit '85d8eb6916d75acd2bfd9c7b632f53e87b9cc6da':
  Public API for RemoteControlClient ratings and editable metadata
2013-09-03 10:27:35 -07:00
Martijn Coenen
dd592e2a0d Merge "HCE API review." into klp-dev 2013-09-03 17:25:01 +00:00
Jean-Michel Trivi
4a5931e2ae Merge "Public API for RemoteControlClient ratings and editable metadata" into klp-dev 2013-09-03 17:19:55 +00:00
Kenny Root
c222ddd07f Unhide functions to allow ECDSA support
Bug: 10600582
Change-Id: Ic710807d7e771737521e0abd83af2f666ec1199c
2013-09-03 09:45:55 -07:00
Jeff Sharkey
b5bf56ed0a am 92c7406b: am 7c925042: Merge "New recents behavior to match spec." into klp-dev
* commit '92c7406b853f751d45a48306f9bc1899954382eb':
  New recents behavior to match spec.
2013-09-02 20:55:26 -07:00
Jeff Sharkey
7c92504206 Merge "New recents behavior to match spec." into klp-dev 2013-09-03 03:50:27 +00:00
Martijn Coenen
5b1e032ea7 Reader mode NFC API: move to callback model.
Using intents for reader mode doesn't work well for 2 reasons:
1) Intents are used to resolve, but in reader mode we already
   know where to resolve to. Additionally, dispatching an intent
   causes additional latency.
2) Using intents with foreground dispatch was tricky; for every
   call to onNewIntent() with a new tag, there was a call to
   onPause(), which effectively disabled reader mode again,
   causing a discovery loop.

Instead, let the app register a callback, and call that when
we discover a new tag. Also, add new flag to disable platform
sounds, and to change the presence check delay.

Bug: 10360259
Change-Id: I8373543d6cf2f7ca73c9b3e42bb8b51e3ac48cac
2013-09-02 20:43:57 -07:00
Jeff Sharkey
a2a772035f am 8c58b792: am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev
* commit '8c58b79243748eeb98b650c8e660a742ad876452':
  Refactoring of DocumentsContract.
2013-09-02 17:14:37 -07:00
Jeff Sharkey
cd6d7deec8 Merge "Refactoring of DocumentsContract." into klp-dev 2013-09-03 00:07:17 +00:00
Jeff Sharkey
251097b378 New recents behavior to match spec.
Updated behavior queries each documents root for recently modified
documents.  It uses a new variant of DirectoryLoader which limits the
maximum number of parallel queries to relieve memory pressure.  When
first started, it waits up to 500ms for everyone to finish, then
publishes whatever results are ready, and then refreshes results as
each straggler finishes.

New RootCursorWrapper that always blends in authority and rootId
columns, which are used for binding root details from blended cursors.

Bug: 10593596, 10329994
Change-Id: Icc0d4a2f1b6166edc72f78a4c88f444eeba6f2f0
2013-09-02 15:33:57 -07:00
Jeff Sharkey
ae9b51bfa3 Refactoring of DocumentsContract.
Combines related columns and constants onto the same class so they
are easier to discover.  Move back to surfacing roots with columns
so they are consistent with documents.

Advanced roots are represented with a flag instead of distinct
types.  Flags to indicate supporting of well-known media types,
instead of arbitrary an MIME filter.  Reintroduce well-formed rootId
to support recents.

Always use the expanded version of "documents" in constants, methods,
and argument names.

Refactor DocumentProvider method names to clearly distinguish if
a single item or multiple could be returned, and of which type.  Add
documentation to clearly define which methods have already been
overridden.

Bug: 10567506, 10567557
Change-Id: I981f26ab82f2b520a19aa1ce66f659de50d7fac0
2013-08-31 16:58:28 -07:00
Lajos Molnar
af30982435 VideoView: add addSubtitleSource
A way to add external subtitle file to VideoView.

Change-Id: Ic110238408550a5b4088851bc5da5e94eb58d831
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10326117
2013-08-30 14:59:46 -07:00
Alan Viverette
8d1a22f0a8 am 3e09c1a3: am 083199ef: Merge "Update captioning APIs" into klp-dev
* commit '3e09c1a3c63b242b6d83671e8409f44d371cb9a3':
  Update captioning APIs
2013-08-30 14:42:49 -07:00
Matthew Williams
9d7c4d4a6e Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev 2013-08-30 21:39:15 +00:00
Alan Viverette
083199efed Merge "Update captioning APIs" into klp-dev 2013-08-30 21:34:43 +00:00
Matthew Williams
6222288bfb DO NOT MERGE. Remove service component for KLP.
1) As discussed, lack of internal clients -> remove SyncService
component from KLP. This CL reverts that addition.
2) Also includes javadoc cleanup of existing API.
3) Fix naming of allowMetered() -> disallowMetered() in API
4) Removed one-off sync in the future, as it doesn't make sense
for sync adapters.

Change-Id: I1b17094e6edafb2955cdfb99f39b44274fbe86f9
2013-08-30 21:28:53 +00:00
Martijn Coenen
52246087f4 HCE API review.
Keeping some of the old stuff @hide until all
clients have upgraded.

Bug: 10550349
Change-Id: Id5de7ab74c9b38c179fd20bd4746d95b7df8f033
2013-08-30 11:29:45 -07:00
Fabrice Di Meglio
3265685e4d am 9385d515: am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev
* commit '9385d5153e20dc4125d4e0519b0a82de143b5194':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
2013-08-30 11:06:19 -07:00
Tom O'Neill
546113d4c2 Improve constant names for settings injection API
- Add timing for getStatus() call to encourage implementors to be fast

- Affects b/10461474

Change-Id: I503cbae5cf27008c587a39ab4e60d8e09daedecc
2013-08-30 10:09:39 -07:00
Fabrice Di Meglio
253fb7f6c3 Fix bug #10549094 KLP API Review: android.util.LayoutDirection
- use constant class instead of an interface
- make it final

Change-Id: I1bde76eb84cd92427e4e1fc2483cdecec429ae99
2013-08-29 18:13:28 -07:00
Jason Sams
c850221500 am a2c13b3a: am c2b582c0: Merge "Cleanup API typo" into klp-dev
* commit 'a2c13b3a08b4b5a8f340cdedfd56557699dcb177':
  Cleanup API typo
2013-08-29 17:08:11 -07:00
Jason Sams
c2b582c0b6 Merge "Cleanup API typo" into klp-dev 2013-08-30 00:03:36 +00:00
Jason Sams
a49e89d228 Cleanup API typo
bug 10548782

Change-Id: I3654b7d1f8ea10eb51006804248cc2a7d20eabb0
2013-08-29 17:00:37 -07:00
Mindy Pereira
e8ce8ba2b5 Add doubletap swipe to scalegesturedetector
Change-Id: I070b09ed7295e0c3e07c6dffcdaba20226f7c2a3
2013-08-29 16:33:02 -07:00
Svetoslav Ganov
4b905b6195 am 97c61ab7: am 86d2db97: Merge "Print spooler security and some new print service facing APIs." into klp-dev
* commit '97c61ab7c02c24c485acf5775310a304730dfeea':
  Print spooler security and some new print service facing APIs.
2013-08-29 16:05:09 -07:00
Svetoslav Ganov
86d2db9750 Merge "Print spooler security and some new print service facing APIs." into klp-dev 2013-08-29 22:59:08 +00:00
Adam Powell
bdb284c516 am 91fa056a: am 27439903: Merge "GridLayout changes for API council" into klp-dev
* commit '91fa056a58fdad8f8e6e8a76a902c2a566364f29':
  GridLayout changes for API council
2013-08-29 15:43:04 -07:00
Svetoslav Ganov
d26d4898fc Print spooler security and some new print service facing APIs.
1. Updated the security mode of the print spooler. Now the spooler
   is not signed with the system key, it is not a privileged app so if
   it gets compromised (PDF rendering is a potential attack vector)
   it cannot access dangerous permissions. Also only the system
   can bind to the spooler.

2. Added APIs for asking a print service to start and stop tracking
   a given printer. This is need for the case when the user selects
   the printer and the print service should do a best effort to keep
   the system updated for the current state of the printer.

3. Added APIs for putting a print job in a blocked state. A print
   service would report the print job as blocked if for some reason
   the printer cannot proceed, e.g. 99 pages are printed but there
   is no paper for the last one. The user has to add more paper
   and the print service can resume the job.

4. Changed the read/write APIs to use ParcelFileDescriptor instead
   of FileDescriptor since the latter does not have a clean API for
   detaching the wrapped Linux file descriptor when one wants to
   push it to native.

5. Added API for getting the size of the printed document so the
   print service can avoid handling big filed over cellular network
   or ask the user if needed.

6. Now the print services that are preinstalled on the system image
   are automatically enabled.

Change-Id: Ia06c311d3d21cabb9e1368f13928e11cd0030918
2013-08-29 15:39:44 -07:00
Adam Powell
465ea74234 GridLayout changes for API council
* Hide set/getPrinter methods. A change/addition like this should
  happen for all views if it happens, not just for one specific view.

* Follow Android style guidelines for fields.

Bug 10549037

Change-Id: I1823d7bbbd8bcc678c5be2358ca23a8dc6dbfd15
(cherry picked from commit 916159461bf17e13c245a709935a0d1133e0ed91)
2013-08-29 21:59:22 +00:00
Jason Sams
7407850c8a am 1a81725e: am 6b115980: Merge "Unhide USAGE_IO_INPUT functions" into klp-dev
* commit '1a81725ececffe68af466d1f8dcea56b86a84247':
  Unhide USAGE_IO_INPUT functions
2013-08-29 14:28:33 -07:00
Jason Sams
6b11598048 Merge "Unhide USAGE_IO_INPUT functions" into klp-dev 2013-08-29 21:24:28 +00:00
Martijn Coenen
b86f00a077 am 10581450: am a6dcf1a2: Merge "Add an API for querying HCE service selection mode." into klp-dev
* commit '1058145049b1307aea452a198bced1d38d2b9b72':
  Add an API for querying HCE service selection mode.
2013-08-29 14:09:34 -07:00
Martijn Coenen
a6dcf1a2d6 Merge "Add an API for querying HCE service selection mode." into klp-dev 2013-08-29 21:01:16 +00:00
Jason Sams
42ef238208 Unhide USAGE_IO_INPUT functions
Change-Id: I9c1a7e5d65adee133b99b9a94729ab0b3d5a097f
2013-08-29 13:30:59 -07:00
Martijn Coenen
c3f0044abe Add an API for querying HCE service selection mode.
This allows applications to differentiate between
the case where another app is the default, or the
case where the selection mode is "Ask every time".

Also, parse new requireDeviceUnlock attribute in
ApduServiceInfo.

Bug: 10262585
Change-Id: Icac508fe00054132574731532c05a1138edb24f5
2013-08-29 13:23:03 -07:00
Martijn Coenen
f42c0fcb90 am ff8ec5c5: am c9c5d57e: Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev
* commit 'ff8ec5c56fd81f977c46a39badfd7de3bbfebfdd':
  Add requireDeviceUnlock attribute for NFC HCE.
2013-08-29 12:59:43 -07:00
Martijn Coenen
c9c5d57e4e Merge "Add requireDeviceUnlock attribute for NFC HCE." into klp-dev 2013-08-29 19:56:01 +00:00