drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,023 Commits 1 Branch 0 Tags
Commit Graph

937 Commits

Author SHA1 Message Date
Scott Main
dae34fa8a1 am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'

* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
  docs: some spelling typos
 2010-01-22 09:43:56 -08:00
Roman Nurik
eca7f02f52 am b8c564d0: am 6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 
Merge commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef'

* commit 'b8c564d0fc7b2bdcc794d63f23b21df2540d7cef':
  Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
 2010-01-21 14:29:26 -08:00
Xavier Ducrohet
48edf7c002 am d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3." 
Merge commit 'd1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp

* commit 'd1da5fa2da9690be94929e391a4e66b9986573bc':
  Revert "SDK doc change: Add doc update for NDKr3."
 2010-01-20 17:54:12 -08:00
Xavier Ducrohet
d1da5fa2da Revert "SDK doc change: Add doc update for NDKr3." 
This reverts commit 1dced50963312c5d340cbd129d0017d9cbb45f0b.
 2010-01-20 17:45:18 -08:00
Xavier Ducrohet
a0ecd4fbe6 am 38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair 
Merge commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp

* commit '38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d':
  SDK doc change: Add doc update for NDKr3.
 2010-01-20 17:33:49 -08:00
Xavier Ducrohet
38f7a02a9b Merge "SDK doc change: Add doc update for NDKr3." into eclair 2010-01-20 17:30:27 -08:00
Scott Main
bfb8606831 am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools 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
 2010-01-20 17:15:09 -08:00
Scott Main
2a79defa5a Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 2010-01-20 17:10:25 -08:00
Scott Main
2c9d7fe21a docs: add guide to copying and installing the Dev Tools app 
from the emulator to a device.
 2010-01-20 16:58:46 -08:00
Scott Main
382f924c95 am 5615ca19: docs: a lot of revision and expansion of the hello view 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
 2010-01-19 19:59:24 -08:00
Scott Main
5ed681561c am de54a95b: Merge "docs: add a section about debugging web pages with the 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;
 2010-01-19 19:59:13 -08:00
Scott Main
5615ca1979 docs: a lot of revision and expansion of the hello view tutorials 
includes new screenshots for some tutorials and a new sample images
zip file

Bug:2338253
 2010-01-19 19:46:02 -08:00
Scott Main
290cd9ab8b am 7cc57ff2: am 0409b1ba: Merge "docs: remove dev guide link from download confirmation content so we only link to the install guide and re-affirm the system reqs bug: 2374363,2374334" into eclair 
Merge commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea'

* commit '7cc57ff22d23daa62e07e0f3d28010d75ed19eea':
  docs: remove dev guide link from download confirmation content
 2010-01-19 16:35:10 -08:00
Scott Main
de54a95b98 Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 2010-01-19 16:18:52 -08:00
Scott Main
6261d879e7 docs: add a section about debugging web pages with the Console APIs; 
revise and cleanup some of the other content.

Bug: 2353529
 2010-01-19 15:45:59 -08:00
Scott Main
d603e989f4 am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit '88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp

* commit '88e653f6653aeb237631681f6700f0e572779617':
  docs: some spelling typos
 2010-01-19 11:21:58 -08:00
Scott Main
88e653f665 Merge "docs: some spelling typos" into eclair 2010-01-19 11:18:39 -08:00
Scott Main
13244e52eb docs: some spelling typos 2010-01-19 11:12:07 -08:00
Roman Nurik
b8c564d0fc am 6a739ea8: Merge "Updated developer groups documentation to point to Stack 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.
 2010-01-14 17:20:09 -08:00
Roman Nurik
6a739ea88d Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair 2010-01-14 17:18:31 -08:00
Roman Nurik
9960078332 Updated developer groups documentation to point to Stack Overflow, also rearranged a few things. 2010-01-14 16:07:35 -08:00
Scott Main
7cc57ff22d am 0409b1ba: Merge "docs: remove dev guide link from download confirmation 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
 2010-01-14 13:05:46 -08:00
Scott Main
baf08994b9 docs: remove dev guide link from download confirmation content 
so we only link to the install guide and re-affirm the system reqs
bug: 2374363,2374334
 2010-01-14 12:09:08 -08:00
Trevor Johns
9cebb377c5 am 18dedf2c: am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a'

* commit '18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:08:15 -08:00
Trevor Johns
18dedf2cdf am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
 2010-01-11 14:05:55 -08:00
Trevor Johns
50a3977c61 Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair 2010-01-11 14:00:54 -08:00
Dirk Dougherty
88098683b0 am 6b113b1a: am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'

