112094 Commits

Author SHA1 Message Date
Kenny Root
c62a8b71b4 am 333bd17e: am 7adc233c: Merge "Add support for DSA and ECDSA key types"
* commit '333bd17eec47a78d3ae8081d828ab1440e621e03':
  Add support for DSA and ECDSA key types
2013-09-03 00:18:40 -07:00
Kenny Root
333bd17eec am 7adc233c: Merge "Add support for DSA and ECDSA key types"
* commit '7adc233cf8f6f9e2a83a4549a9295d1a3933beab':
  Add support for DSA and ECDSA key types
2013-09-03 00:15:43 -07:00
Kenny Root
7adc233cf8 Merge "Add support for DSA and ECDSA key types" 2013-09-03 07:11:36 +00:00
Jeff Sharkey
f56ae2b903 am 118cb035: Merge "Filter roots based on incoming request." into klp-dev
* commit '118cb0353f6dabce1a1d6b550f7fc9eb78c7de87':
  Filter roots based on incoming request.
2013-09-02 20:55:12 -07:00
Jeff Sharkey
92c7406b85 am 7c925042: Merge "New recents behavior to match spec." into klp-dev
* commit '7c925042061bf4b80cf80a7e6d94995c62eca7e1':
  New recents behavior to match spec.
2013-09-02 20:51:44 -07:00
Jeff Sharkey
32bfd2a398 am c22acf6f: Merge "Instance state, fix sharing, Durable objects." into klp-dev
* commit 'c22acf6f1fc001ad0f1c23c5261f371d63e4106e':
  Instance state, fix sharing, Durable objects.
2013-09-02 20:51:40 -07:00
Jeff Sharkey
e1dfca2989 am db06adec: Merge "Use Cursors directly when binding documents." into klp-dev
* commit 'db06adec0d25f57d0fff8788b0081f92f6e5383c':
  Use Cursors directly when binding documents.
2013-09-02 20:51:37 -07:00
Jeff Sharkey
118cb0353f Merge "Filter roots based on incoming request." into klp-dev 2013-09-03 03:50:56 +00:00
Jeff Sharkey
7c92504206 Merge "New recents behavior to match spec." into klp-dev 2013-09-03 03:50:27 +00:00
Jeff Sharkey
c22acf6f1f Merge "Instance state, fix sharing, Durable objects." into klp-dev 2013-09-03 03:50:10 +00:00
Jeff Sharkey
db06adec0d Merge "Use Cursors directly when binding documents." into klp-dev 2013-09-03 03:50:00 +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
348ad6866b Filter roots based on incoming request.
When incoming request is for local-only content, or for ACTION_CREATE,
only include roots advertise those features.

Filters roots based on the allowed MIME types and the supported types
advertised by each root.  This supports displaying Images and Audio
roots only when requesting those content types.  Applies the same
filter when deciding which roots to query for recents.

Fixes advanced filtering instead of limiting to just devices. Update
sorting so that Recent always appears first. Add testing support for
LOCAL_ONLY.

Bug: 10597317, 10526535
Change-Id: Ic5ccf475c4fe93fd52b29388d369d7f6915c0c42
2013-09-02 17:43:14 -07:00
Jeff Sharkey
8c58b79243 am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev
* commit 'cd6d7deec8742e257a670db8e027f628afdf337e':
  Refactoring of DocumentsContract.
2013-09-02 17:09:15 -07:00
Jeff Sharkey
cd6d7deec8 Merge "Refactoring of DocumentsContract." into klp-dev 2013-09-03 00:07:17 +00:00
Svetoslav Ganov
6bd20bc46c System print service enabled after every system reboot
The system was overriding the user on every boot by turing of all system
print services, i.e. service that are on the system image. Now the system
print service are enabled by default only once per user, the user can later
disable them and the system does not override that. We now have a system
setting with the services we enabled once by default so we never do
default enabling again (unless device is wiped).

bug:10594775

Change-Id: Id3129ccfba95bf57375ea9fec0b5ca0e51bda199
2013-09-02 15:35:06 -07: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
Przemyslaw Szczepaniak
0b16214593 am 61dda198: Fix SynthesisRequest javadoc
* commit '61dda198598e95971ca224e3bcb7393f30e45657':
  Fix SynthesisRequest javadoc
2013-09-02 09:47:51 -07:00
Przemyslaw Szczepaniak
61dda19859 Fix SynthesisRequest javadoc
Bug: 10548784
Change-Id: I76a89bb9accdeee00c60a668adbdd789b995cd92
2013-09-02 16:41:05 +01:00
satok
3582699241 am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
* commit 'f272446372b865e315240bce50853769d77fa939':
  Improve the API document for supportsSwitchingToNextInputMethod
2013-09-01 22:52:59 -07:00
satok
f272446372 Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev 2013-09-02 05:49:43 +00:00
Jeff Sharkey
b51331116e Instance state, fix sharing, Durable objects.
Remember instance state across configuration changes, and enable
rotation.  This remembers current modes and in-progress traversals.

Always finish action modes after launching an action.  Fix sharing
by always putting Uris in extras, and always wrap in a chooser.  Find
common MIME types when sharing multiple documents.  Fix downloads
launching by following directory MIME type change.

Introduce "Durable" which is like Parcelable, but can be used for
both byte[] storage and Parcel transport.  Make both DocumentInfo
and DocumentStack durable.

Disable recents until new behavior is implemented.

Bug: 10460236, 10446265, 10533674, 10456344, 10456702
Change-Id: I4eaf2b0b4cde611c69a1e7b5f1586f6b02019b27
2013-09-01 18:59:38 -07:00
Jeff Sharkey
5dfb345df7 Use Cursors directly when binding documents.
Instead of creating a DocumentInfo for every list item, bind the
adapter against Cursor directly.

