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

556 Commits

Author SHA1 Message Date
Scott Main
1076ea0abe am 9800adf2: Merge "docs: update web page debugging with info about page and 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
 2010-01-29 13:47:40 -08:00
Scott Main
9800adf2a4 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Scott Main
7b02e924b0 docs: update web page debugging with info about page and line 
numbering in the log.
 2010-01-29 12:17:32 -08:00
Dirk Dougherty
b574cf876e am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion description, add 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.
 2010-01-28 16:46:54 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features. 
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
 2010-01-28 16:26:50 -08:00
Dirk Dougherty
67a658567a am 965f4a6b: Merge "doc change only: Update announcement and mwc redirect to 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.
 2010-01-26 18:05:23 -08:00
Dirk Dougherty
965f4a6b4b Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Dirk Dougherty
dc19ba8af9 doc change only: Update announcement and mwc redirect to point to microsite. 
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
 2010-01-26 16:58:33 -08:00
Scott Main
9985fecaa0 am d243bc71: Merge "docs: reference the history JS file with 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 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e' into eclair-plus-aosp

* commit 'd243bc710c92e56974f52449d24e2c6b8dd0ef9e':
  docs: reference the history JS file with docRoot in order to
 2010-01-25 16:54:20 -08:00
Scott Main
d243bc710c Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Scott Main
d644edb6d8 docs: reference the history JS file with docRoot in order to 
make offline doc searches work. (I think this was a regression
due to a missed merge.)
Bug: 1909300
 2010-01-25 14:47:46 -08:00
Dirk Dougherty
99988b6ee6 am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp

* commit '8420795633443221627eb872aea8f2862a38f8b1':
  SDK doc change: Misc small fixes.
 2010-01-22 16:50:03 -08:00
Dirk Dougherty
43d5a09f46 am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for 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.
 2010-01-22 16:49:57 -08:00
Dirk Dougherty
8420795633 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
c5de95bf25 Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dirk Dougherty
5bc32d3539 SDK doc change: Misc small fixes. 
Bug:2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
 2010-01-22 15:11:00 -08:00
Dirk Dougherty
83d092573e SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager. 
Bug: 2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
 2010-01-22 14:31:47 -08:00
Dirk Dougherty
97ca28cdd9 am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move 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.
 2010-01-22 14:28:05 -08:00
Dirk Dougherty
5d14cb34c0 Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
Dirk Dougherty
a0fc438334 doc change: add announce for developer lab at mwc. move adc to carousel. 
Bug: 2160782
Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
 2010-01-22 13:22:42 -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
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
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
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
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
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