1137 Commits

Author SHA1 Message Date
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
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
Scott Main
5249ad0345 docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
bug: 3088494

Change-Id: I9da318efb3d05d52eb8c2677e96da1bcf1cd542a
2010-10-12 17:10:31 -07:00
Joe Malin
9c61f8fc01 DOC CHANGE: Fix bug in Testing doc
Change-Id: Id432a40adfb6aef05a3e7c19425de54cb8a5f610
2010-10-12 14:36:59 -07:00
Dirk Dougherty
d555e2643f am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp

* commit '354954a01c533c6789536c141cf330ddf3976e8b':
  Doc change: cherrypick testing changes from master. Squashed commit of the following:
2010-10-12 14:18:33 -07:00
Dirk Dougherty
354954a01c Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
Brad Fitzpatrick
4711d21a55 am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp

* commit '9facd2d0847691ae46108713d6a7dc9f51a62135':
  StrictMode: link to designing for responsiveness ANR docs
2010-10-12 08:23:40 -07:00
Scott Main
3fd40ee692 Revert "docs: new web apps dev guides" Do not merge.
This reverts commit 65e62f4f908394fc469cf535fef7c16035a428a2.

Conflicts:

	docs/html/guide/guide_toc.cs

Change-Id: If6eb679a629bd4376043b2f49b6a82eacf71603d
2010-10-11 14:27:30 -07:00
Brad Fitzpatrick
9fc2fc5757 StrictMode: link to designing for responsiveness ANR docs
Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
2010-10-11 13:17:48 -07:00
Scott Main
a670636aa2 am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3'

* commit '4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-11 10:02:57 -07:00
Scott Main
86d6f501e7 am 59d5d966: am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce'

* commit '59d5d966665dfebb1b03c4b1eba9eff3d9c797ce':
  docs: a few style adjustments to admin doc
2010-10-11 09:43:49 -07:00
Jason Chen
0b6dfd78bb resolved conflicts for merge of '1d58e52a' into master
Change-Id: I783bc0e8cb0863dbe4c118515cefbe9e46f5254f
2010-10-11 09:24:33 -07:00
Scott Main
d9ae8ba9d9 am 7bfac24d: am d7170b2a: am 65e62f4f: docs: new web apps dev guides
Merge commit '7bfac24dcb5ec532b822507816929931e5e19002'

* commit '7bfac24dcb5ec532b822507816929931e5e19002':
  docs: new web apps dev guides
2010-10-10 19:13:36 -07:00
Dirk Dougherty
dafac622a4 Doc change: cherrypick testing changes from master. Squashed commit of the following:
commit 3341f42f857058707c1c9f77dcfaecb22ff2f125
Author: Joe Malin <jmalin@google.com>
Date:   Wed Sep 1 14:43:24 2010 -0700

    Doc Change: cherrypick from master -- add screenshots to Testing in Eclipse topic

    Change-Id: If0ebd70ece3f077e18c909db2b8cc499a7f92692

commit af2da09a6c69cac02fd1987a44d223d678b2484d
Author: Dirk Dougherty <ddougherty@google.com>
Date:   Sun Oct 10 12:39:55 2010 -0700

    Doc change: Cherrypick from master -- Testing Documentation in the Dev Guide tab

    Conflicts:

    	docs/html/guide/guide_toc.cs
    	docs/html/guide/topics/testing/testing_android.jd

    Change-Id: I6d2e7b7f69517e8aae3a1274596d2ecbd85cac50

Change-Id: Ic6e547ce25c35060ec073b9da75e1d71b4946a85
2010-10-10 13:20:12 -07:00
Scott Main
4c2c62fe08 am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp

* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:36:00 -07:00
Scott Main
bed5af7ebc am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Merge commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15' into gingerbread

* commit '456fe3b337ef82aaf90c6428ec5be07028fc7d15':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
2010-10-08 17:27:28 -07:00
Scott Main
456fe3b337 add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build
Change-Id: If1a33d5f5ee1f3b39c5592748e3d584e060b7278
2010-10-08 17:06:29 -07:00
Scott Main
59d5d96666 am 3d265b57: am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '3d265b5775a74b1d5eb726238f13cf63e8465594' into gingerbread-plus-aosp

