287 Commits

Author SHA1 Message Date
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
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
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
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
ec80d7f311 docs: consistency fixit for the quickview boxes in the dev guide
Change-Id: Ibd81091fc6002a77ce43f553b63facec53f16a38
2010-10-04 13:30:30 -07:00
Chris Palmer
d4f1436d6a am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design.
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
2010-09-27 14:18:15 -07:00
Chris Palmer
143e61097e DO NOT MERGE Clarify the explanation of Android's security design.
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
2010-09-27 14:12:35 -07:00
Chris Palmer
797256f53e Merge "Clarify the explanation of Android's security design." 2010-09-26 14:17:32 -07:00
Chris Palmer
8daac143a8 Clarify the explanation of Android's security design.
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I56013bece58df1b6073d4ad0d22f3ee1b147d8c5
2010-09-24 16:12:30 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 13:10:22 -07:00
Scott Main
a24277977d am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:46:10 -07:00
Scott Main
2dc43f3d4c am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 11:41:48 -07:00
Scott Main
6ec3d4f0dc docs: add more info about state list drawable and onclick attribute to Button
bug:1062898

Change-Id: I633c38fc20a2ebf894237f86648cc0fdc9488b1a
2010-09-22 18:55:31 -07:00
Joe Onorato
9316232130 Fix broken javadoc.
Change-Id: I4729ebee36117f281af613e0b49f70d7dee5f334
2010-09-16 16:01:53 -04:00
Dirk Dougherty
40da25a26e am 8ee9ecc1: am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6'

* commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6':
  Doc change: clean up droiddoc (cs) macros.
2010-09-16 11:32:30 -07:00
Dirk Dougherty
8ee9ecc145 am 9afd9093: Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread
Merge commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453' into gingerbread-plus-aosp

* commit '9afd90939b1c2b298592b803c0bfa0b54ff7e453':
  Doc change: clean up droiddoc (cs) macros.
2010-09-16 11:19:54 -07:00
Dirk Dougherty
9519eab313 Doc change: clean up droiddoc (cs) macros.
Change-Id: I84b08a573fea42686a41ff694f1a52e8fb760dc5
2010-09-16 11:08:57 -07:00
Gilles Debunne
a78eca95ff Merge "Progress Dialog documentation example uses onPrepareDialog" 2010-09-09 11:56:11 -07:00
Gilles Debunne
6e1df0e981 Progress Dialog documentation example uses onPrepareDialog
Change-Id: I7afebdb321e28d8e4b1687ba4f503bde7d6031a0
2010-09-09 09:21:53 -07:00
Scott Main
8ae409f501 am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'

* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
  fix code snippet error
2010-09-03 13:28:18 -07:00
Scott Main
bfbf84b726 am 2b136832: am c4367e54: fix code snippet error
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp

* commit '2b136832be7326caed0c79bae418c2dd54372bea':
  fix code snippet error
2010-09-03 13:18:28 -07:00
Scott Main
c4367e54e4 fix code snippet error
Change-Id: Ida2f5ac2bc0bfb9b13b142f6422dd4b815603ab5
2010-09-03 11:03:42 -07:00
Scott Main
b433298530 am beccf3c4: am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c'

* commit 'beccf3c48a6573da6dc0cb3d5e8e170664220f0c':
  clarify dp dimension description
2010-09-02 18:53:32 -07:00
Scott Main
beccf3c48a am 3208557e: am c5083cdf: Merge "clarify dp dimension description" into froyo
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp

* commit '3208557edca8c133fa32b7718acd22d77f1a9475':
  clarify dp dimension description
2010-09-02 18:44:11 -07:00
Scott Main
c5083cdfff Merge "clarify dp dimension description" into froyo 2010-09-02 17:53:14 -07:00
Joe Malin
3e3fcf985f Testing Documentation in the Dev Guide tab
Change-Id: I36cb020642a7f094d2070509abb280c7c88f607f
2010-08-27 17:59:38 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs.
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
e339c0968e am 9020595b: am f5287094: Fix closing tag in docs.
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
2010-08-27 12:23:30 -07:00
Brad Fitzpatrick
f52870948d Fix closing tag in docs.
BUG=2956223

Change-Id: I0772d0b5386a783762319064c13d567c124da394
2010-08-27 11:22:50 -07:00
Gilles Debunne
aea2d763a2 Fix in fundamentals web page.
Change-Id: I330ea9c925315bc817bf544992401cd1957c1c2a
2010-08-25 10:31:57 -07:00
Dirk Dougherty
91047d3b2c am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd'

* commit '976b71e2e0a2041ad159c782f07e1a4d1a06aefd':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-24 11:54:39 -07:00
Scott Main
9ac16d2dc4 am 32b07fc6: am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit '32b07fc6cab290466c010d05667940a9ba5672e2'

* commit '32b07fc6cab290466c010d05667940a9ba5672e2':
  docs: add dev guide for getting user location
2010-08-24 11:21:04 -07:00
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Scott Main
32b07fc6ca am e7aa645a: am 5a98fef3: Merge "docs: add dev guide for getting user location" into froyo
Merge commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9' into gingerbread-plus-aosp

* commit 'e7aa645a1a865962d1cb3de1e2dfa81525a90ed9':
  docs: add dev guide for getting user location
2010-08-23 12:44:18 -07:00
Scott Main
fa4596ec80 docs: add dev guide for getting user location
Change-Id: I63558c0304a632ccfbb7a80411ab23ad2c82b5c9
2010-08-20 14:21:26 -07:00
Scott Main
87dfc3d0f9 clarify dp dimension description
Change-Id: I85152f8ab668984ca9db3a4f56c4f8a5ab6ebacd
2010-08-16 14:46:23 -07:00
Scott Main
ab847c44d0 am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8'

* commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8':
  fix some doc errors in the resources;
2010-08-05 12:08:02 -07:00
Scott Main
c9de8c34a3 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
2010-08-04 18:05:26 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources;
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
2010-08-04 17:33:33 -07:00
Gilles Debunne
c943e174f6 am 4609b0a8: am 3d8d9440: Merge "Fixes regarding densities in "Providing Resources" documentation page." into froyo
Merge commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2' into gingerbread-plus-aosp

* commit '4609b0a8fcfbed9b893301232dfa3b70bb30e4e2':
  Fixes regarding densities in "Providing Resources" documentation page.
2010-07-30 11:56:36 -07:00
Gilles Debunne
c09a6977ae Fixes regarding densities in "Providing Resources" documentation page.
The ratio between densities is not constant.

The Exception for dpi qualifier in point 4 of the algorithm should be detailed.

I understand that if my config is ldpi-trackball-v5
and I have the choice between mdpi and hdpi-trackball-v5, mdpi will be chosen.

Cherry-picked from master CL 59188.

Change-Id: Ibe412a82845527ebdb104605c99c205ca52ab97c
2010-07-29 16:54:03 -07:00
Romain Guy
8fb007e6d9 am 0f0b7160: am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30'

* commit '0f0b71600b658c2c1a5cac63cb402f9ea443cb30':
  Fixed a documentation Bug (Issue 9236)
2010-07-29 14:36:22 -07:00