* commit '6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 13:50:42 -08:00
Trevor Johns
2187e240c0 Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com. 2010-01-11 11:56:27 -08:00
Dirk Dougherty
6b113b1a82 am 595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair 
Merge commit '595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp

* commit '595f48b2a4fa2751ad638b60d2476e77738b21da':
  SDK doc change: Miscellaneous fixes.
 2010-01-11 11:38:04 -08:00
Dirk Dougherty
595f48b2a4 Merge "SDK doc change: Miscellaneous fixes." into eclair 2010-01-11 11:33:57 -08:00
Dirk Dougherty
cf6bbab6db SDK doc change: Miscellaneous fixes. 
Bug: 2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
 2010-01-11 11:15:22 -08:00
Dirk Dougherty
1dced50963 SDK doc change: Add doc update for NDKr3. 
Bug: 2160782
Change-Id: I20bd2b84bdab27b03c3544d8eecab2404eeb2c1c
 2010-01-11 09:33:00 -08:00
Trevor Johns
7f9ea43fae am f6de904a: am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs. 
Merge commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019'

* commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019':
  Converting tabs to spaces in docs/html/resources/resources_toc.cs.
 2010-01-07 19:02:03 -08:00
Trevor Johns
f6de904a3c am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs. 
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp

* commit '063d03ed0882582840c7db610635aa89c1a01eec':
  Converting tabs to spaces in docs/html/resources/resources_toc.cs.
 2010-01-07 18:58:35 -08:00
Trevor Johns
063d03ed08 Converting tabs to spaces in docs/html/resources/resources_toc.cs. 2010-01-07 15:44:33 -08:00
Dirk Dougherty
1c819a5e3e am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair 
Merge commit '5f6002ec5f52ed164b591cf4b267fe771a81731f'

* commit '5f6002ec5f52ed164b591cf4b267fe771a81731f':
  SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
 2010-01-07 12:37:15 -08:00
Dirk Dougherty
5f6002ec5f am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair 
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp

* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
  SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
 2010-01-07 12:33:48 -08:00
Dirk Dougherty
d71c2aa1a3 Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair 2010-01-07 12:30:14 -08:00
Dirk Dougherty
4e7db25687 SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files. 
Bug: 2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
 2010-01-07 12:05:01 -08:00
Scott Main
0a49913c81 am 707ca41d: am d8858893: Merge "docs: fix some broken links" into eclair 
Merge commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb'

* commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb':
  docs: fix some broken links
 2010-01-07 10:26:49 -08:00
Scott Main
707ca41d1f am d8858893: Merge "docs: fix some broken links" into eclair 
Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp

* commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1':
  docs: fix some broken links
 2010-01-07 10:21:52 -08:00
Scott Main
d88588935e Merge "docs: fix some broken links" into eclair 2010-01-07 10:18:45 -08:00
Tom O'Neill
2e4ce0fc6d Merge "Update Notepad tutorial documentation to match code" 2010-01-07 09:18:55 -08:00
Scott Main
3979a60a94 am 95eeedfe: am c20467f9: docs: update the device dashboard 
Merge commit '95eeedfe8dc24db7a981ef69f94d307548d020fa'

* commit '95eeedfe8dc24db7a981ef69f94d307548d020fa':
  docs: update the device dashboard
 2010-01-05 12:34:14 -08:00
Scott Main
95eeedfe8d am c20467f9: docs: update the device dashboard 
Merge commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0' into eclair-plus-aosp

* commit 'c20467f94afd2ac173dcb1d27f2a8fb91816edb0':
  docs: update the device dashboard
 2010-01-05 12:31:06 -08:00
Scott Main
c20467f94a docs: update the device dashboard 2010-01-05 10:46:44 -08:00
Scott Main
afbe1259d7 am 186b94fe: am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages. 
Merge commit '186b94fe60a4cede177bace19b68c72c6f475190'

* commit '186b94fe60a4cede177bace19b68c72c6f475190':
  upload new dev site robots.txt to disallow old tutorial and
 2009-12-21 14:08:34 -08:00
Scott Main
186b94fe60 am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages. 
Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp

* commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6':
  upload new dev site robots.txt to disallow old tutorial and
 2009-12-21 13:46:28 -08:00
Scott Main
90b04c5170 docs: fix some broken links 2009-12-21 12:23:47 -08:00
Scott Main
74962e56c5 upload new dev site robots.txt to disallow old tutorial and 
samples directories (while old pages are still orphaned) and upload
new sitemap including new resources pages.
 2009-12-21 11:32:22 -08:00