summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Update the "Android Performance" documentation.Elliott Hughes2010-02-191-241/+142
| | | | | | | | | | | | | | | A lot of this documentation isn't even true of the G1, let alone Froyo running on a Nexus One. Distinguish between truth and fiction, clarify where the JIT affects things, and clarify certain confusions (such as the difference between intrinsics and native methods). I still need to include updated performance numbers in the final section. I should also make the benchmark code available so that people don't have to take our word for these things, and so it's easier for them to get an idea of the performance of future devices and builds. (Though hopefully we can update this every release in future.) Anyway, just removing the untruths is a big step forward.
* am de7b14f9: am 19bc31c3: Merge "docs: remove old tutorial and sample pages ↵Scott Main2010-02-121-128/+0
|\ | | | | | | | | | | | | | | | | from the sitemap" into eclair Merge commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9' * commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9': docs: remove old tutorial and sample pages from the sitemap
| * am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the ↵Scott Main2010-02-121-128/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | sitemap" into eclair Merge commit '19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp * commit '19bc31c32d75ebebacd85cac2cf4c31108329613': docs: remove old tutorial and sample pages from the sitemap
| | * Merge "docs: remove old tutorial and sample pages from the sitemap" into eclairScott Main2010-02-121-128/+0
| | |\
| | | * docs: remove old tutorial and sample pages from the sitemapScott Main2010-02-121-128/+0
| | | |
* | | | am 87bdfd6d: am d74bf162: Merge "Repackage samples zip with ↵Dirk Dougherty2010-02-101-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleSyncAdapter and CubeLiveWallpaper." into eclair Merge commit '87bdfd6d22ee964339791bb65686a718d207793b' * commit '87bdfd6d22ee964339791bb65686a718d207793b': Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
| * | | am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and ↵Dirk Dougherty2010-02-101-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | CubeLiveWallpaper." into eclair Merge commit 'd74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp * commit 'd74bf1623913bade8f58369f39ebc666d551bb57': Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
| | * | Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." ↵Dirk Dougherty2010-02-101-0/+0
| | |\ \ | | | | | | | | | | | | | | | into eclair
| | | * | Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.Dirk Dougherty2010-02-091-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I63f881739352d91d296c5c07432eeda74b22000a
* | | | | am e524ff53: am 859f4556: Merge "Add generated html docs for ↵Dirk Dougherty2010-02-097-15/+124
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair Merge commit 'e524ff534e1aabc45819e978c26bf61d9b71f444' * commit 'e524ff534e1aabc45819e978c26bf61d9b71f444': Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
| * | | | am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and ↵Dirk Dougherty2010-02-097-15/+124
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CubeLiveWallpaper. Add article for live wallpaper." into eclair Merge commit '859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp * commit '859f455645bc49e32330108b1ea9f85ffb80a2cd': Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
| | * | | Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add ↵Dirk Dougherty2010-02-097-15/+124
| | |/ / | | | | | | | | | | | | | | | | | | | | article for live wallpaper. Change-Id: Idbeda9a677c9772a8348146fe028083d9887a9d2
| * | | 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
* | | | Merge commit '2f7b69aa' into manualmergeScott Main2010-02-031-89/+302
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: docs/html/guide/topics/ui/themes.jd
| * | | 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 b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into ↵Megha Joshi2010-02-033-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0' * commit 'b299f802b2dea19b003a6724d53ecff1b763bab0': Screenshots for sample syncadapter.
| * | | 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 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info ↵Scott Main2010-01-291-20/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | about page and line numbering in the log." into eclair Merge commit '1076ea0abe3cace6629063d63ee1242a5a7588a2' * commit '1076ea0abe3cace6629063d63ee1242a5a7588a2': docs: update web page debugging with info about page and line
| * | | 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 b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion ↵Dirk Dougherty2010-01-283-27/+88
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description, add live_wallpaper feature, indicate market filtering on features." into eclair Merge commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a' * commit 'b574cf876e64d8a9330b052d48dcc64c5abdd70a': SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
| * | | | 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 67a65856: am 965f4a6b: Merge "doc change only: Update announcement and ↵Dirk Dougherty2010-01-282-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mwc redirect to point to microsite." into eclair Merge commit '67a658567a6bad898c097e615f8efcb3c91fa50d' * commit '67a658567a6bad898c097e615f8efcb3c91fa50d': doc change only: Update announcement and mwc redirect to point to microsite.
| * | | | 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 9985feca: am d243bc71: Merge "docs: reference the history JS file with ↵Scott Main2010-01-281-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair Merge commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174' * commit '9985fecaa0bf32e94695f49bb495c9d0cd41e174': docs: reference the history JS file with docRoot in order to
| * | | | 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 99988b6e: am 84207956: Merge "SDK doc change: Misc small fixes." into eclairDirk Dougherty2010-01-281-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a' * commit '99988b6ee6c18b3e12f73635467e1fb4ee9aa43a': SDK doc change: Misc small fixes.
| * | | | 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 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" ↵Dirk Dougherty2010-01-281-4/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround for connection problems in SDK Manager." into eclair Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8' * commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8': SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
| * | | | | 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 97ca28cd: am 5d14cb34: Merge "doc change: add announce for developer lab ↵Dirk Dougherty2010-01-282-7/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at mwc. move adc to carousel." into eclair Merge commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9' * commit '97ca28cdd9b12e1c9e9ae57967010b60e61d6bf9': doc change: add announce for developer lab at mwc. move adc to carousel.
| * | | | | 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