Commit Graph

76 Commits

Author SHA1 Message Date
Scott Main
bb3e4cf973 am 3354f4dc: am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '3354f4dc3de531cf5e5039c0b9f40de4fbdac255':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
2010-12-14 17:45:39 -08:00
Scott Main
3354f4dc3d am 369c1c1f: cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
* commit '369c1c1fa22802b6504c5cde533d797841700a66':
  cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes
2010-12-14 17:42:28 -08:00
Scott Main
369c1c1fa2 cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e
docs: anchor link fixes

Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1
2010-12-14 17:34:00 -08:00
Scott Main
dc76b1c3ff am a925b6a6: am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
* commit 'a925b6a64c8137804547d5cfcd97415392d667b1':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
2010-12-14 16:46:56 -08:00
Scott Main
a925b6a64c am 93d204ed: cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
* commit '93d204ed98019322e434b714c7c0a619d69f24f5':
  cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df docs: fix misc broken links; update some screenshots using windows bug: 3258882
2010-12-14 16:43:28 -08:00
Scott Main
93d204ed98 cherrypick Change-Id: Icf74572932165270a93243f4a109979807b495df
docs: fix misc broken links; update some screenshots using windows
bug: 3258882

Change-Id: I3d4a2c66be4e563f4c45d72fec30c9a1b5d8fc23
2010-12-14 16:39:22 -08:00
Scott Main
d4fbcfa220 am 9e3d14c4: am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
* commit '9e3d14c4aad7e41406f633734973b191c21b5c5c':
  docs: clarify <include> layout properties bug: 3227820
2010-11-24 16:23:04 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
2010-11-24 11:24:33 -08:00
Scott Main
1385d89d5e am 55ff5708: am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
* commit '55ff5708bb166ab985ffd89e62ddcb13927d6403':
  docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:56:53 -08:00
Scott Main
55ff5708bb am 828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462" into gingerbread
* commit '828b68166679ebfc0002e2ea516ca91e6fb13597':
  docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug: 3099462
2010-11-19 16:51:57 -08:00
Scott Main
0f6f51879c docs: revise menu resources to account for action bar
Change-Id: I40d61653e02735f6a0b47449191b71c233b36fa3
2010-11-17 19:34:28 -08:00
Scott Main
ae5335b673 docs: add docs for xhdpi and xlarge screen support
update screen ranges figure
bug: 3099462

Change-Id: I4667f105df2ddc04a8e2b6c3ad06ec0ded2dccd2
2010-11-10 15:27:40 -08: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
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
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
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
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
Romain Guy
0f0b71600b am e53fe4a4: Merge "Fixed a documentation Bug (Issue 9236)"
Merge commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5' into gingerbread-plus-aosp

* commit 'e53fe4a465a014788e3b93ca9f30f229481bc4e5':
  Fixed a documentation Bug (Issue 9236)
2010-07-29 14:32:29 -07:00
Gilles Debunne
3e0a3d5b48 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.

Change-Id: Icf7494c23f7e3af7d3c6aab770d0ba3c1fea2ebf
2010-07-28 17:08:15 -07:00
Scott Main
25f79d9972 am 3b3e368c: am 60a20061: am 2316d626: docs: add information about using color resources as drawables
Merge commit '3b3e368c73f4224b055635e6e79f57cc702d8938'

* commit '3b3e368c73f4224b055635e6e79f57cc702d8938':
  docs: add information about using color resources as drawables
2010-07-20 16:54:52 -07:00
Scott Main
2316d62608 docs: add information about using color resources as drawables
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
2010-07-20 10:28:09 -07:00
Scott Main
82e2b4cb51 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
2010-07-15 11:54:15 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
Elliott Hughes
def4e4d39d Merge "Defer to ICU's knowledge of language-specific grammatical quantity rules." 2010-07-02 13:42:00 -07:00
Scott Main
1c8b6ca4d7 docs: fix misc broken links
Change-Id: I7294276aff0c80498215870d5d72f7a3a9b2c99a
2010-07-02 11:11:34 -07:00
Elliott Hughes
1ad636c315 Defer to ICU's knowledge of language-specific grammatical quantity rules.
Also improve the documentation to make it a little less unclear what this
is all about. In particular, explain why the original submitter's complaint
about "zero" never being used in English, is expected behavior.

Bug: 2663392
Change-Id: Iade3b4f5c549ce01a95fd0e7e5c6ea394178eda3
2010-07-01 16:51:48 -07:00
Christian Mehlmauer
218284528b Fixed a documentation Bug (Issue 9236)
Change-Id: I898b352f2b2f6b059ccd4a44c30e61c9dfdab9ec
http://code.google.com/p/android/issues/detail?id=9236
2010-06-25 16:31:05 +02:00
Scott Main
dfe5c20440 docs: lots of additions to the resources docs
new drawable resources
add <merge> and <include> to layout resource
update drawable class descriptioons to point to resources guide
add ID resource type

Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
2010-06-21 15:19:23 -07:00
Scott Main
5f11e95f00 docs: small edits to catchup to edits made in html pushed live
Change-Id: I62b3e7dc5fcab881dd09ca897b05425a8c28cb92
2010-06-16 17:29:40 -07:00
Scott Main
821ca51857 docs: edits to resources doc
Change-Id: I1dbe5d213d8f85b2ecaeed45ddbe215f199e2c9e
2010-06-16 12:47:11 -07:00
Scott Main
7ef674b596 docs: add information about known issues in resource matching
for screen density and system version.
Add section about providing compatibility for multiple devices

bug: 2760561

Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
2010-06-14 12:57:54 -07:00
Scott Main
5dd0fd5c89 docs: fix broken links
Change-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab
2010-05-12 14:49:38 -07:00
Scott Main
c6cb8a78d0 docs: revisions to the new resources doc based on editorial feedback
plus some fixes to resource references and other misc revisions

Change-Id: I7b498858d9d0ecfd8cf9bad48c08c93047d597b8
2010-05-07 15:18:49 -07:00
Scott Main
f940a1f316 cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96
docs: rewrite resources documentation

Huge overhaul. Includes all new dev guides about how resources are used
on Android and how to provide alternatives, including how to handle
runtime configuration changes (restarts). Plus all new reference
docs for all the resource types (drawables, strings, menus, etc.).

Change-Id: I12e819d2c5fc11e062281d8fe442c3037e92000a
2010-04-08 17:10:06 -07:00