7 years agoImport translations. DO NOT MERGE
Ying Wang [Fri, 13 Jul 2012 18:04:09 +0000]
Import translations. DO NOT MERGE

Change-Id: Icb03811c70a091981b748e50004b2db597c68280
Auto-generated-cl: translation import

7 years agoNo echo or earcon after checking/unchecking items in the download screen.
Svetoslav Ganov [Tue, 3 Jul 2012 21:36:02 +0000]
No echo or earcon after checking/unchecking items in the download screen.

1. The problem is that download provider is using a custom view to intercept
   clicks to toggle the state of the nested check box. However, the when
   toggling the code is not calling performClick() on the check box which
   aside of toggling will also send the right accessibility event.

bug:6705105

Change-Id: Ia7253ff05f6e4575a346b9aaf3fbceecd68b9782

7 years agoImport translations. DO NOT MERGE
Ying Wang [Mon, 18 Jun 2012 18:05:40 +0000]
Import translations. DO NOT MERGE

Change-Id: Ia9138f7b8611650a3dfab998de558c1b53b0f27b

7 years agoam 2b9a11f7: Reconcile with jb-release
The Android Open Source Project [Mon, 11 Jun 2012 16:25:46 +0000]
am 2b9a11f7: Reconcile with jb-release

* commit '2b9a11f729ce4ce5e7ef06c611522146468dc208':

7 years agoReconcile with jb-release
The Android Open Source Project [Mon, 11 Jun 2012 16:22:52 +0000]
Reconcile with jb-release

Change-Id: I498fdba3aa0836ff4f4f42e43e0e7a5d94dfa25d

7 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 8 Jun 2012 15:22:49 +0000]
merge in jb-release history after reset to jb-dev

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 7 Jun 2012 20:16:23 +0000]
Import translations. DO NOT MERGE

Change-Id: I9e117db77c61afa73e9d2bdaeb6080270ac4ca4c

7 years agoam c5b582ce: am f918429d: Uniform "when" to avoid flashing notifications.
Jeff Sharkey [Thu, 7 Jun 2012 18:28:40 +0000]
am c5b582ce: am f918429d: Uniform "when" to avoid flashing notifications.

* commit 'c5b582cebe167264106df5fa7b2ae7312cd456ce':
  Uniform "when" to avoid flashing notifications.

7 years agoam f918429d: Uniform "when" to avoid flashing notifications.
Jeff Sharkey [Thu, 7 Jun 2012 18:25:52 +0000]
am f918429d: Uniform "when" to avoid flashing notifications.

* commit 'f918429d0c1927a19d688baa26a07c2c65765580':
  Uniform "when" to avoid flashing notifications.

7 years agoUniform "when" to avoid flashing notifications.
Jeff Sharkey [Thu, 7 Jun 2012 18:10:18 +0000]
Uniform "when" to avoid flashing notifications.

When showing a download, remember the first timestamp when we showed
a notification, and use that time as "when" for all future updates
to avoid flashing.

Also bring back icon animation that had regressed.

Bug: 6596416, 6237256
Change-Id: Ifdc5dc6870dac047515151c1b088e6e379b6a063

7 years agoam a1556511: Reconcile with jb-release
The Android Open Source Project [Thu, 7 Jun 2012 14:55:56 +0000]
am a1556511: Reconcile with jb-release

* commit 'a155651109589b4bf69c9af7e1d515b6b26cb3fe':

7 years agoReconcile with jb-release
The Android Open Source Project [Thu, 7 Jun 2012 14:51:35 +0000]
Reconcile with jb-release

Change-Id: Icc86c6dba50bad25e4031c47a2580a1af4eeeb1e

7 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 6 Jun 2012 14:04:53 +0000]
merge in jb-release history after reset to jb-dev

7 years agoam 8c4f4292: am 03fcf943: Download items should always fit screen.
Jeff Sharkey [Tue, 5 Jun 2012 23:06:29 +0000]
am 8c4f4292: am 03fcf943: Download items should always fit screen.

