Jeff Sharkey
f5c2071809
am 32bfd2a3: am c22acf6f: Merge "Instance state, fix sharing, Durable objects." into klp-dev
...
* commit '32bfd2a398c2b5115a50d867c1ed8ae13ab33760':
Instance state, fix sharing, Durable objects.
2013-09-02 20:55:19 -07:00
Jeff Sharkey
d0b6460021
am e1dfca29: am db06adec: Merge "Use Cursors directly when binding documents." into klp-dev
...
* commit 'e1dfca2989ea87b9ac6864b2bd697f59d1c0ab2a':
Use Cursors directly when binding documents.
2013-09-02 20:55:16 -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
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
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
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
Przemyslaw Szczepaniak
7a632f76f9
am 0b162145: am 61dda198: Fix SynthesisRequest javadoc
...
* commit '0b1621459378122cb92945a0c6ca1142da7fe9ac':
Fix SynthesisRequest javadoc
2013-09-02 09:49:24 -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
31d3f51f48
am 35826992: am f2724463: Merge "Improve the API document for supportsSwitchingToNextInputMethod" into klp-dev
...
* commit '3582699241554f28e9efd22b551837de22b6dd70':
Improve the API document for supportsSwitchingToNextInputMethod
2013-09-01 22:55:35 -07: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
bf3a4cb8ae
am 982b170e: am 52c10e94: Merge "Status bar icons as expressions of white." into klp-dev
...
* commit '982b170e199ba3763d6fe210289762c37c46f240':
Status bar icons as expressions of white.
2013-08-31 08:04:37 -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
f33c9cf494
am 2c36bc77: (-s ours) am 0f1691e4: am 468c60b3: (-s ours) am 00e4c672: am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
...
* commit '2c36bc771f3c6b21b259027b6f43d74c06636a9d':
Telephony: SMS over IMS, DO NOT MERGE
2013-08-30 18:17:46 -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
Alan Viverette
a74827b117
am e73d13ea: am bc7e4b2c: Merge "Update internal AutoScrollHelper to match support lib version" into klp-dev
...
* commit 'e73d13ea7890b65254bb70fb7265f45fc6e53bf5':
Update internal AutoScrollHelper to match support lib version
2013-08-30 17:01:18 -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
5604f9cc00
am 8fa18599: am 580e60fd: Merge "Use core-tests-support instead of core-tests" into klp-dev
...
* commit '8fa185996e4ef3f1b484f11635c01e5bdabbaf0d':
Use core-tests-support instead of core-tests
2013-08-30 16:40:10 -07: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
Jeff Hao
5e70f2fb90
am 2c57b903: am 482dfd55: am 6110d16b: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks."
...
* commit '2c57b903554d3953f94b18752d10240ae7e25e1b':
Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 15:23:35 -07: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
Matthew Williams
c5d0d9cd78
am eea358a7: (-s ours) am 9d7c4d4a: Merge "DO NOT MERGE. Remove service component for KLP." into klp-dev
...
* commit 'eea358a70b48f7611ce1544d3e09ef9a4abc76ce':
DO NOT MERGE. Remove service component for KLP.
2013-08-30 14:46:27 -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
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
c0a38c227e
am 3a9c7161: am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev
...
* commit '3a9c7161dfd6f16baddd2eb209a013609b927da7':
Change IsMethodTracingActive to GetMethodTracingMode for frameworks.
2013-08-30 14:17:27 -07:00
Jesse Hall
e721327ee7
am 64582578: am 655cff17: Merge "EGL10.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
...
* commit '6458257836da466347f1d82a78c9c3ca3f16ec33':
EGL10.eglCreateWindowSurface should set producerControlledByApp
2013-08-30 14:17:22 -07: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