Commit Graph

744 Commits

Author SHA1 Message Date
Marco Nelissen
d1da80a4b3 am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-06 20:29:11 -08:00
Marco Nelissen
ba77a3f9cb Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
support for two common ways of specifying album artist in ogg files.
b/3311831

Change-Id: Iba1152013b7577168af71f947d7249560419fa05
2011-01-06 15:05:06 -08:00
Kenny Root
1de6ca69cc am 938d0972: Merge "Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService" into gingerbread
* commit '938d097263416ad416ee995e62dab559ea50bf0d':
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-01 14:20:49 -08:00
Kenny Root
1de2eac9d0 Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: I7dad15ac0fefa867c3c8a33a579fc9899ac80262
2010-12-01 11:37:53 -08:00
Nick Pelly
c0e93a849f am 7ea5c45e: NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup.
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-21 03:54:51 -07:00
Daniel Lehmann
c61c98fdba am d16f7588: Merge "DO NOT MERGE: Private API to pass the selected tab through QuickContacts" into gingerbread
Merge commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98' into gingerbread-plus-aosp

* commit 'd16f7588a88ba98c6c466ee31bb96bc1f9562a98':
  DO NOT MERGE: Private API to pass the selected tab through QuickContacts
2010-10-14 18:34:17 -07:00
Daniel Lehmann
2f14c62125 DO NOT MERGE: Private API to pass the selected tab through QuickContacts
Bug:3082932

Change-Id: I28dbb21a30fbe22e6e58a8dda534fc9110621c85
2010-10-14 11:26:18 -07:00
Vasu Nori
c6bf3eaab4 am 51679ca8: Merge "bug:3069735 in Download UI app, handle deletes correctly" into gingerbread
Merge commit '51679ca89293ef33275b9681018c09be3948bf1c' into gingerbread-plus-aosp

* commit '51679ca89293ef33275b9681018c09be3948bf1c':
  bug:3069735 in Download UI app, handle deletes correctly
2010-10-13 16:52:57 -07:00
Vasu Nori
216fa22791 bug:3069735 in Download UI app, handle deletes correctly
gingerbread.
(for more detailed comments, please see the dependent CL
Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b )

2 changes in this CL.
1. add 2 new columns to downloads table in downloads.db:
    mediaprovider_uri = downloaded file's content_uri in mediaprovider db
    deleted = flag is set to true if a file is to be deleted
2. download UI app shows only those files whose 'deleted' flag is not set

Change-Id: I47c5f72b0a0b354fac3abe3a97752130b8189794
2010-10-13 16:18:44 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -07:00
Steve Howard
538c3fa35f am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp

* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
  Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Steve Howard
3e8c1d3a46 Have download manager give more details when downloads are paused
This change introduces more detailed reporting of why downloads are paused in
the download manager.

First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED.  I've eliminated some dead code there as well to ease the
change.

Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED.  It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.

Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
2010-09-29 17:34:40 -07:00
Nick Pelly
f4c3b7e916 am 038cabe0: NFC integration
Merge commit '038cabe0247ee46df62f9363f1a303bc5b9c1028' into gingerbread-plus-aosp

* commit '038cabe0247ee46df62f9363f1a303bc5b9c1028':
  NFC integration
2010-09-28 22:40:18 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Winson Chung
55ee8f9329 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
2010-09-27 15:08:57 -07:00
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
2010-09-27 15:04:43 -07:00
Patrick Scott
888bcdbeca am 3ae249dc: Merge "Add new Alarm provider class for setting an alarm." into gingerbread
Merge commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a' into gingerbread-plus-aosp

* commit '3ae249dc6a23f40cfc189ce2e25f75de32e7889a':
  Add new Alarm provider class for setting an alarm.
2010-09-24 11:36:51 -07:00
Patrick Scott
a73c4b082c Add new Alarm provider class for setting an alarm.
The new class provides static variables for creating an intent to broadcast to
applications implementing the alarm clock.  A new permission has been added and
applications are recommended to require this permission if accepting the set
alarm broadcast.

