Alon Albert
a0946d6399
am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
...
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
Support quoted parameters
2011-02-22 21:23:50 -08:00
Alon Albert
1aba843dc3
am ccc802e1: Merge "Support quoted parameters" into gingerbread
...
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
Support quoted parameters
2011-02-22 21:18:52 -08:00
Romain Guy
e5410aa165
am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit 'ad492161e4384efe11daec60cd14902f6b2c662a':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-22 14:48:21 -08:00
Alon Albert
ccc802e12b
Merge "Support quoted parameters" into gingerbread
2011-02-22 10:31:26 -08:00
Maarten Hooft
62f40c8bcf
am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '99cca89f41e500f8b39fd75eb17f337422c4ac90':
Import revised translations. DO NOT MERGE
2011-02-18 15:22:48 -08:00
Alon Albert
06912bddc6
Support quoted parameters
...
iCalendar RFC http://www.ietf.org/rfc/rfc2445.txt says:
4.1.1 List and Field Separators
Property parameters with values containing a COLON, a SEMICOLON or a
COMMA character MUST be placed in quoted text.
So we must be able to support this.
Bug: 3463510
Change-Id: Ie0463fdc2d5cbc340801cc8cc5b4f00e374f2954
2011-02-18 09:40:44 -08:00
Romain Guy
ad492161e4
am a2090bea: am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit 'a2090bea4824cf153c4d9c735ee779613cf2e3d7':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-18 08:06:01 -08:00
Romain Guy
a2090bea48
am 7118bdec: Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
...
* commit '7118bdec523568842e70555e353951df9f2596fd':
Fix for #12945 : ProgressBar.setMax() will always redraw.
2011-02-18 07:53:50 -08:00
Michael Krehan
58e3822b59
Fix for #12945 : ProgressBar.setMax() will always redraw.
...
Fix for issue #12945 : Changing the maximum of a progress bar does
not cause it to be redrawn, even though a new maximum changes the
position of the current progress in relation to its maximum. With this fix,
setMax() will always cause refreshProgress() to be called if the maximum is
different than it was before.
Change-Id: I971ec3302953bcadc0aac3dd8241481bab2b5a91
2011-02-17 20:56:29 -08:00
Maarten Hooft
99cca89f41
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-17 17:17:40 -08:00
Andy Stadler
04ddff6905
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
...
* commit 'b18350851633b1d3717f2484d27b76aa64788ce1':
@hide DPM global proxy settings
2011-02-16 12:20:36 -08:00
Andy Stadler
b183508516
Merge "@hide DPM global proxy settings" into honeycomb
2011-02-16 12:18:39 -08:00
Andy Stadler
d26727273d
@hide DPM global proxy settings
...
They don't work as advertised, so remove from SDK.
Bug: 3460938
Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
2011-02-16 10:53:33 -08:00
Eric Fischer
aebe3dfe61
am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
Import revised translations. DO NOT MERGE
2011-02-16 10:38:11 -08:00
Alon Albert
b79db4cd5c
am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
...
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:24:15 -08:00
Alon Albert
be5f82ab0d
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
2011-02-16 10:20:13 -08:00
Eric Fischer
abe92da72f
Import revised translations. DO NOT MERGE
...
Change-Id: Id7d999bfc9d422292aa81d5a8c579840e9cc1438
2011-02-16 10:18:37 -08:00
Alon Albert
c441e4e355
DO NOT MERGE - Clear backoffs on reconnect
...
Slightly modified backport from HC
Bug: 3460736
Change-Id: I155dfd34bb7abb76a10b5b58fe9a32af2449d4f1
2011-02-16 10:16:33 -08:00
daniel_tomas
54f9be2a26
am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
...
* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:43:08 -08:00
daniel_tomas
99e267ebcf
am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
...
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:41:00 -08:00
daniel_tomas
7bcd2c62eb
New API added in NfcAdapter to enable/disable SE card emulation
...
Change-Id: Ia0c123873ba9265b45e847d1a30c1300de3c1346
2011-02-16 09:27:25 -08:00
Nick Pelly
d8d51fed86
am 8c8e9d9a: am 1df862a4: Minor doc update.
...
* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
Minor doc update.
2011-02-16 09:25:09 -08:00
Nick Pelly
8c8e9d9a7f
am 1df862a4: Minor doc update.
...
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
Minor doc update.
2011-02-16 09:23:08 -08:00
Nick Pelly
1df862a465
Minor doc update.
...
Change-Id: I1d29adfccbdc196a145a2c2a044d63b00e5f788b
2011-02-16 09:18:34 -08:00
Robert Ly
e131ccb615
am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
...
* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
Adding package summary for nfc.tech package
2011-02-15 22:58:51 -08:00
Robert Ly
c3ebf27a51
am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
...
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
Adding package summary for nfc.tech package
2011-02-15 22:54:52 -08:00
Scott Main
0ab1b326c7
am 13033ea5: docs: fix misc broken links
...
* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
docs: fix misc broken links
2011-02-15 20:08:07 -08:00
Robert Ly
2deeefeb5e
Adding package summary for nfc.tech package
...
Change-Id: Ibbf55c21dcaf48b4eb369e78c54fb1023abb3cb3
2011-02-15 17:41:47 -08:00
Scott Main
13033ea527
docs: fix misc broken links
...
Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6
2011-02-15 16:00:37 -08:00
Eric Fischer
3537011651
Import revised translations. DO NOT MERGE
...
Change-Id: If134b2db7449d3646541fc83e8973938926fb481
2011-02-14 17:21:02 -08:00
Jeff Hamilton
9e5ffb55e8
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
2011-02-10 13:52:48 -08:00
Nick Pelly
cc47600d4d
am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
2011-02-10 13:52:34 -08:00
Jeff Hamilton
510ced64f4
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
Improve the docs a bit for foreground dispatch.
2011-02-10 13:52:23 -08:00
Nick Pelly
a8d3f02aaa
DO NOT MERGE
...
Reconcile documentation updates from gingerbread to honeycomb.
Change-Id: I8c199906beb5cd3c290ded123d6aefd0d1697f30
2011-02-09 23:43:24 -08:00
Gilles Debunne
8e28ab22de
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Gilles Debunne
2050de5b9a
Text selection is broken.
...
Bug 3439569
Lazy initialization code was not back-ported.
Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
2011-02-09 14:17:22 -08:00
Eric Fischer
c3e3cc3dee
am ebcbde6a: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'ebcbde6a6e5a8da947a3f28eba7207256b891fdd':
Import revised translations. DO NOT MERGE
2011-02-09 10:47:47 -08:00
Jeff Hamilton
c1cc9ba6d1
am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
More documentation updates for NFC.
2011-02-09 00:36:53 -08:00
Jeff Hamilton
58c9d4726e
Merge "More documentation updates for NFC." into gingerbread
2011-02-09 00:34:22 -08:00
Jeff Hamilton
28319c0cec
More documentation updates for NFC.
...
Change-Id: Ie134d4296ee12333e6647ce76126f9767ba1ba34
2011-02-09 17:26:47 +09:00
Nick Pelly
47dac545da
am 39cf3a44: Document NFC permissions.
...
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
Document NFC permissions.
2011-02-08 23:25:29 -08:00
Nick Pelly
39cf3a445e
Document NFC permissions.
...
Change-Id: Ib1b1625058c9c673692f3fbcb3546ec7c2d54a07
2011-02-09 16:10:46 +09:00
Jeff Hamilton
1ac35411f1
am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
...
* commit '584afa8dde1777b181e773a491416769f25607a8':
Improve the docs a bit for foreground dispatch.
2011-02-08 19:33:53 -08:00
Jeff Hamilton
584afa8dde
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
2011-02-08 19:30:47 -08:00
Jeff Hamilton
167d9e473f
Improve the docs a bit for foreground dispatch.
...
Change-Id: I4179133a0956bc66a49201c20f1dd2d6d67874d2
2011-02-09 12:30:18 +09:00
Eric Fischer
b8a036307a
Import revised translations. DO NOT MERGE
...
Change-Id: I989585acd6f901a82e8db9b07257af5a5736989e
2011-02-08 18:00:38 -08:00
Eric Fischer
c1c3143347
am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
Import revised translations. DO NOT MERGE
2011-02-08 17:32:18 -08:00
Gilles Debunne
63bd55c7bf
am cdfe8999: Fix for multiple merge problem.
...
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Gilles Debunne
e04c14962f
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
...
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Scott Main
3c5653773d
am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
...
* commit 'b508d6e26e3a1fd68bf637dc29df335f0e7ccd92':
docs: fix links to revised fundamentals documents
2011-02-08 14:57:45 -08:00