* commit '8c4f42924ba55d636d19caeb2ccbdd7e32edc443':
  Download items should always fit screen.

7 years agoam 03fcf943: Download items should always fit screen.
Jeff Sharkey [Tue, 5 Jun 2012 23:01:24 +0000]
am 03fcf943: Download items should always fit screen.

* commit '03fcf94300996a9cb7889ca03ddb2c62ca2ba606':
  Download items should always fit screen.

7 years agoDownload items should always fit screen.
Jeff Sharkey [Tue, 5 Jun 2012 20:23:16 +0000]
Download items should always fit screen.

Bug: 6614812
Change-Id: I9b5eb051bce1e296478fb1fa6f95b710fa0c819f

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 25 May 2012 18:59:05 +0000]
Import translations. DO NOT MERGE

Change-Id: I952cc9c502b2896d4ec4e17fb184f93ad97ae1b4

7 years agoam 7e62209a: Reconcile with jb-release
The Android Open Source Project [Thu, 24 May 2012 16:08:25 +0000]
am 7e62209a: Reconcile with jb-release

* commit '7e62209a5ebd83d92ae51f4872723cb7f1a854ae':

7 years agoReconcile with jb-release
The Android Open Source Project [Thu, 24 May 2012 16:01:52 +0000]
Reconcile with jb-release

Change-Id: I5082e21795dab58054b3a6fea228ac6e0312be15

7 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 24 May 2012 14:02:17 +0000]
merge in jb-release history after reset to jb-dev

7 years agoam 0cb81ea3: am f5ac95ff: Updating launcher icon to fix alignment. Bug: 6511716
Christian Robertson [Wed, 23 May 2012 21:09:34 +0000]
am 0cb81ea3: am f5ac95ff: Updating launcher icon to fix alignment. Bug:  6511716

* commit '0cb81ea364ca9ac2c66e2ad2026d9b78bd792de5':
  Updating launcher icon to fix alignment. Bug:  6511716

7 years agoam f5ac95ff: Updating launcher icon to fix alignment. Bug: 6511716
Christian Robertson [Wed, 23 May 2012 21:04:42 +0000]
am f5ac95ff: Updating launcher icon to fix alignment. Bug:  6511716

* commit 'f5ac95ffef7897c83706eed9e419e6c015adaf75':
  Updating launcher icon to fix alignment. Bug:  6511716

7 years agoUpdating launcher icon to fix alignment. Bug: 6511716
Christian Robertson [Wed, 23 May 2012 18:59:55 +0000]
Updating launcher icon to fix alignment. Bug:  6511716

Change-Id: I63fa8b85935aef453ea31730c3fc38127f0451f6

7 years agoam c1df0651: am 0acd13fe: Merge "avoid repetition of retrying download"
Jean-Baptiste Queru [Mon, 21 May 2012 21:32:45 +0000]
am c1df0651: am 0acd13fe: Merge "avoid repetition of retrying download"

* commit 'c1df0651e86ab6d0918cfac86ff54d3fb3781a69':
  avoid repetition of retrying download

7 years agoam 0acd13fe: Merge "avoid repetition of retrying download"
Jean-Baptiste Queru [Mon, 21 May 2012 20:47:09 +0000]
am 0acd13fe: Merge "avoid repetition of retrying download"

* commit '0acd13fed2f4d0857ce89565fe94674c09b1e844':
  avoid repetition of retrying download

7 years agoMerge "avoid repetition of retrying download"
Jean-Baptiste Queru [Mon, 21 May 2012 20:08:17 +0000]
Merge "avoid repetition of retrying download"

7 years agoam 3b696ab3: Reconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:46:30 +0000]
am 3b696ab3: Reconcile with jb-release nakasi-factoryrom-release

* commit '3b696ab3c80388a4f1a413d39d536d2858b9f4e5':

7 years agoReconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:41:11 +0000]
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ie7f0fac996068219e01f8560eff0156987e931fb

