111818 Commits

Author SHA1 Message Date
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
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
Jeff Hao
3a9c7161df am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev
* commit '6627e5b2aef2783cfa505a48195d7b8153eda25c':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 14:15:46 -07:00
Jesse Hall
6458257836 am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
* commit '655cff1799c3b7cce616676500e38bf43f83bc34':
  EGL10.eglCreateWindowSurface should set producerControlledByApp
2013-08-30 14:12:10 -07:00
Jeff Hao
6627e5b2ae Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev 2013-08-30 21:10:40 +00:00
Jesse Hall
655cff1799 Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev 2013-08-30 21:09:12 +00:00
Ed Tam
468c60b334 am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit '00e4c6721b344eca1d8b0de0e82e5de6f4f21f16':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 14:06:47 -07:00
Ed Tam
00e4c6721b am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
* commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
  Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 14:04:45 -07:00
Ed Tam
f85aa0fc12 Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev 2013-08-30 20:50:36 +00:00
Jesse Hall
0fa257fe53 EGL10.eglCreateWindowSurface should set producerControlledByApp
Bug: 10521699
Change-Id: Ief3f01edf7dabc7996b7af1a756dfd00f0987f1a
2013-08-30 13:49:14 -07:00
Jim Miller
bd77aa6bfd am dd238b56: Merge "Attempt to fix missing clock bug" into klp-dev
* commit 'dd238b5604e14d0da458f9b7589097d365a9dfd1':
  Attempt to fix missing clock bug
2013-08-30 12:56:52 -07:00
Jim Miller
dd238b5604 Merge "Attempt to fix missing clock bug" into klp-dev 2013-08-30 19:55:42 +00:00
Vinit Deshapnde
52105c17e1 am 90b91805: Merge "Synchronize access to single supplicant path" into klp-dev
* commit '90b9180580128b337b76a5de72d8f76646ec5aec':
  Synchronize access to single supplicant path
2013-08-30 12:50:20 -07:00
Vinit Deshapnde
90b9180580 Merge "Synchronize access to single supplicant path" into klp-dev 2013-08-30 19:48:13 +00:00
Vinit Deshapnde
fab5c2b28e Synchronize access to single supplicant path
Both wlan0 and p2p0 state machines are accessing the supplicant socket
simultaneously; and may get responses of each other's command. This
change introduces synchronization between these two processes.

Bug: 10375978
Change-Id: I0ac0b2771311b642affc353958cc9ba2e5dd5716
2013-08-30 12:31:25 -07:00
Jonathan Dixon
cfb0048b71 am 7ef3bfec: Merge "Remove WebViewClassic specific test code" into klp-dev
* commit '7ef3bfec0aa171460d0c0a1072a887a1ce830206':
  Remove WebViewClassic specific test code
2013-08-30 12:18:29 -07:00
Jonathan Dixon
7ef3bfec0a Merge "Remove WebViewClassic specific test code" into klp-dev 2013-08-30 19:15:41 +00:00
Zhentao Sun
34515fd788 am ef9778ba: Merge "Fixed b/10512887." into klp-dev
* commit 'ef9778ba39d73f67970f674893d56e48407823fd':
  Fixed b/10512887.
2013-08-30 12:13:00 -07:00
Zhentao Sun
ef9778ba39 Merge "Fixed b/10512887." into klp-dev 2013-08-30 19:11:29 +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
9385d5153e am e3d64640: Merge "Fix bug #10549094 KLP API Review: android.util.LayoutDirection" into klp-dev
* commit 'e3d64640f1083797cb188f08ff55a7d435f93eb9':
  Fix bug #10549094 KLP API Review: android.util.LayoutDirection
2013-08-30 11:03:48 -07:00
Jeff Hao
ac27705f75 Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
Bug: 9968521

Change-Id: Ic63340e0d2fef18f27fdfabdd056ac5304c3d54f
(cherry picked from commit ffbe799f3824f4be705ca726988355d3943a9004)
2013-08-30 18:02:52 +00:00