Create new SortingCursorWrapper which performs sorting at query time
and keeps a O(1) mapping from sorted to unsorted positions in the
underlying Cursor.

Suppress extra loader passes that had been kicked off.  Use unstable
provider when querying to guard against broken providers.

Bug: 10567506, 10510851
Change-Id: I535814da6b17c38de04a1175e0afcc78c6b966ce
2013-08-31 21:33:56 -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
John Spurlock
982b170e19 am 52c10e94: Merge "Status bar icons as expressions of white." into klp-dev
* commit '52c10e94d98e32d977bfd4021136f4c9fa571bd6':
  Status bar icons as expressions of white.
2013-08-31 08:02:16 -07:00
John Spurlock
52c10e94d9 Merge "Status bar icons as expressions of white." into klp-dev 2013-08-31 14:59:31 +00:00
Svetoslav Ganov
19fba5d34a KLP API Review: PrintDocumentAdapter documentation
bug:10551676

Change-Id: I755cc1827ed950b8481b8b260ea3cde83bcdd418
2013-08-30 18:49:15 -07:00
Ed Tam
2c36bc771f am 0f1691e4: am 468c60b3: (-s ours) am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '0f1691e4c5412bd7139aff00feeb543b9adc47e9':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 18:16:28 -07:00
Ed Tam
0f1691e4c5 am 468c60b3: (-s ours) am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '468c60b334321d5790b0b5bd962870939aac0ab2':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 18:14:59 -07:00
John Spurlock
bbb97ae7a5 Status bar icons as expressions of white.
Bug:10502089
Change-Id: Id13badd6c729b79492aec5370dbb3dc2479008fd
2013-08-30 21:11:19 -04:00
Kenny Root
f64386fc26 Add support for DSA and ECDSA key types
Change-Id: Ic6f029d66210052ce2f75d46102a100ac7db2b49
2013-08-30 17:54:13 -07:00
Alan Viverette
e73d13ea78 am bc7e4b2c: Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev
* commit 'bc7e4b2cd5a7068fbcd9de8eb0e2e7a9f596479b':
  Update internal AutoScrollHelper to match support lib version
2013-08-30 16:59:37 -07:00
Alan Viverette
bc7e4b2cd5 Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev 2013-08-30 23:58:08 +00:00
Kenny Root
8fa185996e am 580e60fd: Merge "Use core-tests-support instead of core-tests" into klp-dev
* commit '580e60fdcd64ba1c8cd6bad3d20200312b7503aa':
  Use core-tests-support instead of core-tests
2013-08-30 16:36:02 -07:00
Kenny Root
580e60fdcd Merge "Use core-tests-support instead of core-tests" into klp-dev 2013-08-30 23:21:27 +00:00
Kenny Root
3603f04ab8 Use core-tests-support instead of core-tests
The core-tests-support library is newly created. It doesn't have any
tests itself but some support for tests that need to use mocked classes
for testing. In this case, some tests are using TestKeyStore for SSL
testing in frameworks tests.

(cherry picked from commit c2d6728350f3ec80f9b4c8967794558e42516987)

Bug: 10092469
Change-Id: Ib38364c607de5a98eb242050eaaf52b22ab8ca57
2013-08-30 16:18:56 -07:00
Geoffrey Borggaard
8135f3a9d3 UX improvements to the restrictions PIN
As per Rachel.  Remove the title, change the hint text.
Don't make the dialog disappear after failed attempts.
Bug: 10542734

Change-Id: I1cae3d74bd4da06364626d63faf945f629cf6537
2013-08-30 23:02:10 +00:00
Jeff Hao
2c57b90355 am 482dfd55: am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks."
* commit '482dfd55485cbd179910dc01e1d29543476675ed':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 15:20:37 -07:00
Jeff Hao
482dfd5548 am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks."
* commit '6110d16b8dd08d276902d2c6d8e90562a3d3694d':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 15:19:01 -07:00
Jeff Hao
6110d16b8d Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." 2013-08-30 22:17:12 +00:00
Jonathan Dixon
69f9f9305c Add tracing to WebView API methods and callbacks
Bug: 10488419

This is useful for debugging numerous SxS issues.

Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
2013-08-30 15:07:25 -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
3f9832d3c7 Fix pre tag formatting in getDragToOpenListener documentation
BUG: 10549164
Change-Id: Ie3e05e918edbd737326c724e4e712279ac410238
2013-08-30 14:43:25 -07:00
Matthew Williams
eea358a70b am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev
* commit '9d7c4d4a6e4683862931b3a11c974715073514ab':
  DO NOT MERGE. Remove service component for KLP.
2013-08-30 14:42:02 -07:00
Jeff Hao
6f0a04f5d2 Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)

Change-Id: Ic87a254171fca7dfdf02c8643cd367055c8889cd
2013-08-30 14:40:26 -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
3e09c1a3c6 am 083199ef: Merge "Update captioning APIs" into klp-dev
* commit '083199efed839274619eb7a003a7d7c9229e5ffc':
  Update captioning APIs
2013-08-30 14:38:20 -07:00
Alan Viverette
083199efed Merge "Update captioning APIs" into klp-dev 2013-08-30 21:34:43 +00:00
Alan Viverette
cb168795fe Update internal AutoScrollHelper to match support lib version
BUG: 10547956
Change-Id: I7d5b1b9fb89ae8ff4294cc2dfd01e29b55ed3eba
2013-08-30 14:33:13 -07: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