summaryrefslogtreecommitdiffstats
path: root/docs/html
Commit message (Collapse)AuthorAgeFilesLines
* am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: ↵Katie McCormick2010-02-031-1/+1
|\ | | | | | | | | | | | | | | | | 1993220" into eclair Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp * commit '8a6c060719c8870f370b82faa48ae2f437915214': SDK doc change: Fixed typo--fingure->finger
| * Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclairKatie McCormick2010-02-031-1/+1
| |\
| | * SDK doc change: Fixed typo--fingure->fingerKatie McCormick2010-02-031-1/+1
| | | | | | | | | | | | Bug: 1993220
* | | am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve ↵Scott Main2010-02-031-89/+302
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | the clarity of the concepts and expand the available information" into eclair Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp * commit '98a9fc0a0025a3df7b36f7752fc330eba8810603': docs: revise the Style and Themes document to improve the
| * | Merge "docs: revise the Style and Themes document to improve the clarity of ↵Scott Main2010-02-031-89/+302
| |\ \ | | | | | | | | | | | | the concepts and expand the available information" into eclair
| | * | docs: revise the Style and Themes document to improve theScott Main2010-02-031-89/+302
| | |/ | | | | | | | | | clarity of the concepts and expand the available information
* | | am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclairMegha Joshi2010-02-033-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp * commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434': Screenshots for sample syncadapter.
| * | Merge "Screenshots for sample syncadapter." into eclairMegha Joshi2010-02-033-0/+0
| |\ \ | | |/ | |/|
| | * Screenshots for sample syncadapter.Megha Joshi2010-02-033-0/+0
| | |
* | | am 9800adf2: Merge "docs: update web page debugging with info about page and ↵Scott Main2010-01-291-20/+30
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | line numbering in the log." into eclair Merge commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8' into eclair-plus-aosp * commit '9800adf2a4d78d1e3e44dbef6aecf2b2b738c9c8': docs: update web page debugging with info about page and line
| * | Merge "docs: update web page debugging with info about page and line ↵Scott Main2010-01-291-20/+30
| |\ \ | | | | | | | | | | | | numbering in the log." into eclair
| | * | docs: update web page debugging with info about page and lineScott Main2010-01-291-20/+30
| | | | | | | | | | | | | | | | numbering in the log.
* | | | am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add ↵Dirk Dougherty2010-01-283-27/+88
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | live_wallpaper feature, indicate market filtering on features." into eclair Merge commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e' into eclair-plus-aosp * commit '7b00a8ae71c5964cb96e1663b778658eaa069b3e': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
| * | | SDK doc change: fix android:glEsVersion description, add live_wallpaper ↵Dirk Dougherty2010-01-283-27/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | feature, indicate market filtering on features. Bug: 2160782 Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
* | | | am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to ↵Dirk Dougherty2010-01-262-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | point to microsite." into eclair Merge commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef' into eclair-plus-aosp * commit '965f4a6b4b5f3dd71e70f427af0c8a902e5880ef': doc change only: Update announcement and mwc redirect to point to microsite.
| * | | Merge "doc change only: Update announcement and mwc redirect to point to ↵Dirk Dougherty2010-01-262-2/+2
| |\ \ \ | | |_|/ | |/| | | | | | microsite." into eclair
| | * | doc change only: Update announcement and mwc redirect to point to microsite.Dirk Dougherty2010-01-262-2/+2
| | | | | | | | | | | | | | | | Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
* | | | am d243bc71: Merge "docs: reference the history JS file with docRoot in ↵Scott Main2010-01-251-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair Merge commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp * commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e': docs: reference the history JS file with docRoot in order to
| * | | Merge "docs: reference the history JS file with docRoot in order to make ↵Scott Main2010-01-251-1/+1
| |\ \ \ | | |/ / | |/| | | | | | offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
| | * | docs: reference the history JS file with docRoot in order toScott Main2010-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300
* | | | am 84207956: Merge "SDK doc change: Misc small fixes." into eclairDirk Dougherty2010-01-221-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp * commit '8420795633443221627eb872aea8f2862a38f8b1': SDK doc change: Misc small fixes.
| * | | Merge "SDK doc change: Misc small fixes." into eclairDirk Dougherty2010-01-221-5/+5
| |\ \ \
| | * | | SDK doc change: Misc small fixes.Dirk Dougherty2010-01-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug:2160782 Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
* | | | | am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for ↵Dirk Dougherty2010-01-221-4/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection problems in SDK Manager." into eclair Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp * commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a': SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
| * | | | Merge "SDK doc change: Add "fetch by http" workaround for connection ↵Dirk Dougherty2010-01-221-4/+15
| |\ \ \ \ | | |/ / / | |/| | | | | | | | problems in SDK Manager." into eclair
| | * | | SDK doc change: Add "fetch by http" workaround for connection problems in ↵Dirk Dougherty2010-01-221-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDK Manager. Bug: 2160782 Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
* | | | | am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move ↵Dirk Dougherty2010-01-222-7/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adc to carousel." into eclair Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp * commit '5d14cb34c0e9760340c15ac5faf2d76a64797117': doc change: add announce for developer lab at mwc. move adc to carousel.
| * | | | Merge "doc change: add announce for developer lab at mwc. move adc to ↵Dirk Dougherty2010-01-222-7/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | carousel." into eclair
| | * | | | doc change: add announce for developer lab at mwc. move adc to carousel.Dirk Dougherty2010-01-222-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2160782 Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
* | | | | | am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."Xavier Ducrohet2010-01-202-396/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp * commit 'd1da5fa2da9690be94929e391a4e66b9986573bc': Revert "SDK doc change: Add doc update for NDKr3."
| * | | | | Revert "SDK doc change: Add doc update for NDKr3."Xavier Ducrohet2010-01-202-396/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1dced50963312c5d340cbd129d0017d9cbb45f0b.
* | | | | | am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclairXavier Ducrohet2010-01-202-1/+396
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp * commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d': SDK doc change: Add doc update for NDKr3.
| * | | | | Merge "SDK doc change: Add doc update for NDKr3." into eclairXavier Ducrohet2010-01-202-1/+396
| |\ \ \ \ \
| | * | | | | SDK doc change: Add doc update for NDKr3.Dirk Dougherty2010-01-112-1/+396
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2160782 Change-Id: I20bd2b84bdab27b03c3544d8eecab2404eeb2c1c
* | | | | | | am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools ↵Scott Main2010-01-201-7/+19
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app from the emulator to a device." into eclair Merge commit '2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp * commit '2a79defa5a0481e4dd980938da13adc767e0b231': docs: add guide to copying and installing the Dev Tools app
| * | | | | | Merge "docs: add guide to copying and installing the Dev Tools app from the ↵Scott Main2010-01-201-7/+19
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | emulator to a device." into eclair
| | * | | | docs: add guide to copying and installing the Dev Tools appScott Main2010-01-201-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | from the emulator to a device.
* | | | | | am 5615ca19: docs: a lot of revision and expansion of the hello view ↵Scott Main2010-01-1927-973/+1537
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tutorials includes new screenshots for some tutorials and a new sample images zip file Merge commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp * commit '5615ca1979caa79041bf16a2cae49f9cfadd7ee5': docs: a lot of revision and expansion of the hello view tutorials
| * | | | | docs: a lot of revision and expansion of the hello view tutorialsScott Main2010-01-1927-973/+1537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes new screenshots for some tutorials and a new sample images zip file Bug:2338253
* | | | | | am de54a95b: Merge "docs: add a section about debugging web pages with the ↵Scott Main2010-01-191-108/+173
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Console APIs; revise and cleanup some of the other content." into eclair Merge commit 'de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp * commit 'de54a95b98b9d80c10ca2788b83386094222cb4f': docs: add a section about debugging web pages with the Console APIs;
| * | | | | Merge "docs: add a section about debugging web pages with the Console APIs; ↵Scott Main2010-01-191-108/+173
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | revise and cleanup some of the other content." into eclair
| | * | | docs: add a section about debugging web pages with the Console APIs;Scott Main2010-01-191-108/+173
| | | |/ | | |/| | | | | | | | | | | | | | | | | revise and cleanup some of the other content. Bug: 2353529
* | | | am 88e653f6: Merge "docs: some spelling typos" into eclairScott Main2010-01-191-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp * commit '88e653f6653aeb237631681f6700f0e572779617': docs: some spelling typos
| * | | Merge "docs: some spelling typos" into eclairScott Main2010-01-191-4/+4
| |\ \ \
| | * | | docs: some spelling typosScott Main2010-01-191-4/+4
| | |/ /
* | | | am 6a739ea8: Merge "Updated developer groups documentation to point to Stack ↵Roman Nurik2010-01-142-74/+67
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overflow, also rearranged a few things." into eclair Merge commit '6a739ea88d33f901172d60b0de0f442f2dc485cc' into eclair-plus-aosp * commit '6a739ea88d33f901172d60b0de0f442f2dc485cc': Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
| * | | Merge "Updated developer groups documentation to point to Stack Overflow, ↵Roman Nurik2010-01-142-74/+67
| |\ \ \ | | | | | | | | | | | | | | | also rearranged a few things." into eclair
| | * | | Updated developer groups documentation to point to Stack Overflow, also ↵Roman Nurik2010-01-142-74/+67
| | |/ / | | | | | | | | | | | | rearranged a few things.
* | | | am 0409b1ba: Merge "docs: remove dev guide link from download confirmation ↵Scott Main2010-01-141-4/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair Merge commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb' into eclair-plus-aosp * commit '0409b1baaaebfe5deadfd43559e5d63b1d6e5fcb': docs: remove dev guide link from download confirmation content
| * | | docs: remove dev guide link from download confirmation contentScott Main2010-01-141-4/+2
| |/ / | | | | | | | | | | | | so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334