7 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 4 May 2012 23:16:26 +0000]
merge in jb-release history after reset to jb-dev

7 years agoam 3ea50965: Merge "Updated layout for download items." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 18:40:41 +0000]
am 3ea50965: Merge "Updated layout for download items." into jb-dev

* commit '3ea5096568f147941b4302070ffc2024bad8e18f':
  Updated layout for download items.

7 years agoMerge "Updated layout for download items." into jb-dev
Jeff Sharkey [Fri, 4 May 2012 18:35:34 +0000]
Merge "Updated layout for download items." into jb-dev

7 years agoUpdated layout for download items.
Jeff Sharkey [Fri, 4 May 2012 01:08:24 +0000]
Updated layout for download items.

Switch to using GridLayout, because it's awesome.  Also move status
display to right-hand side, showing date when in completed state.

Bug: 6378944
Change-Id: I540633010ed4aeeae299cedf7a49fdb81e65b431

7 years agoam 2f39d818: Wrap share in chooser.
Jeff Sharkey [Fri, 4 May 2012 18:21:17 +0000]
am 2f39d818: Wrap share in chooser.

* commit '2f39d81833807331c99d519f80b9eeb15ada4291':
  Wrap share in chooser.

7 years agoWrap share in chooser.
Jeff Sharkey [Fri, 4 May 2012 17:59:15 +0000]
Wrap share in chooser.

Bug: 5418990
Change-Id: I9e46844d3fc983afc3c389ec64c099374f955610

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Apr 2012 18:22:29 +0000]
Import translations. DO NOT MERGE

Change-Id: I9ac17052609031b73a0711e20a34613acf15a4de

7 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 25 Apr 2012 14:49:08 +0000]
merge in jb-release history after reset to jb-dev

7 years agoOnly delete spurious files belonging to us.
Jeff Sharkey [Tue, 24 Apr 2012 22:03:47 +0000]
Only delete spurious files belonging to us.

When multiple users are active, this can accidentally delete files
belonging to other users.  Checking owner also helps us avoid
deleting recover and lost+found.

Bug: 6362988
Change-Id: Ifc165acc9a9b3ab253a4b6257f370836b98b3a74

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:06:15 +0000]
merge in jb-release history after reset to master

7 years agoAvoid NPE when _DATA column is empty.
Jeff Sharkey [Fri, 20 Apr 2012 18:53:48 +0000]
Avoid NPE when _DATA column is empty.

Bug: 6371718
Change-Id: Id661210101b01daf8f5d46a318c32dbb9de9a4fb

7 years agoMore slogging around download deletion.
Jeff Sharkey [Fri, 20 Apr 2012 03:51:24 +0000]
More slogging around download deletion.

Bug: 6362988
Change-Id: Iab4b86cfcaa6aeed6466f88ff49eb935f96db495

7 years agoReport MIME type for individual downloads.
Jeff Sharkey [Thu, 19 Apr 2012 17:10:53 +0000]
Report MIME type for individual downloads.

Bug: 6358473
Change-Id: Ied4a6c8194d0cbb735e43cf7d7759f4674efe535

7 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 19 Apr 2012 14:05:11 +0000]
merge in jb-release history after reset to master

7 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 18 Apr 2012 14:05:16 +0000]
merge in jb-release history after reset to master

7 years agoAdd and enforce ALLOW_METERED column.
Jeff Sharkey [Tue, 17 Apr 2012 19:26:06 +0000]
Add and enforce ALLOW_METERED column.

Include flag with each download to indicate if its allowed to proceed
over metered networks.  Downloads are left in WAITING_FOR_NETWORK
state, similar to how ALLOWED_NETWORK_TYPES is handled.

Also keep blocked downloads in WAITING_FOR_NETWORK state instead
of marking them as failed.

Bug: 3001465, 5734560
Change-Id: I80bb9aa9bd25ddf6f7a2472db344b6ba6878bd74