* commit '3d265b5775a74b1d5eb726238f13cf63e8465594':
  docs: a few style adjustments to admin doc
2010-10-08 16:43:06 -07:00
Scott Main
3d265b5775 am 50f86c65: docs: a few style adjustments to admin doc
Merge commit '50f86c65206072be0ca924f03b8d460365199bcd' into gingerbread

* commit '50f86c65206072be0ca924f03b8d460365199bcd':
  docs: a few style adjustments to admin doc
2010-10-08 16:39:08 -07:00
Scott Main
1d58e52a59 am 72552887: am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '7255288755661587958d384338d4808e76959d86' into gingerbread-plus-aosp

* commit '7255288755661587958d384338d4808e76959d86':
  docs: remove old "new" tags from side nav
2010-10-08 16:37:51 -07:00
Scott Main
7255288755 am 2e5a22aa: docs: remove old "new" tags from side nav
Merge commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d' into gingerbread

* commit '2e5a22aa3cd9ca81c82e93044dca6f36c395746d':
  docs: remove old "new" tags from side nav
2010-10-08 16:30:47 -07:00
Scott Main
50f86c6520 docs: a few style adjustments to admin doc
Change-Id: I1ea2416f1f26835b1111aad65cc519dd8d56e099
2010-10-08 16:12:32 -07:00
Scott Main
7bfac24dcb am d7170b2a: am 65e62f4f: docs: new web apps dev guides
Merge commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4' into gingerbread-plus-aosp

* commit 'd7170b2a68dc9b9df6de9b063d25ff0ec20c86c4':
  docs: new web apps dev guides
2010-10-08 15:55:40 -07:00
Scott Main
d7170b2a68 am 65e62f4f: docs: new web apps dev guides
Merge commit '65e62f4f908394fc469cf535fef7c16035a428a2' into gingerbread

* commit '65e62f4f908394fc469cf535fef7c16035a428a2':
  docs: new web apps dev guides
2010-10-08 15:43:44 -07:00
Scott Main
2e5a22aa3c docs: remove old "new" tags from side nav
Change-Id: I9e5d1bf7688f5d30cd7b4c07b69b3f353dc67f92
2010-10-08 15:32:10 -07:00
Scott Main
65e62f4f90 docs: new web apps dev guides
Change-Id: I08b80de0544fec5d46a58e1c1b4c0e2ff1fd4fa2
2010-10-08 15:19:27 -07:00
Jason Chen
1a469ca1cb Resolved conflicts for merge of 2bd6afed to master
Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
2010-10-08 13:09:31 -07:00
Fred Chung
2bd6afed6c am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4' into gingerbread-plus-aosp

* commit 'b50d5ede6f2fdd8ea7efacd96815e01e661fdcd4':
  Doc change: Adding new docs for Device Admin API.
2010-10-05 23:45:29 -07:00
Fred Chung
b50d5ede6f am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo
Merge commit '30264c9b85109ae58c1e472a747bf47464cc1632' into gingerbread

* commit '30264c9b85109ae58c1e472a747bf47464cc1632':
  Doc change: Adding new docs for Device Admin API.
2010-10-05 23:39:23 -07:00
Fred Chung
30264c9b85 Merge "Doc change: Adding new docs for Device Admin API." into froyo 2010-10-05 23:26:41 -07:00
Scott Main
996acec5bd am 196894cd: am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f'

* commit '196894cdcc6883ed141ec0f6f2f577dbc613e08f':
  docs: update homepage with more countries for market announcement
