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
Dirk Dougherty
4aede1af71
am 301431d9: Doc change: Final diff report for API 11.
...
* commit '301431d96e85e37d1dc2dd0df88f894dda0f5404':
Doc change: Final diff report for API 11.
2011-02-19 18:07:20 -08:00
Dirk Dougherty
301431d96e
Doc change: Final diff report for API 11.
...
Change-Id: Id7a6907a4f765fe753c2b134bfbd29a5792cc9ed
2011-02-19 17:55:57 -08:00
Scott Main
b5d35088cb
resolved conflicts for merge of b842629c to honeycomb-plus-aosp
...
Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6
2011-02-18 19:42:29 -08:00
Scott Main
b842629c02
docs: update sizes and sums for tools and ndk
...
Change-Id: Id7c72a89dc50461a7883b599dcd7a08738049dee
2011-02-18 17:02:10 -08:00
Scott Main
483f7130b5
am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
...
* commit 'e4da39345209c47b2736f266adfc22a0fdb4c716':
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
2011-02-18 15:11:14 -08:00
Scott Main
e4da393452
Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb
2011-02-18 15:08:26 -08:00
Scott Main
55d3fc1bd5
am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
...
* commit '163413f4360af8a8b010fa69a131fb0177df96a7':
docs: update getting started doc for 3.0; move out of preview docs
2011-02-18 10:40:59 -08:00
Scott Main
163413f436
Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb
2011-02-18 10:26:41 -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
Romain Guy
7118bdec52
Merge "Fix for #12945 : ProgressBar.setMax() will always redraw."
2011-02-17 22:40:33 -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
Robert Ly
d2acfd6d04
am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb
...
* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
Doc change: fixing renderscript samples
2011-02-17 20:21:35 -08:00
Scott Main
aa680857e6
am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
...
* commit '0ddd2d1ea7cda544efc4d25601e1cdc0236e44d8':
DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC
2011-02-17 20:21:24 -08:00
Robert Ly
a58f58daf9
Merge "Doc change: fixing renderscript samples" into honeycomb
2011-02-17 18:53:36 -08:00
Scott Main
adaf5a7097
docs: update getting started doc for 3.0; move out of preview docs
...
Change-Id: Ibf6f001eca76ebff2f3be1f38691dbd33220a33e
2011-02-17 18:49:10 -08:00
Robert Ly
6518f486a5
Doc change: fixing renderscript samples
...
Change-Id: Ie5d17df121ec4bc5fd46448c1670d306322b92d8
2011-02-17 18:44:31 -08:00
Scott Main
0ddd2d1ea7
DO NOT MERGE
...
Delete unused/broken samples and tests from the renderscript libs,
so we can publish the entire contents of libs/rs/java/ for samples in HC
Change-Id: I0428074e995d7ee282520f54a9a3c81e32bff027
2011-02-17 16:09:25 -08:00
Joe Malin
831a089272
am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library
...
* commit 'e766fcd5e967c2400a1fe90a4a01e4f0a12dbd1d':
DOC CHANGE: Bug 3396898 add attribute uses-library
2011-02-17 13:18:30 -08:00
Joe Malin
e766fcd5e9
DOC CHANGE: Bug 3396898 add attribute uses-library
...
Change-Id: I21810676050abed04c0c69b61c05d8d7228f434d
2011-02-17 13:08:11 -08:00
Andreas Huber
09b18c2f1d
am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
...
* commit '79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:28:01 -08:00
Andreas Huber
79a9748949
am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
...
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:24:53 -08:00
Andreas Huber
dbe09da6ac
DO NOT MERGE: Respond to RTSP server->client requests.
...
Even if it's just to tell them that we don't support any (this is optional).
Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655
related-to-bug: 3353752
2011-02-16 13:37:19 -08:00
Scott Main
869f1f3e90
am 0643d7c4: docs: add new tag for tasks doc
...
* commit '0643d7c442f975efa35c9e3729d74555627a32b5':
docs: add new tag for tasks doc
2011-02-16 12:41:53 -08:00
Scott Main
0643d7c442
docs: add new tag for tasks doc
...
Change-Id: I60248fb9ec1d98e89b526391c453d1bde9226cb0
2011-02-16 12:38:59 -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
Scott Main
153cebee24
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
...
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
2011-02-16 12:08:36 -08:00
Scott Main
f722cecd18
Merge "docs: update homepage for 3.0 announcement" into honeycomb
2011-02-16 11:58:40 -08:00
Scott Main
7fbeaf9286
docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools
...
Change-Id: I6021cd0eb9d37a004036249305819a352efa4f92
2011-02-16 11:55:10 -08:00
Robert Greenwalt
271397cfb2
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:55:54 -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
Robert Greenwalt
de27b51958
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
...
* commit '3259d8853760a72b811757e1711119d041962a1c':
DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:51:04 -08:00
Robert Greenwalt
3259d88537
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
2011-02-16 10:44:26 -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
Eric Fischer
874ae43ce1
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-16 10:33:18 -08:00
Alon Albert
2d314d1282
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
...
* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:26:53 -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
Scott Main
415ef50d90
am 796ce77a: docs: add breadcrumbs to articles and tutorials
...
* commit '796ce77abf3d1d006576490c286e72ebf0736280':
docs: add breadcrumbs to articles and tutorials
2011-02-16 10:23:05 -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
Scott Main
796ce77abf
docs: add breadcrumbs to articles and tutorials
...
Change-Id: If49368853e95d39bbe6b42c6fc3820a8a7319048
2011-02-16 10:04:45 -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
Scott Main
9fb2b13600
am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
...
* commit 'f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
docs: edit doc titles to match side nav and add breadcrumb links
2011-02-16 09:21:06 -08:00