Gilles Debunne
de87598837
Merge "Amended 9patch border documentation"
2010-11-09 09:36:38 -08:00
Gilles Debunne
311c27a19c
Amended 9patch border documentation
...
Change-Id: I6e65aff09ab467016fdf3486902dfe26036bb6e9
2010-11-08 17:41:26 -08:00
Robert Ly
b6c6579511
am a27fc901: am 47e43feb: Doc change: Proguard tool
...
* commit 'a27fc901d8543c7734f70f0ef05977dcb94671f6':
Doc change: Proguard tool
2010-11-06 16:24:52 -07:00
Scott Main
3513c3f17f
am 04856d99: am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
...
* commit '04856d99f8f353711f294254c1159461213684a5':
docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-06 16:24:20 -07:00
Robert Ly
a27fc901d8
am 47e43feb: Doc change: Proguard tool
...
* commit '47e43febdd8ba83c333c9c98ca6a8c0bda421305':
Doc change: Proguard tool
2010-11-05 13:58:12 -07:00
Scott Main
04856d99f8
am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
...
* commit '6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457':
docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-05 13:57:31 -07:00
Robert Ly
47e43febdd
Doc change: Proguard tool
...
Change-Id: I98602bf61a971f00cbd41284b457bcb2c15ea441
2010-11-05 10:14:26 -07:00
Scott Main
6e88c84cbe
docs: remove allowClearUserData from <application> manifest doc
...
and clarify in javadocs that it's only for system apps
bug: 3128020
Change-Id: Ibc01f0e24f7d1f4e76a4da0a324c7682b92992aa
2010-11-04 18:45:05 -07:00
Scott Main
ce4b523eb8
am d9bb6bc2: am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
...
* commit 'd9bb6bc283b3f7ee75da14c42c8a563214103c05':
docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-04 07:20:33 -07:00
Scott Main
d9bb6bc283
am 08810efc: docs: provide overview of the web apps docs and revise images in the targeting doc
...
* commit '08810efc1a1868261fb042355f75ab049438b6e3':
docs: provide overview of the web apps docs and revise images in the targeting doc
2010-11-03 15:18:10 -07:00
Scott Main
08810efc1a
docs: provide overview of the web apps docs and revise images in the targeting doc
...
Change-Id: I7c7c5b1936bea0676a2cafa5020e2b997c0b8634
2010-11-03 14:48:21 -07:00
Dirk Dougherty
d8c2efdcd3
am 243a28ba: am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '243a28ba2d58acea96a33cd6c73cb805a653863f':
Doc change: Update uses-feature and permissions docs.
2010-11-03 11:42:31 -07:00
Joe Malin
a7bd885738
am fcea62a6: am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
...
* commit 'fcea62a64cba3422ae7d0c1eeee529fd49485984':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-03 10:59:03 -07:00
Dirk Dougherty
243a28ba2d
am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:47:20 -07:00
Dirk Dougherty
4e4d0d5f20
am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo
...
* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
Doc change: Update uses-feature and permissions docs.
2010-11-02 17:43:54 -07:00
Dirk Dougherty
f1e134ba6a
Doc change: Update uses-feature and permissions docs.
...
Change-Id: I80b45840d83e0622a7b5efeed00a3c659d80ca9b
2010-11-02 17:37:23 -07:00
Joe Malin
fcea62a64c
am c1fad4a2: Merge "DOC CHANGE: Add entry for monkeyrunner to tools index page." into gingerbread
...
* commit 'c1fad4a2e39ca5d5f2dbb45a67686f3423b8fe2d':
DOC CHANGE: Add entry for monkeyrunner to tools index page.
2010-11-02 13:18:47 -07:00
Joe Malin
6c49981d51
DOC CHANGE: Add entry for monkeyrunner to tools index page.
...
Change-Id: I6487521c3ab7cdf641242598dee6e2752f46fa7a
2010-11-01 17:19:40 -07:00
Joe Malin
ea8400b448
am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
...
* commit 'a7fda21c8298d8f316564280d702206147207005':
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:30:59 -07:00
Joe Malin
a7fda21c82
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
...
Change-Id: I049c5f70c47077c51fefbae32633592e80068df2
2010-11-01 16:12:54 -07:00
Joe Malin
9a7eab8d0a
Doc Change: Documentation for MonkeyRunner tool
...
Change-Id: I6bf21fe1e406b771c9fe8c36be4ad60b522d088d
2010-11-01 13:11:28 -07:00
Dianne Hackborn
4f405ecee9
am ce0f9e4e: am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit 'ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:52:36 -07:00
Dianne Hackborn
ce0f9e4e4f
am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:49:51 -07:00
Dianne Hackborn
7025d8e4b9
Fix issue #3152415 : Various confusions in docs about Application
...
Change-Id: Ie1b480ed7a47a3eb6ffff76bef0dcd7b2b845e83
2010-11-01 09:49:37 -07:00
Joe Malin
39f3e380fe
am 96bdc500: am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
...
Merge commit '96bdc500104c3e162495a9bfcf90799467e45c3d'
* commit '96bdc500104c3e162495a9bfcf90799467e45c3d':
Doc Change: Revert NotePad sample test package
2010-10-25 16:27:15 -07:00
Joe Malin
96bdc50010
am 5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
...
Merge commit '5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
2010-10-25 16:22:46 -07:00
Joe Malin
24fed74a34
Doc Change: Revert NotePad sample test package
...
Change-Id: I68a1b6f9cd64a86c5a8fa6657559f47a89162b37
2010-10-25 15:55:13 -07:00
Scott Main
dbb78f0e4e
am 81df9841: am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit '81df9841c64e417fe2adfab0e8d694af09e07c0d'
* commit '81df9841c64e417fe2adfab0e8d694af09e07c0d':
docs: fix typo; surface dev guide link in package description
2010-10-17 13:49:45 -07:00
Scott Main
2d8933879c
am b2bd4700: am 7f3addf3: am 09da9609: docs: fix code snippet errors
...
Merge commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800'
* commit 'b2bd470010279fe45e2848aa8cd0b3ad6f6ca800':
docs: fix code snippet errors
2010-10-17 13:49:35 -07:00
Nick Kralevich
5ac4fe5113
am 6bc34da8: am 612ebb92: Revert "Update the documentation for content provider security."
...
Merge commit '6bc34da8acf26c8e70325719fe43eaf22489809d'
* commit '6bc34da8acf26c8e70325719fe43eaf22489809d':
Revert "Update the documentation for content provider security."
2010-10-16 09:43:23 -07:00
Nick Kralevich
8bc68360b6
am 86052a87: am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
...
Merge commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8'
* commit '86052a87409e7ceac654ffebbb9bcfce1597c5d8':
Update the documentation for content provider security.
2010-10-16 09:14:21 -07:00
Scott Main
81df9841c6
am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
2010-10-15 18:23:34 -07:00
Scott Main
b2bd470010
am 7f3addf3: am 09da9609: docs: fix code snippet errors
...
Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp
* commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb':
docs: fix code snippet errors
2010-10-15 18:23:26 -07:00
Joe Malin
a79935afd0
am 439444d9: am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
...
Merge commit '439444d9043c46669d2fe8694ed3db8f09d92282'
* commit '439444d9043c46669d2fe8694ed3db8f09d92282':
DOC CHANGE: Fix bug in Testing doc
2010-10-15 14:26:57 -07:00
Scott Main
2c1dab4483
am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
...
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread
* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
docs: fix typo; surface dev guide link in package description
2010-10-15 12:35:04 -07:00
Scott Main
7f3addf37f
am 09da9609: docs: fix code snippet errors
...
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread
* commit '09da96099917141f2b90d53f61baa822bdd434d7':
docs: fix code snippet errors
2010-10-15 12:34:50 -07:00
Scott Main
fda5b19c75
Merge "docs: fix typo; surface dev guide link in package description" into froyo
2010-10-15 10:46:33 -07:00
Scott Main
09da960999
docs: fix code snippet errors
...
Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
2010-10-15 10:40:54 -07:00
Scott Main
36cdecd89d
docs: fix typo; surface dev guide link in package description
...
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
2010-10-15 10:19:27 -07:00
Nick Kralevich
6bc34da8ac
am 612ebb92: Revert "Update the documentation for content provider security."
...
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp
* commit '612ebb9257e2adf982ed846fa43251c3754361f7':
Revert "Update the documentation for content provider security."
2010-10-15 10:11:50 -07:00
Nick Kralevich
612ebb9257
Revert "Update the documentation for content provider security."
...
This reverts commit 4fe4d4c91cdfa59bb8161625be85252e187667a2.
2010-10-15 10:05:29 -07:00
Nick Kralevich
86052a8740
am 66f1c459: Merge "Update the documentation for content provider security." into gingerbread
...
Merge commit '66f1c459ac15d1dba1850cb30759500d35078f29' into gingerbread-plus-aosp
* commit '66f1c459ac15d1dba1850cb30759500d35078f29':
Update the documentation for content provider security.
2010-10-15 09:24:39 -07:00
Nick Kralevich
66f1c459ac
Merge "Update the documentation for content provider security." into gingerbread
2010-10-15 09:17:12 -07:00
Scott Main
a8d2506573
am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e'
* commit '5cfa877e22a2d76d1ea36c3f0c2c708248da3d0e':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-15 00:07:26 -07:00
Joe Malin
439444d904
am 75d3591b: Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
...
Merge commit '75d3591b2dd60e50182542045147b9b6033c2b85' into gingerbread-plus-aosp
* commit '75d3591b2dd60e50182542045147b9b6033c2b85':
DOC CHANGE: Fix bug in Testing doc
2010-10-14 12:09:33 -07:00
Joe Malin
75d3591b2d
Merge "DOC CHANGE: Fix bug in Testing doc" into gingerbread
2010-10-14 12:05:33 -07:00
Dirk Dougherty
068e695676
Doc change: Merge commit 'd555e264' into manualmerge
...
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
2010-10-13 19:32:02 -07:00
Brad Fitzpatrick
bbf68c6ad2
am 4711d21a: am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
...
Merge commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc'
* commit '4711d21a55d9ff6f234d3b06ff2d07dca19238fc':
StrictMode: link to designing for responsiveness ANR docs
2010-10-13 17:03:10 -07:00
Scott Main
5cfa877e22
am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0' into gingerbread-plus-aosp
* commit 'eb4ef07223030eb61d8cf99771e657b7fc0108d0':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:27:08 -07:00
Scott Main
eb4ef07223
am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494
...
Merge commit '5249ad03454301744374d04e04b38aaad3b01530' into gingerbread
* commit '5249ad03454301744374d04e04b38aaad3b01530':
docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
2010-10-13 12:08:02 -07:00