2010-10-05 16:15:44 -07:00
Scott Main
5302798581 Merge "docs: Rewrite of App Fundamentals.. Part 1. This introduces two new docs: Activities Provides a fundamental introduction to how activities work, including the basics about layout, manifest entries, starting activies, getting results, and the complete discussion about the lifecycle (which used to be in the fundamentals.jd document under "Component Lifecycles"), but also now includes more information about saving instance state (with new diagrams). Tasks and Back Stack A large expansion of the material originally presented in the fundamentals.jd document under "Activities and Tasks". This doc talks all about how tasks and the back stack work. This content re-organization is important because fragments can now become a part of the back stack (which is a task-oriented concept), thus, it's important to separate the task ideas from being tied directly to activities only, which is how tasks are currently discussed. However, fragments are not yet discussed here in detail---that will come later when the fragment dev guide is introduced." 2010-10-05 15:19:27 -07:00
Scott Main
537b222514 am fc7f3919: am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d'

* commit 'fc7f39196be7e7e741ece79b4b551c52cdb67f0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-05 15:17:40 -07:00
Scott Main
f6fe78b2ae docs: Rewrite of App Fundamentals.. Part 1.
This introduces two new docs:
Activities
  Provides a fundamental introduction to how activities work, including
  the basics about layout, manifest entries, starting activies, getting results,
  and the complete discussion about the lifecycle (which used to be in the
  fundamentals.jd document under "Component Lifecycles"), but also now includes more
  information about saving instance state (with new diagrams).
Tasks and Back Stack
  A large expansion of the material originally presented in the fundamentals.jd
  document under "Activities and Tasks". This doc talks all about how tasks and
  the back stack work. This content re-organization is important because fragments
  can now become a part of the back stack (which is a task-oriented concept), thus,
  it's important to separate the task ideas from being tied directly to activities only,
  which is how tasks are currently discussed. However, fragments are not yet discussed
  here in detail---that will come later when the fragment dev guide is introduced.

Change-Id: I46425b5c2c3b928dc81bafd05a88ad3ea1c5be53
2010-10-05 15:06:33 -07:00
Scott Main
d9ec8eba56 resolved conflicts for merge of 7008b7c1 to master
Change-Id: I360136e54229cae1fc0fa15eab8f1490b8a0fb5e
2010-10-04 18:42:49 -07:00
Katie McCormick
262b43153b Doc change: Adding new docs for Device Admin API.
commit cc4206420a80db7a75136ffb8293ef115a1f94a8
Author: Katie McCormick <kmccormick@google.com>
Date:   Wed Sep 1 17:49:11 2010 -0700

    Doc change: New doc for Device Admin API

Change-Id: Ic4ae029f5a16c3e2ec8b833fc3714b62e0c61db0
2010-10-04 17:37:04 -07:00
Scott Main
196894cdcc am c692792e: am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp

* commit 'c692792ead7dab0a41181f4589c1d8d249d0ad88':
  docs: update homepage with more countries for market announcement
2010-10-04 16:35:18 -07:00
Scott Main
c692792ead am 46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread

* commit '46ffeb218859a543540a70b3229a48d2d96cbb4a':
  docs: update homepage with more countries for market announcement
2010-10-04 16:31:47 -07:00
Scott Main
fc7f39196b am b3a5b85a: am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit 'b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp

* commit 'b3a5b85a612703e54e631ffab5bb518eba909899':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:49:07 -07:00
Scott Main
46ffeb2188 docs: update homepage with more countries for market announcement
Change-Id: Icb56ddd57ca23b2773792f171bc65327b2f725bd
2010-10-04 15:45:11 -07:00
Scott Main
b3a5b85a61 am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread

* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 15:39:24 -07:00
Scott Main
7008b7c1c4 am ae1864c0: am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit 'ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp

* commit 'ae1864c0e79baae75ad25f20828349be8635d471':
  docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:37:11 -07:00
Scott Main
ae1864c0e7 am ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread

* commit 'ec80d7f311b1a0899bb4caf5b380b07027e902d1':
  docs: consistency fixit for the quickview boxes in the dev guide
2010-10-04 14:32:26 -07:00
Scott Main
6ef33cb3b8 docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Change-Id: Ic46ba89cfd0566fea792f65dfa130bef7010b164
2010-10-04 14:13:54 -07:00