Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,675 Commits 3 Branches 0 Tags
34df5ccca4c31d131eccc96c2ebf5cc698edfe21
Commit Graph

496 Commits

Author SHA1 Message Date
Scott Main
4d5770904c docs: revise the Style and Themes document to improve the 
clarity of the concepts and expand the available information
 2010-02-03 14:50:15 -08:00
Scott Main
3b889f5219 am 1076ea0a: am 9800adf2: Merge "docs: update web page debugging with info 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
 2010-01-29 13:52:30 -08:00
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
1f40f174e7 am b574cf87: am 7b00a8ae: Merge "SDK doc change: fix android:glEsVersion 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.
 2010-01-28 16:52:43 -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
Scott Main
1ce80a4d7a am bfb86068: am 2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair 
Merge commit 'bfb8606831d5a5776301733cde3650d237870453'

* commit 'bfb8606831d5a5776301733cde3650d237870453':
  docs: add guide to copying and installing the Dev Tools app
 2010-01-25 18:10:13 -08:00
Scott Main
95127b8e44 am 5ed68156: 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 '5ed681561c5904eb55a275387f1df8cec401361c'

* commit '5ed681561c5904eb55a275387f1df8cec401361c':
  docs: add a section about debugging web pages with the Console APIs;
 2010-01-22 12:00:00 -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
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
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
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
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
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
cf6bbab6db SDK doc change: Miscellaneous fixes. 
Bug: 2160782
Change-Id: I5f1e449bcb2c8f715858b6819f041349088a8a32
 2010-01-11 11:15:22 -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
90b04c5170 docs: fix some broken links 2009-12-21 12:23:47 -08:00
Scott Main
0f10c2bd32 am 5508987b: am e4c2a376: Merge change I2703edac into eclair 
Merge commit '5508987bfcdd9a441966893ee21c6cf7803c0b49'

* commit '5508987bfcdd9a441966893ee21c6cf7803c0b49':
  docs: add new device features for the uses-feature
 2009-12-19 12:36:05 -08:00
Scott Main
5508987bfc am e4c2a376: Merge change I2703edac into eclair 
Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp

* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
  docs: add new device features for the uses-feature
 2009-12-19 12:33:00 -08:00
Android (Google) Code Review
e4c2a37624 Merge change I2703edac into eclair 
* changes:
  docs: add new device features for the uses-feature manifest element and edit some other pieces.
 2009-12-19 12:30:15 -08:00
Scott Main
2703edac00 docs: add new device features for the uses-feature 
manifest element and edit some other pieces.
 2009-12-19 00:55:18 -08:00
Scott Main
9256bb08d2 am 9a6c8168: am 77fa05a4: Merge change Iab5952e1 into eclair 
Merge commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd'

* commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd':
  docs: add "required" attribute to the <uses-feature> docs
 2009-12-19 00:41:10 -08:00
Scott Main
9a6c8168f7 am 77fa05a4: Merge change Iab5952e1 into eclair 
Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp

* commit '77fa05a43d3f3f967311d6806fe743017950cf92':
  docs: add "required" attribute to the <uses-feature> docs
 2009-12-19 00:39:26 -08:00
Android (Google) Code Review
77fa05a43d Merge change Iab5952e1 into eclair 
* changes:
  docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
 2009-12-19 00:36:48 -08:00
Scott Main
0b91635caf docs: add "required" attribute to the <uses-feature> docs 
and add a note to the CAMERA permission stating that it enables
the <uses-feature> for camera.
This is an incrimental update for the 2.0.1 docs. More changes
to come for the 2.1 docs to include more features
 2009-12-19 00:25:11 -08:00
Scott Main
3a9b03425b am a2bca747: am a25032a0: Merge change Ic31c0f62 into eclair 
Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970'

* commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970':
  docs: update the Bluetooth guide with links to the sample
 2009-12-18 17:18:54 -08:00
Scott Main
a2bca7477d am a25032a0: Merge change Ic31c0f62 into eclair 
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp

* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
  docs: update the Bluetooth guide with links to the sample
 2009-12-18 17:15:38 -08:00