Change-Id: I7b1014acdc54371cbda19bcf9b5c395b647aa413
2010-09-24 13:52:14 -04:00
Vasu Nori
c55a6a42af am 2359d49b: Merge "DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963" into gingerbread
Merge commit '2359d49b80df13c1724c7c6da5648f17a33d881a' into gingerbread-plus-aosp

* commit '2359d49b80df13c1724c7c6da5648f17a33d881a':
  DO NOT MERGE - redo  Ib5e519fb40d3191ecac06c03a844872df19f3963
2010-09-22 12:19:54 -07:00
Vasu Nori
958c149496 DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963
the prev  checkin somehow screwed up master..redoing it

Change-Id: Ib9e3652d1569ab26fb62ff08c1efeaee7f2de563
2010-09-22 11:52:53 -07:00
Steve Howard
f1166513f5 am ff0ea5ea: Merge "Support for download manager "queue for wifi" dialogs" into gingerbread
Merge commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f' into gingerbread-plus-aosp

* commit 'ff0ea5eaf13198d6d752bcfbcf8e1c96f568102f':
  Support for download manager "queue for wifi" dialogs
2010-09-21 13:02:06 -07:00
Steve Howard
f176681ecc Support for download manager "queue for wifi" dialogs
New DB column and new secure setting for recommended max download size
over mobile.

Change-Id: If87acda62140ad6d8f923a000a5ff9232021e1a3
2010-09-21 12:48:09 -07:00
Steve Howard
4735be0211 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
2010-09-20 15:43:43 -07:00
Steve Howard
a9e87c9cc3 New error status for "destination file already exists".
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.

Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
2010-09-20 13:44:51 -07:00
Steve Howard
4cd34abe53 am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
478747181e Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
David Brown
9c43fffc3d am 747c6153: ContactsContract: update SipAddress to be multi-valued
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp

* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
  ContactsContract: update SipAddress to be multi-valued
2010-09-15 18:38:25 -07:00
David Brown
747c615352 ContactsContract: update SipAddress to be multi-valued
This is step (1) of the device-side changes to deal with SIP addresses
becoming first-class objects in focus.

It'll be multi-valued in focus, so make it multi-valued on the device
(just like Phone, Email, Im, etc.)

Possible types are CUSTOM, HOME, WORK, and OTHER.

Also while I was in there, fixed the typo in "TYPE_MAINDEN_NAME" in the
Nickname class.  (I can't remove it, since it's public API, so I added a
new constant with the correct spelling and deprecated the misspelled
one.)

Bug: 3004838

TESTED: on passion:

  - Flashed this change onto a device that already had a contact with a
    SipAddress, verified that it still shows up fine in the UI.

  - Wiped data, rerean SetupWizard and logged in, made sure that SIP
    addresses got synced down properly.

  - Edited SIP address on the device, made sure it got correctly synced
    up to the SIP user-defined field.

Change-Id: I6ecf551b64f87de03a7807e6212297d91f9e3981
2010-09-15 18:05:29 -07:00
Steve Howard
eca77fcdc6 Support new URI structure for download provider.
I'm changing the URI structure for the download provider a bit.  The
download provider will now support two views into its data:

* content://downloads/my_downloads... will basically be the current
  view, which is limited to downloads owned by the calling UID
* content://downloads/all_downloads... will include all downloads in
  the system, but will require special permission

In addition to making things more clear, this change will allow for
granting URI permissions to individual downloads via the
/all_downloads/... URI.

This change includes the framework changes necessary to support the
new structure.  The bulk of the work will be in the DownloadProvider
code itself.

In addition, this change makes DownloadManager return a content URI
rather than a file URI for /cache downloads.  This avoids any
confusion in clients, which wouldn't be able to open the file
directly, and better supports granting permissions to viewers.

