Commit Graph

798 Commits

Author SHA1 Message Date
Gloria Wang
048350abfe Fix for the incorrect size of the new added DRM file. (bug 2897238)
Change-Id: I798be5243116727abdc77850000a6a84ab204bd6
2010-09-03 10:45:51 -07:00
Dmitri Plotnikov
57ca82ddb1 Merge "Contacts API clean-up (mostly documentation)" 2010-09-02 14:35:11 -07:00
Dmitri Plotnikov
1ecf551b80 Contacts API clean-up (mostly documentation)
- Fixing column list for the Photo table.
- Fixing column list for the AggregationSuggestions table.
- Allowing CONTENT_LOOKUP_URI to be used with directories:
Data, AggregationSuggestions and Photo.

Change-Id: I3dbcc28df0029e1fcb2140efd2047707a0cdd947
2010-09-02 11:00:04 -07:00
Jeff Hamilton
6d8fe9b40b Merge "Move the searches helpers over to the new provider." 2010-09-02 10:37:28 -07:00
Jeff Hamilton
88697b5a33 Move the searches helpers over to the new provider.
Change-Id: I92030a50193a66edc4364345c9411c0f2d7c2d43
2010-09-02 12:36:04 -05:00
Cyrus Master
dcfd5d784c Merge "Adds creation and last-modified timestamps to the bookmarks contract for the browser provider." 2010-09-02 10:12:45 -07:00
Jim Miller
bc4603b0b1 Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
2010-09-01 21:00:30 -07:00
Robert Greenwalt
e90aa5e97e Add a default dns entry if none is provided
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.

bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
2010-09-01 15:25:51 -07:00
Cyrus Master
78a99cea0d Adds creation and last-modified timestamps to the bookmarks contract for the browser provider.
Change-Id: Ib6d733e3b93fc854b3ddb5c011f61534462cb266
2010-09-01 09:55:29 -07:00
Leon Scroggins
fe026bdd3c Move Find on page and Select ActionModes to framework.
Bug: 2938052

Requires a change to packages/apps/Browser

Change-Id: I1bb1a47610b06c4bb02ef08647c02cc1dcaddb15
2010-09-01 11:48:05 -04:00
Kristian Monsen
69697265e0 Merge "Fix warnings in docs generation." 2010-09-01 01:59:15 -07:00
Chung-yih Wang
dbecc24a4e resolved conflicts for merge of a329aef4 to master
Change-Id: I5a64ee2b6adc56a7521d2e55a72e519a284d5a7c
2010-09-01 11:00:33 +08:00
Chung-yih Wang
a329aef43f am 042e9bd9: Add SIP related settings in the Settings.System.
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp

* commit '042e9bd989d9c78e23ed29011b6532743f510625':
  Add SIP related settings in the Settings.System.
2010-08-31 19:07:31 -07:00
Chung-yih Wang
042e9bd989 Add SIP related settings in the Settings.System.
Change-Id: I00b6daee42fa59b662a380f832f76e67ca9402bc
2010-09-01 10:02:07 +08:00
Dmitri Plotnikov
5a998dd230 Adding a parameter to limit the number rows returned
Useful mostly for search queries

Change-Id: I4dadd2cdb110920c4f21b28d57c56b9d1f2ad4ff
2010-08-31 17:32:16 -07:00
Mike Lockwood
f06a449951 Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications" 2010-08-31 14:32:39 -07:00
Mike Lockwood
d20e802512 Merge "Add settings option for running MTP server in PTP mode." 2010-08-31 13:47:13 -07:00
Mike Lockwood
2837eefc54 MTP: Send an Intent after an MTP session that resulted in media database modifications
Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 16:25:12 -04:00
Mike Lockwood
eabe8bfaf8 Add settings option for running MTP server in PTP mode.
This can be used as a compatibility workaround for host operating systems
without MTP support.

Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-31 14:35:23 -04:00
Kristian Monsen
b5503c168a Fix warnings in docs generation.
This should fix the droiddoc warning related to the browser. Will make it a bit easier to pick up errors.

Change-Id: I8dc276bbe3d15f224eba7e4e97046024173dcecc
2010-08-31 14:02:38 +01:00
Bai Tao
224744cc72 Store the current country in call log
Change-Id: Ia68f8e0280b89d5993abb2701a3c425a147b51ba
2010-08-31 09:59:13 +08:00
Gloria Wang
45bc5eca2b Fix for "@param tag with name that doesn't match the parameter list: 'fileStream'"
Change-Id: Id98df7dcdfa4119783fca6cb5478df5b99050738
2010-08-30 14:29:31 -07:00
Mike Lockwood
5367ab6aab MTP: Move all MTP protocol constants for Java to a central location.
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-30 13:35:03 -04:00
David Brown
93637d3ee7 am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract.
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c'

* commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c':
  Add SipAddress to ContactsContract.
2010-08-27 12:14:13 -07:00
Dmitri Plotnikov
59024f1697 Unhinding more ContactsContract APIs.
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.

Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
2010-08-27 10:59:22 -07:00
David Brown
b4298cd8ba am 846eb30f: Add SipAddress to ContactsContract.
Merge commit '846eb30f78a9153102c743c2c1b49de1a4079fb1' into gingerbread-plus-aosp

* commit '846eb30f78a9153102c743c2c1b49de1a4079fb1':
  Add SipAddress to ContactsContract.
2010-08-26 14:52:10 -07:00
David Brown
846eb30f78 Add SipAddress to ContactsContract.
This is a new data kind representing a SIP address for a contact.
The new class is ContactsContract.CommonDataKinds.SipAddress,
and the new mime type is "vnd.android.cursor.item/sip_address".

It's pretty generic right now (basically a single text field, like
"Website") but we may eventually want to extend it later to have multiple
labels+types (like phone numbers.)

Bug: 2942998

Change-Id: I45d90a680a3badf60bccb5aafdc2397037494e95
2010-08-26 14:49:29 -07:00
Mike Lockwood
828d19dd96 MTP: work in progress on expanded property support
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.

Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-25 18:42:22 -04:00
Chih-Chung Chang
9439241d35 resolved conflicts for merge of 20afae51 to master
Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333
2010-08-25 15:54:51 +08:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
2010-08-25 00:09:22 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
2010-08-25 14:52:30 +08:00
Dmitri Plotnikov
13e0357ec1 Fixing the SDK build
Change-Id: I84cee32bf6d7395e7d6a366fb0b582b73637d18c
2010-08-19 16:31:29 -07:00
Jeff Hamilton
5d595f6d83 Merge "Switch the methods in Browser over to the new provider." 2010-08-18 12:57:10 -07:00
Dmitri Plotnikov
e50ed08afc Unhiding Contact Directory APIs
These APIs need to be public to allow integration
with Focus, which is unbundled.

The design document can be found here: http://goto/android-gal-integration

Change-Id: I14e749e485e301e8af5a657cc798e581dec21394
2010-08-18 11:12:35 -07:00
Jeff Hamilton
6f42edc207 Switch the methods in Browser over to the new provider.
Change-Id: I070db67989cc01b50ef0f64cb8f8652b9a1a587d
2010-08-18 11:12:05 -05:00
Jeff Hamilton
98bfcfb944 Add in constants for the server unique columns in Chrome sync.
Change-Id: Ie359d4a11da2278b623a02dea19a4f847632f5ab
2010-08-17 14:03:07 -05:00
Jeff Hamilton
e5d0a83b12 Add the contract class for the new Broswer provider.
Change-Id: I54ce53f1061ae1f910086f778b7fa6a15c11b1d4
2010-08-17 12:39:20 -05:00
Steve Howard
fe762e9d12 am ab59914d: am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2'

* commit 'ab59914de7ac714d04a5013c53aa9c7edb5421a2':
  New download manager error code when we can't resume.
2010-08-17 08:39:18 -07:00
Steve Howard
ab59914de7 am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp

* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
  New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
33bbd12a05 New download manager error code when we can't resume.
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
2010-08-16 14:28:17 -07:00
Daniel Lehmann
b332747ee0 Update flags to be consistent with GTalk's
Change-Id: Ibaa6cdc110316139ef0e2fe2fb95b864d28dfb25
2010-08-13 15:38:30 -07:00
Dmitri Plotnikov
eb7845e672 Merge "Adding query-based aggregation suggestions" 2010-08-12 18:35:28 -07:00
John Huang
81a81f02d6 am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
  Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:32:39 -07:00
John Huang
edfe20c4bd am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
  Enhance WspTypeDecoder to decode Content Type Parameters
2010-08-12 10:26:58 -07:00
Dmitri Plotnikov
44730c2e63 Adding query-based aggregation suggestions
So far we have only been able to produce aggregation
suggestions for contacts that have been saved.
This new API allows us to search for aggregation
suggestions based on the data entered by the user
without saving it first.

Change-Id: I29b3c70fbeb0ff0ce298183284648ad09373fa0f
2010-08-12 10:09:58 -07:00
Mike Lockwood
4b322ce4fb MTP: Push queries for supported formats and properties up to Java.
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-10 09:00:30 -04:00
Steve Howard
bd576042a5 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Steve Howard
974c993fc3 am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Steve Howard
8e15afe799 Make downloads visible by default.
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
2010-08-06 11:06:49 -07:00
Dmitri Plotnikov
2ef9d2538f Changing the protocol for Directory registration.
Change-Id: I1ba51d4198617121a9a5f86d22e91dfa9917c94b
2010-08-05 11:27:44 -07:00