7 years agoView file downloads through DownloadsProvider.
Jeff Sharkey [Mon, 16 Apr 2012 21:29:04 +0000]
View file downloads through DownloadsProvider.

When viewing file://-style downloads, open through DownloadsProvider
so that FLAG_GRANT_READ_URI_PERMISSION works.  Add support for
OpenableColumns to support external apps probing for metadata.

Bug: 6343461
Change-Id: I630405406321ea1871c62cbcded55a4ee024ef6e

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 16 Apr 2012 14:05:58 +0000]
merge in jb-release history after reset to master

7 years agoLocking around downloads, and more dump info.
Jeff Sharkey [Fri, 13 Apr 2012 19:34:18 +0000]
Locking around downloads, and more dump info.

Bug: 4997552
Change-Id: I3c612acb5145a7638c9345a376a99958851a0891

7 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 10 Apr 2012 14:06:58 +0000]
merge in jb-release history after reset to master

7 years agoGive DownloadManager a useful user agent.
Jeff Sharkey [Fri, 6 Apr 2012 23:11:18 +0000]
Give DownloadManager a useful user agent.

Include platform version, model, and build, when available.  Matches
current logic used by Browser.

Bug: 6257336
Change-Id: I0addfd944aff13bd4ce4226bb8d6328da6b0f5d5

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 9 Apr 2012 14:06:47 +0000]
merge in jb-release history after reset to master

7 years agoMove to new NetworkPolicyManager accessor.
Jeff Sharkey [Thu, 5 Apr 2012 23:40:23 +0000]
Move to new NetworkPolicyManager accessor.

Change-Id: I21e5f6280748529bad881942f8f5534aa374ba55

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 2 Apr 2012 14:06:43 +0000]
merge in jb-release history after reset to master

7 years agoMigrate to shared MockWebServer.
Jeff Sharkey [Thu, 29 Mar 2012 20:38:24 +0000]
Migrate to shared MockWebServer.

Bug: 4726601
Change-Id: Ibe537bd5c2a092dbf974360cd454751881f7f4ea

7 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 28 Mar 2012 14:05:21 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 27 Mar 2012 18:09:36 +0000]
Import translations. DO NOT MERGE

Change-Id: If1d8435e21fcfaf8d9d742f3077333fc1d45137f

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 26 Mar 2012 14:07:07 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 23 Mar 2012 18:36:38 +0000]
Import translations. DO NOT MERGE

Change-Id: I472ad4749ceeaa967f4fd7ba2fdf2cfb5e97509a

7 years agoMerge remote-tracking branch 'goog/ics-aah-exp'
Mike Lockwood [Wed, 21 Mar 2012 23:41:45 +0000]
Merge remote-tracking branch 'goog/ics-aah-exp'

empty -s ours merge

Change-Id: I6cfeced57f7c36e771b349f65a1a3e13e199890e

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 12 Mar 2012 14:06:15 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 8 Mar 2012 19:14:18 +0000]
Import translations. DO NOT MERGE

Change-Id: I4e78ced9628cd22fb59a17749f2ac9ce75ddbf73

7 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 8 Mar 2012 15:05:21 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 7 Mar 2012 19:38:14 +0000]
Import translations. DO NOT MERGE

Change-Id: I7df2d63cc2c51b79d98b4889687a8035453d125e

7 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 7 Mar 2012 15:04:02 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 6 Mar 2012 19:20:05 +0000]
Import translations. DO NOT MERGE

Change-Id: I0ac6da326a7a4d15acc84d0301688ca2f4a6ed9a

7 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 6 Mar 2012 15:04:56 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 5 Mar 2012 20:47:43 +0000]
Import translations. DO NOT MERGE

Change-Id: I3c6cda860dbf7574608e79cc36d481d5c7f75565

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 5 Mar 2012 15:05:34 +0000]
merge in jb-release history after reset to master

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 2 Mar 2012 19:38:57 +0000]
Import translations. DO NOT MERGE