Change-Id: Ie548b927817ac774111990dd0c9d26aaf979d1ea
2010-09-15 12:28:31 -07:00
Erik
86e1991428 am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread
Merge commit 'b92788aa040d0971b4e54589aef7675f34d96e5d' into gingerbread-plus-aosp

* commit 'b92788aa040d0971b4e54589aef7675f34d96e5d':
  Adds time zone functionality into fw as a hidden api
2010-09-14 12:25:31 -07:00
Erik
71ad58c751 Adds time zone functionality into fw as a hidden api
This is the start of work towards pushing api that is needed for
Calendar to become unbundled into frameworks. This adds functions
for getting and setting time zones for the Calendar app. The new
methods are currently hidden.

Change-Id: I1b4265b23630c46d9730a179ec02da8d6c0e03ea
2010-09-14 11:16:08 -07:00
Steve Howard
f353daa03a am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Steve Howard
90fb15a7e5 Support UI visibility and restarting in download manager.
First, this change adds a column to the downloads table specifying
whether a download should be displayed in the system downloads UI.  It
adds a public method to set this parameter when requesting a download,
and a hidden method to filter queries based on this paramter (such
filtering could be made public later, but it's not strictly necessary
right now).

Second, this change adds support for restarting a completed/failed
download as a hidden method on DownloadManager.  Currently it only
works from the download manager's process - it'll be used by the new
download manager UI.

Change-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e
2010-09-12 18:58:55 -07:00
Brad Fitzpatrick
171c83f47d am 11fe181e: Add faster TextUtil function for searching delimited lists.
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
2010-09-12 11:03:48 -07:00
Brad Fitzpatrick
11fe181e16 Add faster TextUtil function for searching delimited lists.
The previous version in Settings allocated memory.

Change-Id: I0f821112dc8f830689489f201ce268195f9e6cbd
2010-09-12 10:58:38 -07:00
Robert Greenwalt
ec52c98d44 am 0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
2010-09-09 09:49:15 -07:00
Robert Greenwalt
0727a865d8 Merge "Add network condition reporting." into gingerbread 2010-09-09 09:41:05 -07:00
Robert Greenwalt
d7085fcf65 Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-09 09:33:02 -07:00
Mike LeBeau
573c5d5edc am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread
Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
2010-09-08 17:46:22 -07:00
Mike LeBeau
2fe6fd0558 Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
search and play of music. This is used, for instance, by Google's
new "listen to" Voice Action.

Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
2010-09-08 20:39:05 -04:00
Jake Hamby
e75783440a am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:34:31 -07:00
Jake Hamby
bb37163323 Allow incoming SMS until internal storage is almost full.
Fix for bug 2382830: new incoming SMS should not be rejected when
running low on internal phone storage.

Testing revealed that the /data partition should have at least 256 KiB
available in order to prevent random app crashes (including system apps)
due to SQLite transaction failures. With 256 KiB free, the device should
safely boot without storage full errors. This takes into account the
36-40 KiB that the YAFFS2 filesystem reports as available even after
the partition has been completely filled. I've set the default full
threshold to 1 MiB to provide a generous safety margin.

For this bug, I changed the DeviceStorageMonitorService demon to send
two new hidden notifications for device storage "full" and "not full",
when the free space falls below the full threshold (default 1 MiB,
but configurable as a system setting), in addition to the existing
storage low/okay notifications sent when the storage crosses the threshold
of 90% full (also configurable).

The SMS code was changed to use these new notifications so that it can
accept messages until the data partition has been filled to the maximum
safe capacity rather than stopping when it hits 90% full. There should
be no negative impact on battery life because the additional check in
the storage polling service should be offset by an optimization to cache
the free threshold values which were previously being computed every time
through the loop.

While testing this change, I discovered that SMSDispatcher was being
instantiated twice, the first time in GSMPhone/CDMAPhone, and the second
time in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code
to pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager
constructor.

Change-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77
2010-09-08 12:37:18 -07: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
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
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