Android (Google) Code Review
a25032a08d Merge change Ic31c0f62 into eclair 
* changes:
  docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
 2009-12-18 17:12:36 -08:00
Dirk Dougherty
48f19812c7 am 98a48f0f: am 5da76ddd: doc change: Add ?details query to doc about Android Market. 
Merge commit '98a48f0fd3af5fec833dab44da17f8911e95d147'

* commit '98a48f0fd3af5fec833dab44da17f8911e95d147':
  doc change: Add ?details query to doc about Android Market.
 2009-12-17 17:38:49 -08:00
Dirk Dougherty
98a48f0fd3 am 5da76ddd: doc change: Add ?details query to doc about Android Market. 
Merge commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e' into eclair-plus-aosp

* commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e':
  doc change: Add ?details query to doc about Android Market.
 2009-12-17 17:35:58 -08:00
Dirk Dougherty
5da76ddd57 doc change: Add ?details query to doc about Android Market. 
Bug: 2160782
Change-Id: I86d1339e5bc5a36dbd033a7938764818a27b4d81
 2009-12-17 17:13:04 -08:00
Scott Main
1362bbcf76 docs: update the Bluetooth guide with links to the sample 
app, scrub the sibling files, and revise the Bluetooth package
summary to point to the BT dev guide.
 2009-12-16 18:48:02 -08:00
Scott Main
18a2788695 am 8bda0fb0: Merge change Iccb92649 into eclair 
Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp

* commit '8bda0fb0ca24875ad6084f35250f166b45f967a1':
  docs: fix typo
 2009-12-16 11:18:00 -08:00
Scott Main
ccb926498f docs: fix typo 2009-12-16 11:13:40 -08:00
Scott Main
c49f864695 resolved conflicts for merge of aaf8a9d8 to master 2009-12-16 11:08:26 -08:00
Katarina Stenstedt
b5362167ab am f0165495: am 9d2252db: Merge change Ia36d8e74 into eclair 
Merge commit 'f0165495951e3a32aa5697ac1299307c2d72f32a'

* commit 'f0165495951e3a32aa5697ac1299307c2d72f32a':
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 10:32:29 -08:00
Dirk Dougherty
c0d7e1ccda am 4a2d630f: am 6ccc515c: Merge change I8385f59d into eclair 
Merge commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2'

* commit '4a2d630f686c44fb2a77c90bc6cf87779725abe2':
  sdk doc change for esr: Cleanup for resources tab content.
 2009-12-16 10:32:20 -08:00
Scott Main
aaf8a9d885 am 218c0763: Merge change Ib43ec8f6 into eclair 
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp

* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
  docs: fix some typos in the manifest docs samples and
 2009-12-16 10:28:11 -08:00
Katarina Stenstedt
f016549595 am 9d2252db: Merge change Ia36d8e74 into eclair 
Merge commit '9d2252db2cd82535f475fc3823e6e7c60cf17038' into eclair-plus-aosp

* commit '9d2252db2cd82535f475fc3823e6e7c60cf17038':
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 10:28:06 -08:00
Dirk Dougherty
4a2d630f68 am 6ccc515c: Merge change I8385f59d into eclair 
Merge commit '6ccc515c7f705a66718d0138a421e29186667b9e' into eclair-plus-aosp

* commit '6ccc515c7f705a66718d0138a421e29186667b9e':
  sdk doc change for esr: Cleanup for resources tab content.
 2009-12-16 10:27:47 -08:00
Android (Google) Code Review
218c0763d5 Merge change Ib43ec8f6 into eclair 
* changes:
  docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
 2009-12-16 10:05:10 -08:00
Android (Google) Code Review
9d2252db2c Merge change Ia36d8e74 into eclair 
* changes:
  Updates to SDK troubleshooting doc, per bug 2315781.
 2009-12-16 09:59:12 -08:00
Dirk Dougherty
50bfb39c55 sdk doc change for esr: Cleanup for resources tab content. 
Bug:2160782
Change-Id: I8385f59d764156ccc318f71e5d344c7f33330c40
 2009-12-15 19:24:58 -08:00