Change-Id: I7069f3d2be0bb43238df3ce3dc585f7b9a9edb53

7 years agoavoid repetition of retrying download
Hideki Hayami [Tue, 14 Feb 2012 05:19:52 +0000]
avoid repetition of retrying download

If isReadyToStart returns 'true' for STATUS_INSUFFICIENT_SPACE_ERROR,
DownloadProvider retries downloading after it gets requests from
browser to download contents.  The retrying loop won't stop until
its completion (recovering from space error), or user stops
downloading.  This retry loop impacts to network traffic, battery
consumption and packet charge.  So, change this method to return
'false' for the error in order to stop the loop.

Change-Id: Ia3466db60d86c5900842c7c28d294898ae3ff2bc

7 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 8 Feb 2012 15:03:48 +0000]
merge in jb-release history after reset to master

7 years agoam 50c85944: Match INetworkPolicyListener changes.
Jeff Sharkey [Wed, 8 Feb 2012 00:43:35 +0000]
am 50c85944: Match INetworkPolicyListener changes.

* commit '50c85944bf5e949ad5116fec9564318b3be90f24':
  Match INetworkPolicyListener changes.

7 years agoMatch INetworkPolicyListener changes.
Jeff Sharkey [Wed, 8 Feb 2012 00:23:25 +0000]
Match INetworkPolicyListener changes.

Change-Id: I78b6b0380a42b28f42334f93e0538ba7f32bc66d

7 years agoam dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:09:58 +0000]
am dc8940b5: am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release

* commit 'dc8940b538a2261e0f0dbf027362cc1c359c7cd6':

7 years agoam 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:06:14 +0000]
am 71d3ff5d: am 55231bc5: Reconcile with ics-mr1-release

* commit '71d3ff5dd317c5957f1f6b0cc877a3fceabbb445':

7 years agoam 55231bc5: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:13 +0000]
am 55231bc5: Reconcile with ics-mr1-release

* commit '55231bc588e71c23f9d6ac5a94e72e96c3825991':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:50:49 +0000]
Reconcile with ics-mr1-release

Change-Id: Ibd173b02bfba0a495cd0ec5df37154c269c87b91

7 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 31 Jan 2012 15:02:40 +0000]
merge in jb-release history after reset to master

7 years agoam 2404bcad: Import translations. DO NOT MERGE
Eric Fischer [Tue, 31 Jan 2012 00:02:18 +0000]
am 2404bcad: Import translations. DO NOT MERGE

* commit '2404bcadf297cb87254a27982f374bb86b1c74cf':
  Import translations. DO NOT MERGE

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Jan 2012 23:01:06 +0000]
Import translations. DO NOT MERGE

Change-Id: I28f97070ecefc2538afa0ab4eddad99628b60286

7 years agoam 515cf53e: Move away from deprecated NetworkInfo extra.
Jeff Sharkey [Mon, 30 Jan 2012 19:53:32 +0000]
am 515cf53e: Move away from deprecated NetworkInfo extra.

* commit '515cf53eb94b8873aa6a1edcd6a962f0b0ca2170':
  Move away from deprecated NetworkInfo extra.

7 years agoMove away from deprecated NetworkInfo extra.
Jeff Sharkey [Mon, 30 Jan 2012 19:16:44 +0000]
Move away from deprecated NetworkInfo extra.

Because the NetworkInfo included in CONNECTIVITY_ACTION broadcast
extra does not reflect the state applicable to the calling UID, and
the last sticky broadcast may have stale state, transition to calling
ConnectivityManager.getActiveNetworkInfo() directly.

Change-Id: Ie7a143e621e5a3a013ec6d8b8613709e7787dc0c

7 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 30 Jan 2012 15:04:03 +0000]
merge in jb-release history after reset to master

7 years agoam b1a4b7d4: Import translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:00:51 +0000]
am b1a4b7d4: Import translations. DO NOT MERGE

* commit 'b1a4b7d41bcc5c89e1123ff0b031efe45512519f':
  Import translations. DO NOT MERGE

7 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 21:57:07 +0000]
Import translations. DO NOT MERGE

Change-Id: If9cd930e2e9c04bc1a3120992811f0b0e88a927a

7 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 26 Jan 2012 00:14:49 +0000]
merge in jb-release history after reset to master

7 years agoam ac71f70c: Update DownloadProvider for new Intent.normalizeMimeType() API.
Nick Pelly [Wed, 25 Jan 2012 21:28:37 +0000]
am ac71f70c: Update DownloadProvider for new Intent.normalizeMimeType() API.

* commit 'ac71f70c31f38d5f99e5d3bb06ea08cdf107b948':
  Update DownloadProvider for new Intent.normalizeMimeType() API.

7 years agoUpdate DownloadProvider for new Intent.normalizeMimeType() API.
Nick Pelly [Mon, 9 Jan 2012 22:11:53 +0000]
Update DownloadProvider for new Intent.normalizeMimeType() API.

Change-Id: Ideeb8cbeaa4b4d82d7c9fc8197a35bf3541a22d7

7 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 9 Jan 2012 15:01:16 +0000]
merge in ics-release history after reset to master

7 years agoam ca11088a: am 3ddc6cc0: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 08:42:17 +0000]
am ca11088a: am 3ddc6cc0: Reconcile with ics-mr1-release

* commit 'ca11088a57d3066408fb35d30551a0fc743a17a3':

7 years agoam 3ddc6cc0: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:18:41 +0000]
am 3ddc6cc0: Reconcile with ics-mr1-release

* commit '3ddc6cc0e16136d863df51a8e0e36b0558dcde62':

7 years agoReconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:15:49 +0000]
Reconcile with ics-mr1-release

Change-Id: Ia5f0f8633b530dd4f551be4776206639b926fc18

7 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 7 Jan 2012 00:32:55 +0000]
merge in ics-mr1-release history after reset to ics-mr1

7 years agoam 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restriction...
Jeff Sharkey [Fri, 6 Jan 2012 22:28:47 +0000]
am 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restriction set.

* commit '23bb4b4fb4076d09959b35f3e1247941ef7066c2':
  Allow downloads when no network restriction set.

7 years agoam 380044a2: am f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:25:59 +0000]
am 380044a2: am f720bc68: Allow downloads when no network restriction set.

* commit '380044a236ffba16a800cb683fa648860dcfd573':
  Allow downloads when no network restriction set.

7 years agoam f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:23:28 +0000]
am f720bc68: Allow downloads when no network restriction set.

* commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433':
  Allow downloads when no network restriction set.

7 years agoam f720bc68: Allow downloads when no network restriction set.
Jeff Sharkey [Fri, 6 Jan 2012 22:22:58 +0000]
am f720bc68: Allow downloads when no network restriction set.

* commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433':
  Allow downloads when no network restriction set.

7 years agoAllow downloads when no network restriction set.
Jeff Sharkey [Thu, 5 Jan 2012 22:37:51 +0000]
Allow downloads when no network restriction set.

Fixes bug where DownloadManager would block downloads on WiMAX,
bluetooth, and ethernet networks, even when no network restrictions
had been set.

Bug: 5689335
Change-Id: I6d1bb78cbccb3c5eb1fce40a13b0689be0c3fa13

7 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 2 Jan 2012 15:00:56 +0000]
merge in ics-release history after reset to master

7 years agoam b1d7241f: Import revised translations.
Eric Fischer [Thu, 29 Dec 2011 23:09:18 +0000]
am b1d7241f: Import revised translations.

* commit 'b1d7241fb2f193350901c8f23b94d32800857837':
  Import revised translations.

7 years agoImport revised translations.
Eric Fischer [Thu, 29 Dec 2011 21:58:19 +0000]
Import revised translations.

Change-Id: Ic00709623c5be406b3f83000ff821860af754b71