Scott Main
6668404ede
Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
2013-02-01 23:32:08 +00:00
Scott Main
c5480c32c2
docs: minimize code-font line-height.
...
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
2013-02-01 15:29:44 -08:00
Scott Main
2baf87e4f3
am b88c1a8a
: am 98f23e7a
: docs: delete obsolete asset files
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'b88c1a8a053a2274b315bc83c5f7e1c4d5666f68':
docs: delete obsolete asset files
2013-02-01 14:29:44 -08:00
Scott Main
20ba728ecb
am 89442344
: am e05e6f99
: docs: update template files with those from the templates-ds directory
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit '894423441edeb5ff431c1c82db8fa42ab25a27f7':
docs: update template files with those from the templates-ds directory
2013-02-01 14:29:43 -08:00
Scott Main
086e7f8b23
am 79935f59
: am 015d616a
: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit '79935f593bc567517c95d0f09198a519f315b2ca':
docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
2013-02-01 14:29:42 -08:00
Dirk Dougherty
5bd7d418aa
am 9c3033ce
: am dc6b4a59
: Add templates for devsite docs builds.
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9c3033ce0e099b8722cb8524ee52b6bce2e46506':
Add templates for devsite docs builds.
2013-02-01 14:29:40 -08:00
Scott Main
77c51357eb
docs: fix lang switcher for gae by deleting obsolete method call
...
Change-Id: I8d91d18e89d539960c93748557cccc5aabb0a263
2013-01-30 15:03:59 -08:00
Scott Main
98f23e7af0
docs: delete obsolete asset files
...
Change-Id: I1aa8a8fa757dbc81180c0585eacb68df5fe0ceb1
2013-01-29 16:05:55 -08:00
Scott Main
e05e6f99b3
docs: update template files with those from the templates-ds directory
...
Change-Id: I47b07b17ea79d0b00300492ba7854e37f1ab00d0
2013-01-29 14:45:34 -08:00
Scott Main
015d616af8
docs: use devsite hdf bool as a javascript condition for managing the lang toggle.
...
sync the sdk and ds templates so we can move toward one template set
Change-Id: I5316d4cd085734a47953beba203ba8beeb64549e
2013-01-29 10:43:14 -08:00
Dirk Dougherty
dc6b4a591c
Add templates for devsite docs builds.
...
Change-Id: I0bb0238326aed7d2ff931594709cb153b2587061
2013-01-28 14:49:50 -08:00
Scott Main
b6fd569c0c
am 85ab41eb
: am fb959d01
: am 474b3f11
: am eb41035f
: docs: add the ability to pause the carousel
...
* commit '85ab41eb6b7229dd1fcb08187f27a32ee754c05d':
docs: add the ability to pause the carousel
2013-01-14 21:16:42 -08:00
Scott Main
85ab41eb6b
am fb959d01
: am 474b3f11
: am eb41035f
: docs: add the ability to pause the carousel
...
* commit 'fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
2013-01-14 21:13:27 -08:00
Scott Main
fb959d01d5
am 474b3f11
: am eb41035f
: docs: add the ability to pause the carousel
...
* commit '474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
2013-01-14 21:10:48 -08:00
Scott Main
eb41035fcf
docs: add the ability to pause the carousel
...
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
2013-01-14 20:47:40 -08:00
Scott Main
0a24bca9f5
am 18ae42f3
: am 468a239d
: am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
2013-01-10 15:38:23 -08:00
Scott Main
18ae42f3c8
am 468a239d
: am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
2013-01-08 18:59:29 -08:00
Scott Main
468a239d0c
am 8d0a978a
: am 869f3d1f
: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
...
* commit '8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
2013-01-08 18:56:40 -08:00
Scott Main
869f3d1f68
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
2013-01-08 18:47:45 -08:00
Scott Main
ae3ee424e1
docs: update analytics script to support event tracking
...
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
2013-01-08 18:45:08 -08:00
Doug Zongker
4c84eb37ff
am 96045fb5
: am f09b7a0e
: Merge "SignApk: perform the whole file signature in a single streaming pass."
...
* commit '96045fb58488a24689e7449700c53614d9336572':
SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:19:19 -08:00
Doug Zongker
96045fb584
am f09b7a0e
: Merge "SignApk: perform the whole file signature in a single streaming pass."
...
* commit 'f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
SignApk: perform the whole file signature in a single streaming pass.
2013-01-03 15:12:43 -08:00
Koushik Dutta
29706d155a
SignApk: perform the whole file signature in a single streaming pass.
...
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
2013-01-03 14:00:40 -08:00
Doug Zongker
2d867bd207
am 57a5e52d
: Merge "add multiple key support to signapk"
...
* commit '57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
2013-01-02 14:45:12 -08:00
Doug Zongker
b14c97621b
add multiple key support to signapk
...
Support signing .apks (but not OTA packages) with multiple keys.
Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2013-01-02 13:31:00 -08:00
Scott Main
f9b6e097cb
am 97654bc6
: am db3da9bb
: am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it wi
...
* commit '97654bc68fe98ec443599b46fa0ad2c518fa4875':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:32:13 -08:00
Scott Main
97654bc68f
am db3da9bb
: am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scro
...
* commit 'db3da9bbc62be22d96cdf61f02afe271174f50be':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:31:12 -08:00
Scott Main
db3da9bbc6
am c9cea375
: am 707909f2
: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway
...
* commit 'c9cea375c3c66df33f4535e986c00a68f390ac62':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
2012-12-19 19:29:21 -08:00
Scott Main
707909f2e0
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
2012-12-19 19:23:32 -08:00
Scott Main
b8d06a55e0
docs: don't allow setting the sidenav fixed if the doc body is
...
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
2012-12-19 18:42:16 -08:00
Ying Wang
c46bd076ff
am ead4b642
: am 5f97f2b6
: am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
Run e2fsck on built sparse images.
2012-12-18 23:09:09 -08:00
Ying Wang
ead4b642cf
am 5f97f2b6
: am 6a6c1121
: Run e2fsck on built sparse images.
...
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
Run e2fsck on built sparse images.
2012-12-18 15:32:51 -08:00
Ying Wang
6a6c11215b
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
Ben Cheng
96ddf10e33
am 297e28a9
: am a7b85086
: Merge "Export TARGET_GCC_VERSION as an env variable."
...
* commit '297e28a9a713346dfb5d91630c96d365a6e69750':
Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:36:35 -08:00
Ben Cheng
297e28a9a7
am a7b85086
: Merge "Export TARGET_GCC_VERSION as an env variable."
...
* commit 'a7b850864c54bb6f223d4b186c5937fd20aa68d8':
Export TARGET_GCC_VERSION as an env variable.
2012-12-10 17:02:27 -08:00
Ben Cheng
1526670628
Export TARGET_GCC_VERSION as an env variable.
...
Have it referenced by the adbs tool to pick the specified toolchain.
Change-Id: I23df88946254a55d0749d6753e54559faf33e121
2012-12-10 16:06:16 -08:00
Robert Ly
04fc926d1e
am 70b80f2a
: am 7bfd28d7
: am 4bfc9991
: am 5c0f9e99
: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '70b80f2a9efb7ff52e6ece8626cc13c222474d90':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:07:35 -08:00
Robert Ly
c60c594c1d
am b1202d15
: am 54c59287
: am fd3b957b
: am f88a53d5
: Merge "docs: support google css class for reference docs" into jb-mr1-dev
...
* commit 'b1202d1512440b9122fc5a318222825af7787ca5':
docs: support google css class for reference docs
2012-12-03 13:07:34 -08:00
Robert Ly
7bfd28d744
am 4bfc9991
: am 5c0f9e99
: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
...
* commit '4bfc9991b49fe2e4e2e77b61c4abe7e38eea6777':
fix docs.js bug where changeApiLevel is getting called
2012-12-03 13:00:45 -08:00
Robert Ly
54c5928772
am fd3b957b
: am f88a53d5
: Merge "docs: support google css class for reference docs" into jb-mr1-dev
...
* commit 'fd3b957b4a63504e31801367056a0fb954e15c9c':
docs: support google css class for reference docs
2012-12-03 13:00:44 -08:00
Robert Ly
5c0f9e996a
Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev
2012-12-03 12:58:15 -08:00
Robert Ly
f88a53d5c3
Merge "docs: support google css class for reference docs" into jb-mr1-dev
2012-12-03 12:57:50 -08:00
Robert Ly
67d75f16f4
fix docs.js bug where changeApiLevel is getting called
...
Change-Id: Ic250afc792d7e4174bd987ce31df384dad3831ca
2012-12-03 12:55:48 -08:00
Scott Main
bc09aed1be
am b1fb4417
: am f8ea5ec7
: am 838b0856
: am df08adae
: docs: add "Google Services" search tab
...
* commit 'b1fb4417131e2e511f7df426edcda34114674d66':
docs: add "Google Services" search tab
2012-12-03 11:59:40 -08:00
Scott Main
f8ea5ec7cd
am 838b0856
: am df08adae
: docs: add "Google Services" search tab
...
* commit '838b0856405949c03bd27f08441755055d2b4b89':
docs: add "Google Services" search tab
2012-12-03 11:55:05 -08:00
Robert Ly
06884f596c
docs: support google css class for reference docs
...
Change-Id: I64e5dc14feb7f045c380e108b6afe44d7b1c8004
2012-12-03 11:50:38 -08:00
Scott Main
df08adae5b
docs: add "Google Services" search tab
...
Change-Id: I624f99aeb2f760d646f37d783ebb31b5d7d372b8
2012-12-03 08:54:37 -08:00
Scott Main
2b1fa59c74
am 2a2eb040
: am a5d5c010
: am 408067be
: am 8fa5351c
: show build info only for android docs (not google)
...
* commit '2a2eb040a640ca3ef2f9b10d0449a431bad3ced1':
show build info only for android docs (not google)
2012-11-30 20:28:41 -08:00
Scott Main
a5d5c01010
am 408067be
: am 8fa5351c
: show build info only for android docs (not google)
...
* commit '408067be215fa98ecad4de0aea2c080417c4e4f1':
show build info only for android docs (not google)
2012-11-30 20:25:19 -08:00
Scott Main
8fa5351cba
show build info only for android docs (not google)
...
Change-Id: I318f4f68147c109c119ed1fc05c2429ecc7289b7
2012-11-30 20:19:37 -08:00
Dirk Dougherty
0173056f47
am 3e847379
: am 6e181e99
: am 2b61bc38
: am e0dceabd
: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
...
* commit '3e847379aa6ece5cf991b8b0039a55443de40e6b':
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
2012-11-30 15:52:32 -08:00
Scott Main
1d333b1784
am da65c4c3
: am cdb4807e
: am 0504ec1e
: am ac71b2b5
: docs: revisions for google reference nav
...
* commit 'da65c4c30222f90ba52fa65ec9e9a0095b7caf8c':
docs: revisions for google reference nav
2012-11-30 15:52:22 -08:00
Dirk Dougherty
6e181e9942
am 2b61bc38
: am e0dceabd
: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
...
* commit '2b61bc38ee3221446a62314f8e830e0228026e86':
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
2012-11-30 15:43:14 -08:00
Scott Main
cdb4807e64
am 0504ec1e
: am ac71b2b5
: docs: revisions for google reference nav
...
* commit '0504ec1e80d6eb40fa9b7d3a25da9f9b82b703aa':
docs: revisions for google reference nav
2012-11-30 15:41:14 -08:00
Dirk Dougherty
e0dceabdd8
Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev
2012-11-30 15:39:03 -08:00
Scott Main
ac71b2b59b
docs: revisions for google reference nav
...
Change-Id: I9befa502a3ce30ab6cca7d45ce1bb469930c14ed
2012-11-30 14:58:24 -08:00
Robert Ly
bfba2df684
am 54ab8f4f
: am bcd7ba84
: am ee9dea65
: am 8acd75aa
: add google class for body
...
* commit '54ab8f4f52261f074cab5e3b513c610be4a717c5':
add google class for body
2012-11-30 14:38:12 -08:00
Robert Ly
bcd7ba840c
am ee9dea65
: am 8acd75aa
: add google class for body
...
* commit 'ee9dea657ab7cb3fa4308f7ee8a7609b40907df1':
add google class for body
2012-11-30 14:35:42 -08:00
Robert Ly
8acd75aa04
add google class for body
...
Change-Id: Ie809df1d207ec08ae232f4ae194959eac69ec5fb
2012-11-30 14:02:43 -08:00
Scott Main
ef1930ed7e
am 06820a3a
: am f5df12fc
: am cddbc098
: am 5747d38a
: enforce margin change for nolist class in training articles
...
* commit '06820a3adbd6c5e67ae4b21235ff73cf4a06d46a':
enforce margin change for nolist class in training articles
2012-11-30 13:25:56 -08:00
Scott Main
f97ad3dba9
am b09a0447
: am 529e7ca4
: am 1e2934b0
: am 4e477d7b
: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
...
* commit 'b09a04476ccb169163ff80fef97360b928ef3ce7':
docs/css: break words that are too long to fit sidenav; add style for google javadocs
2012-11-30 13:25:55 -08:00
Robert Ly
e520c82a8c
am 3339ad12
: am b2542514
: am ef8764da
: am d2dd6e58
: add support for gms javadocs
...
* commit '3339ad12e114511dcf3bfd6ed187b762a9c1b99a':
add support for gms javadocs
2012-11-30 13:25:54 -08:00
Scott Main
f5df12fcba
am cddbc098
: am 5747d38a
: enforce margin change for nolist class in training articles
...
* commit 'cddbc0985319a1f6e2279121cfbd3b873b8b71c6':
enforce margin change for nolist class in training articles
2012-11-30 13:17:03 -08:00
Scott Main
529e7ca47a
am 1e2934b0
: am 4e477d7b
: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
...
* commit '1e2934b048a36b8172715893193a84bde8667b00':
docs/css: break words that are too long to fit sidenav; add style for google javadocs
2012-11-30 13:17:02 -08:00
Robert Ly
b25425148d
am ef8764da
: am d2dd6e58
: add support for gms javadocs
...
* commit 'ef8764da3a4290edabf4ae2cb4e36d90a6cddcfd':
add support for gms javadocs
2012-11-30 13:17:01 -08:00
Dirk Dougherty
18dca5d058
Doc template change: exclude articles from logic to add "prev/next" nav in training docs.
...
Change-Id: I384c5c5df053d9e98fa953c2e3998e7c99c08569
2012-11-30 12:44:40 -08:00
Scott Main
5747d38aad
enforce margin change for nolist class in training articles
...
Change-Id: I7da486d557c3d7629827d2b425fd387366bd7f18
2012-11-30 12:02:42 -08:00
Scott Main
4e477d7b9c
Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev
2012-11-30 11:32:42 -08:00
Scott Main
ab4daf4f58
docs/css: break words that are too long to fit sidenav; add style for google javadocs
...
Change-Id: I69f062c5e1ddeafdae75e8f2ec77226aac836e48
2012-11-30 11:27:17 -08:00
Robert Ly
d2dd6e5825
add support for gms javadocs
...
Change-Id: Ieecf09794373a176430f554f39e1c632a7013519
2012-11-30 03:22:25 -08:00
Robert Ly
890658429d
am e76962d8
: am 9cdd3ca5
: am b3748f31
: am 40e90998
: add google services tab
...
* commit 'e76962d8d3e84ed2f1593d341d294aa20e824f3b':
add google services tab
2012-11-29 14:36:42 -08:00
Robert Ly
9cdd3ca577
am b3748f31
: am 40e90998
: add google services tab
...
* commit 'b3748f317af6f19447763489800576c23a244544':
add google services tab
2012-11-28 18:18:37 -08:00
Robert Ly
40e9099805
add google services tab
...
Change-Id: Ia5b249b825c33334458a6762be2d62b657bc0d58
2012-11-28 17:58:58 -08:00
Scott Main
c86e4f3f2c
am e6f3c033
: am 36f6da28
: am 7942a936
: am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit 'e6f3c0332169a795e25f221f91db59ce87aa1f51':
add 'external-link' class for links that go off-site
2012-11-28 11:18:48 -08:00
Scott Main
36f6da2830
am 7942a936
: am d4cb7831
: add \'external-link\' class for links that go off-site
...
* commit '7942a936797e414adbe71a022a1053d8e7ac156c':
add 'external-link' class for links that go off-site
2012-11-28 11:15:20 -08:00
Scott Main
d4cb783159
add 'external-link' class for links that go off-site
...
Change-Id: I9e78cd6a7cb2ce14e5e15fe43e87b55ac456f302
2012-11-28 11:10:09 -08:00
Robert Ly
b16c36ed81
am 44686feb
: am 1e351764
: am 50a8ce10
: am 7d131e0a
: fix build
...
* commit '44686feb7b4a7cc3245c0561f3e9b0809f233d07':
fix build
2012-11-27 18:44:11 -08:00
Scott Main
4b10b491b6
am 32bde8fd
: am 0a7c8e2b
: am 1aace7da
: am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '32bde8fd70fa23cbd9a39ef5d624ff1f1b51ac58':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 18:43:34 -08:00
Robert Ly
1e35176462
am 50a8ce10
: am 7d131e0a
: fix build
...
* commit '50a8ce108bee7b530eaf25624d3f20ffbab76253':
fix build
2012-11-27 17:35:16 -08:00
Robert Ly
7d131e0ad6
fix build
...
Change-Id: I3e98493aac48b0061d44351fb8c0f07a759b25c0
2012-11-27 17:27:34 -08:00
Scott Main
0a7c8e2be1
am 1aace7da
: am 502c939f
: docs: add support for an infinite number of nested lists in side nav
...
* commit '1aace7da06b4f9d4c5024a18accf99b2e4be0fb3':
docs: add support for an infinite number of nested lists in side nav
2012-11-27 15:10:17 -08:00
Scott Main
502c939f6d
docs: add support for an infinite number of nested lists in side nav
...
Change-Id: I9e0fa672e20067f3e09f56560e7d11847d0b9388
2012-11-27 15:00:40 -08:00
Ying Wang
a7c8f72b40
Use the correct size key
...
At this point, userdata_size has been converted to partition_size in
build_image.ImagePropFromGlobalDict().
Change-Id: Ida6be1905ca3109c2660274a16359a9f3fbcd94d
2012-11-27 11:29:11 -08:00
Ying Wang
69e9b4d6d1
Run e2fsck on built sparse images.
...
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-11-27 09:57:17 -08:00
The Android Open Source Project
a2314e433e
Merge jb-mr1-dev into aosp/master - do not merge
...
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
Ying Wang
4e3f44f356
Skip userdata.img if no size is provided when building images from target files
...
Change-Id: Iab5c510fcc7608c4b109781e6595ab8964f4c543
2012-11-19 10:38:44 -08:00
Scott Main
c7d97577cb
am 691369bd
: am 287d1e42
: am 6a040270
: am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '691369bd6e8e5fd78d44e5f5ed33e1bbea24300d':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 11:37:35 -08:00
Scott Main
287d1e42b4
am 6a040270
: am 34a4b823
: Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
...
* commit '6a0402701ee9672ef57f3049c3e6d7f5c01095b6':
docs: revise message when api level for docs is too low; make the message appear on package pages as well
2012-11-16 10:48:50 -08:00
Scott Main
34a4b8239e
Merge "docs: revise message when api level for docs is too low; make the message appear on package pages as well" into jb-mr1-dev
2012-11-16 10:43:23 -08:00
Scott Main
88181cf628
am 932682e6
: am 9ade5e79
: am 1f0850ee
: am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '932682e61981cc7c91dc9d5bc291c6d98cd83c28':
docs: add script for 32/64-bit bundle downloads
2012-11-16 10:42:43 -08:00
Scott Main
8f24ca8e3b
docs: revise message when api level for docs is too low;
...
make the message appear on package pages as well
Change-Id: I9e71d4054e2e14efe9646029ac0a18022ec24fb2
2012-11-16 10:34:22 -08:00
Scott Main
508d4a42e0
am 234fa617
: am aa09fda2
: am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '234fa6175ce16bc64dca65e52ebbfe6465b8d75a':
add script to generate list of classes for each training course landing page
2012-11-16 09:35:57 -08:00
Scott Main
9ade5e7987
am 1f0850ee
: am 11ac05bb
: docs: add script for 32/64-bit bundle downloads
...
* commit '1f0850ee04dcb54e0969f40f692ae00f1da5843b':
docs: add script for 32/64-bit bundle downloads
2012-11-15 15:23:43 -08:00
Scott Main
11ac05bb01
docs: add script for 32/64-bit bundle downloads
...
Change-Id: I502e4ced8ac30cc19bf321e7a586f28244bf1294
2012-11-15 15:18:05 -08:00
Scott Main
aa09fda25e
am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '2dc85a0fe0a9a01843b74945aeda9195e44869c2':
add script to generate list of classes for each training course landing page
2012-11-14 17:44:57 -08:00
Scott Main
83cd28b354
am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '9efb6b09c4a32cc5cd190a224d15022968859ddb':
add script to generate list of classes for each training course landing page
2012-11-14 17:40:58 -08:00
Scott Main
9efb6b09c4
am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit 'be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
add script to generate list of classes for each training course landing page
2012-11-14 17:39:42 -08:00
Scott Main
5a1123ef7a
add script to generate list of classes for each training course landing page
...
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
2012-11-14 17:31:07 -08:00
Scott Main
e94ed26cc4
am 1e94081f
: am c264f9eb
: am 912ed02b
: am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit '1e94081f55d015f89409adeacf9ea531a30465fe':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:20:08 -08:00
Scott Main
c264f9eb78
am 912ed02b
: am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit '912ed02b53c1c656df1b92a6a2518f48b8be9832':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:15:25 -08:00
Scott Main
7c05b69c0c
docs: add warning message for adt when on 32-bit os
...
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
2012-11-14 14:12:29 -08:00
Scott Main
4c7a2448f3
am eeb8d64a
: am ee217260
: am 4e9b723f
: am 098d8dea
: docs: add support for ndk tos wall
...
* commit 'eeb8d64ad1a95c9e3105081a568a85452bc11796':
docs: add support for ndk tos wall
2012-11-13 11:48:12 -08:00
Scott Main
ee2172600b
am 4e9b723f
: am 098d8dea
: docs: add support for ndk tos wall
...
* commit '4e9b723f694b4713bdc30e8019b82b43b1217bae':
docs: add support for ndk tos wall
2012-11-13 11:44:46 -08:00
Scott Main
098d8deaef
docs: add support for ndk tos wall
...
Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238
2012-11-13 11:40:42 -08:00
Scott Main
147b1eedc5
am 1f45897e
: am 8853adf3
: am 3894b39e
: am df0e1617
: docs: css fix
...
* commit '1f45897eec97db1a9aefb77d7ebe7adbfccefe19':
docs: css fix
2012-11-13 08:00:39 -08:00
Scott Main
0803856408
am 89b3781b
: am 14db0ea5
: am 6f4d588f
: am e0c11a6f
: docs: fix broken template
...
* commit '89b3781b3108ef67c8bb027949bf7d72c5e02391':
docs: fix broken template
2012-11-13 08:00:38 -08:00
Scott Main
8853adf399
am 3894b39e
: am df0e1617
: docs: css fix
...
* commit '3894b39ec39d0ae1ba165753fb50373db4bd8077':
docs: css fix
2012-11-13 07:56:55 -08:00
Scott Main
14db0ea5f2
am 6f4d588f
: am e0c11a6f
: docs: fix broken template
...
* commit '6f4d588faa0cef536970f1a227c0f1b41eced1e7':
docs: fix broken template
2012-11-13 07:55:32 -08:00
Scott Main
54694dc394
am 15be76c6
: am b2adfb7f
: am f528f430
: am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit '15be76c687a08d5da04c80fc743a04b6e87a4b50':
docs: add support for templated tabs with the doc title
2012-11-13 07:54:43 -08:00
Scott Main
df0e161703
docs: css fix
...
Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803
2012-11-13 07:52:20 -08:00
Scott Main
b2adfb7fd2
am f528f430
: am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit 'f528f4307df61565ec70cc59776949f1b826878a':
docs: add support for templated tabs with the doc title
2012-11-13 07:48:39 -08:00
Scott Main
e0c11a6f9a
docs: fix broken template
...
Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301
2012-11-13 07:47:50 -08:00
Scott Main
bbffb4bfb4
docs: add support for templated tabs with the doc title
...
Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0
2012-11-13 07:40:16 -08:00
Scott Main
a670481671
am af057169
: am f1468dcd
: am 896f9ec9
: am 705e8a4f
: docs: something whatever
...
* commit 'af057169b7a6a6210bdf143b5f3a578c25a22722':
docs: something whatever
2012-11-13 06:30:32 -08:00
Scott Main
f1468dcd54
am 896f9ec9
: am 705e8a4f
: docs: something whatever
...
* commit '896f9ec991a9d92f0a35129347ec1cb85661880c':
docs: something whatever
2012-11-13 06:25:23 -08:00
Scott Main
705e8a4f61
docs: something whatever
...
Change-Id: I08120f1e27a488dfec03868758ab6de2e75fdc09
2012-11-13 05:36:12 -08:00
Scott Main
97a0ceea1c
am 8626ef53
: am c1b5b417
: am deac4de5
: am 55d99832
: docs: changes to sdk page and script for toggles
...
* commit '8626ef534efdbce8f3817b177072e6a16ea050d1':
docs: changes to sdk page and script for toggles
2012-11-13 02:37:52 -08:00
Scott Main
c1b5b41784
am deac4de5
: am 55d99832
: docs: changes to sdk page and script for toggles
...
* commit 'deac4de56e3cdddabeeb6d4f8d4aea9e34ab11e3':
docs: changes to sdk page and script for toggles
2012-11-13 02:32:41 -08:00
Scott Main
55d99832fd
docs: changes to sdk page and script for toggles
...
Change-Id: Idef0c6099885cada3a4866ed7b5ec5b6f5078e39
2012-11-12 23:03:59 -08:00
Scott Main
1803ca3c1a
am daf5e757
: am 112f0758
: am 0a6deb1c
: am 8fa72222
: am 2953f0b0
: am fef18c61
: am db3678bc
: add ADT Bundle to the download page
...
* commit 'daf5e757a7d0f194b29846cb4e2b219bda57818e':
add ADT Bundle to the download page
2012-11-12 18:14:57 -08:00
Scott Main
112f075843
am 0a6deb1c
: am 8fa72222
: am 2953f0b0
: am fef18c61
: am db3678bc
: add ADT Bundle to the download page
...
* commit '0a6deb1c69fc9f557330cde804dea3ff82fdf74f':
add ADT Bundle to the download page
2012-11-12 18:11:01 -08:00
Scott Main
8fa7222241
am 2953f0b0
: am fef18c61
: am db3678bc
: add ADT Bundle to the download page
...
* commit '2953f0b0b1fcd350ff269b611a2b43fa62773943':
add ADT Bundle to the download page
2012-11-12 18:07:58 -08:00
Scott Main
2953f0b0b1
am fef18c61
: am db3678bc
: add ADT Bundle to the download page
...
* commit 'fef18c61f5146d1a2eb7ed1f48bf5aaa2af08923':
add ADT Bundle to the download page
2012-11-12 18:06:25 -08:00
Scott Main
db3678bcaa
add ADT Bundle to the download page
...
Change-Id: Ife533a32e29f2d5f1c58a42ad0b91c5053b44da4
2012-11-12 18:00:23 -08:00
Robert Ly
4f852704bd
am 16204b6a
: am 78377bcd
: am 5a6e2407
: am 0900e42e
: am 12e6b988
: am e896e344
: Merge "add css animation videos" into jb-dev-docs
...
* commit '16204b6af7303fcaffb5caa9b7fa4be4587743c4':
add css animation videos
2012-11-01 17:40:38 -07:00
Robert Ly
78377bcd1a
am 5a6e2407
: am 0900e42e
: am 12e6b988
: am e896e344
: Merge "add css animation videos" into jb-dev-docs
...
* commit '5a6e24074851fba5fb40b4f453d1a18852053ffa':
add css animation videos
2012-11-01 17:36:06 -07:00
Robert Ly
5a6e240748
am 0900e42e
: am 12e6b988
: am e896e344
: Merge "add css animation videos" into jb-dev-docs
...
* commit '0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos
2012-11-01 17:33:03 -07:00
Robert Ly
0900e42e48
am 12e6b988
: am e896e344
: Merge "add css animation videos" into jb-dev-docs
...
* commit '12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos
2012-11-01 17:31:20 -07:00
Robert Ly
e896e34471
Merge "add css animation videos" into jb-dev-docs
2012-11-01 17:26:34 -07:00
Robert Ly
d78354d35b
add css animation videos
...
Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24
2012-11-01 17:13:44 -07:00
Scott Main
adf4d478d9
am 7a287372
: am cee5107c
: am 4e51d8e6
: am 4810a244
: am 71e20e2e
: am ef4d1081
: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '7a28737222067c2bf12c261bc5502a0fd77c67c2':
update class header for deprecated info
2012-10-24 19:45:40 -07:00
Scott Main
cee5107cf6
am 4e51d8e6
: am 4810a244
: am 71e20e2e
: am ef4d1081
: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '4e51d8e6d5084a1c9133137e65a36d8e9e0c8cc1':
update class header for deprecated info
2012-10-24 19:40:45 -07:00
Scott Main
4e51d8e6d5
am 4810a244
: am 71e20e2e
: am ef4d1081
: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '4810a2440c5b9a890f653602164c72c8d0e86750':
update class header for deprecated info
2012-10-24 19:38:51 -07:00
Scott Main
4810a2440c
am 71e20e2e
: am ef4d1081
: Merge "update class header for deprecated info" into jb-dev-docs
...
* commit '71e20e2e562957681fdd3965dfc308edcbafa31f':
update class header for deprecated info
2012-10-24 19:35:37 -07:00
Scott Main
ef4d10811a
Merge "update class header for deprecated info" into jb-dev-docs
2012-10-24 19:31:25 -07:00
Scott Main
27ac66542a
update class header for deprecated info
...
Change-Id: I4c41f0bdbac43dc49c99af7bcb5521f7e3278304
2012-10-24 18:50:46 -07:00
Dirk Dougherty
9473c1e30f
am dab9a7a1
: am 37fdea96
: am db9ad2da
: am 80ebbc3c
: am 1a13c317
: am a4375a19
: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
...
* commit 'dab9a7a1029242a6d7a8250f9e9bd22ce95b84f5':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:47:17 -07:00
Dirk Dougherty
37fdea969f
am db9ad2da
: am 80ebbc3c
: am 1a13c317
: am a4375a19
: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
...
* commit 'db9ad2da9efbd5aa614f72a820edf6c1b1cfaf4b':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:42:41 -07:00
Dirk Dougherty
db9ad2da9e
am 80ebbc3c
: am 1a13c317
: am a4375a19
: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
...
* commit '80ebbc3c5fde6d653c92a0288e1967f519b9c9ef':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:39:55 -07:00
Dirk Dougherty
80ebbc3c5f
am 1a13c317
: am a4375a19
: Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
...
* commit '1a13c317627996234a1dfa2c0736733bd1c4c696':
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
2012-10-24 13:38:19 -07:00
Dirk Dougherty
a4375a19c6
Merge "Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*." into jb-dev-docs
2012-10-24 13:33:40 -07:00
Scott Main
c7eda3e964
am de42d4b0
: am f98bd743
: am bd027cd4
: am ab84504b
: am 6613a232
: am 0e585706
: fix spacing in carousel text for Develop homepage
...
* commit 'de42d4b0bfc79760eb05eb29dd44d159903530ac':
fix spacing in carousel text for Develop homepage
2012-10-22 20:43:36 -07:00
Scott Main
f98bd74319
am bd027cd4
: am ab84504b
: am 6613a232
: am 0e585706
: fix spacing in carousel text for Develop homepage
...
* commit 'bd027cd4e79b281dc414e170ada4f92bd580dbf0':
fix spacing in carousel text for Develop homepage
2012-10-22 20:40:31 -07:00
Scott Main
bd027cd4e7
am ab84504b
: am 6613a232
: am 0e585706
: fix spacing in carousel text for Develop homepage
...
* commit 'ab84504b8a9e24b15af916faa95dcf65685a22a3':
fix spacing in carousel text for Develop homepage
2012-10-22 20:37:56 -07:00
Scott Main
ab84504b8a
am 6613a232
: am 0e585706
: fix spacing in carousel text for Develop homepage
...
* commit '6613a2327512f3742d55cf0eb79fc4d52cf9a7cb':
fix spacing in carousel text for Develop homepage
2012-10-22 20:35:42 -07:00
Scott Main
0e585706f0
fix spacing in carousel text for Develop homepage
...
Change-Id: If8f95e66b4c1b4918b0d1dea59241d5a17acbfd9
2012-10-22 20:30:22 -07:00
Joe Onorato
8858d2a731
Add a tool to let you enforce layering between packages in a java module.
...
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-20 17:25:55 -07:00
Joe Onorato
0eccce99d7
Add a tool to let you enforce layering between packages in a java module.
...
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-18 10:21:46 -07:00
Doug Zongker
b5f1d8bdc3
add multiple key support to signapk
...
Support signing .apks (but not OTA packages) with multiple keys.
Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
2012-10-16 09:44:09 -07:00
Dirk Dougherty
2297ace604
Doc change: clean up a few stray css files. These are moved to frameworks/base/docs/image_sources/*.
...
Change-Id: I5a14bae715187c3d9307b39394f1b53d4fed39dd
2012-10-13 17:32:23 -07:00
Dirk Dougherty
2103600410
am 9f81546a
: am fc8cec68
: am afc782da
: am 77b10b6a
: am e37b7a52
: am 8f20607c
: Doc change: add new items to qv and adjust height.
...
* commit '9f81546a25b9228a0ccd55d16478d9a0beed5a85':
Doc change: add new items to qv and adjust height.
2012-10-11 17:54:25 -07:00
Dirk Dougherty
afc782da46
am 77b10b6a
: am e37b7a52
: am 8f20607c
: Doc change: add new items to qv and adjust height.
...
* commit '77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
Doc change: add new items to qv and adjust height.
2012-10-11 16:57:43 -07:00
Dirk Dougherty
77b10b6a78
am e37b7a52
: am 8f20607c
: Doc change: add new items to qv and adjust height.
...
* commit 'e37b7a52abb488f853fefa1a13eec1b5c20844a6':
Doc change: add new items to qv and adjust height.
2012-10-11 15:33:05 -07:00
Dirk Dougherty
8f20607ccb
Doc change: add new items to qv and adjust height.
...
Change-Id: I246c36e0aabb32264325e0943aed127419da2a73
2012-10-11 15:29:33 -07:00
Robert Ly
0a0e4a6990
update pdk build templates
...
Change-Id: Ibda42779827a337ed0bc1c5797ce2b5b50d4686a
2012-10-09 12:11:08 -07:00
Robert Ly
c22207f8a5
fix pdk docs build
...
Change-Id: I8c6e769d08247ce93823e4c59a55cd90b9c08e38
2012-10-09 10:33:27 -07:00
Scott Main
1a7b450c82
am 505fae2a
: am 3dd2756e
: am d73053a8
: am b282c359
: am 126c5e92
: am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit '505fae2ae4a1bf649cc488d4832ef5d43b127ccb':
fix layout bug on API Guide landing pages
2012-10-08 16:23:05 -07:00
Scott Main
d73053a814
am b282c359
: am 126c5e92
: am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc
am 126c5e92
: am e6850d2d
: fix layout bug on API Guide landing pages
...
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
Scott Main
e6850d2db7
fix layout bug on API Guide landing pages
...
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
2012-10-08 15:59:01 -07:00
Scott Main
180f901b6c
am 919a2f88
: am 0d24628c
: am be1df522
: am ded6dc01
: am 86028756
: am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit '919a2f88efbbce3a83bd497b52aa1b35f1d5e5da':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:47:24 -07:00
Scott Main
be1df522a9
am ded6dc01
: am 86028756
: am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit 'ded6dc0137fb0632f9de47870fb923567ea22b17':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:41:59 -07:00
Scott Main
ded6dc0137
am 86028756
: am 46c5804c
: add analytics tracking event for sdk/ndk downloads
...
* commit '860287560db20e6f46a282284d8a04d5e001d2ea':
add analytics tracking event for sdk/ndk downloads
2012-10-03 17:40:45 -07:00
Scott Main
46c5804c47
add analytics tracking event for sdk/ndk downloads
...
Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605
2012-10-03 16:34:52 -07:00
Scott Main
75277754d2
am 71507e9b
: am cd67e0e1
: am 8cb3263d
: am 55b19bdd
: am 9341d398
: am a4888dc8
: adjust position of prev/next links at bottom of page to account for russian string length
...
* commit '71507e9b627f1607e3b9218439212c3571cff989':
adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:38:22 -07:00
Scott Main
8cb3263dd0
am 55b19bdd
: am 9341d398
: am a4888dc8
: adjust position of prev/next links at bottom of page to account for russian string length
...
* commit '55b19bddcc6dfe750a1df70fe9955a42701f0007':
adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:32:42 -07:00
Scott Main
55b19bddcc
am 9341d398
: am a4888dc8
: adjust position of prev/next links at bottom of page to account for russian string length
...
* commit '9341d398a87fd9679366fafbbc398601c4c01de4':
adjust position of prev/next links at bottom of page to account for russian string length
2012-10-02 23:31:34 -07:00
Scott Main
a4888dc865
adjust position of prev/next links at bottom of page to account for russian string length
...
Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13
2012-10-02 23:28:08 -07:00
Scott Main
f3d0104a80
DO NOT MERGE
...
cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
provide more width for buttons in training top nav to accomodate longer
strings from translation
Change-Id: Ia1d8f7caa532ad1060d8a54fda082ada754c1f48
2012-10-02 21:02:22 -07:00
Scott Main
6eb95f1ac8
DO NOT MERGE
...
cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
refactor the logic for changing languages in global strings.
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.
Change-Id: I09c65a8dce9b3d9623e32fe17876b055e452618b
2012-10-02 21:00:53 -07:00
Scott Main
aa2ce5d9aa
DO NOT MERGE
...
cherrypick from jb-dev Change-Id: I90412e1e03a2676d927796187fe811481bf38455
add localize langs for global strings
Change-Id: I02b6c5b5d83247a352dc041e9885befe82502adc
2012-10-02 20:58:34 -07:00
Scott Main
24bbcd5026
DO NOT MERGE
...
cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
add style for code captions;
ignore sidenav headers for HRs
Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407
2012-10-02 20:56:56 -07:00
Scott Main
52948fcf8c
DO NOT MERGE
...
cherrypick from jb-dev Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
create consistent spacing between lists and the paragraphs within them
Change-Id: I4977e4f6f34c7fb8605c861ebb4b33895f630977
2012-10-02 20:53:11 -07:00
Scott Main
295032846a
am 858ea183
: am a67b7aa5
: am b61c601b
: am 2452b062
: am 0c81a130
: provide more width for buttons in training top nav to accomodate longer strings from translation
...
* commit '858ea18338b9d756f24ba976cf5de18c6527c933':
provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:47:32 -07:00
Scott Main
b61c601b57
am 2452b062
: am 0c81a130
: provide more width for buttons in training top nav to accomodate longer strings from translation
...
* commit '2452b0625c18bb11a37eb9216078a83f41971240':
provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:42:29 -07:00
Scott Main
2452b0625c
am 0c81a130
: provide more width for buttons in training top nav to accomodate longer strings from translation
...
* commit '0c81a130ef01981a0cbc3564c26658c51951812d':
provide more width for buttons in training top nav to accomodate longer strings from translation
2012-10-02 20:40:14 -07:00
Scott Main
80814582e4
am 8d50101b
: am bb179ed6
: am cbefa644
: am b649b416
: am 235f4d4f
: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that
...
* commit '8d50101b3e7f643771f2410a8fc178c53d771430':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:37:41 -07:00
Scott Main
0c81a130ef
provide more width for buttons in training top nav to accomodate longer
...
strings from translation
Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
2012-10-02 20:36:45 -07:00
Scott Main
cbefa6445e
am b649b416
: am 235f4d4f
: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
...
* commit 'b649b41604822cc0c9c32b3bc98233a8ab1148c9':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:32:11 -07:00
Scott Main
b649b41604
am 235f4d4f
: refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link\'s title.
...
* commit '235f4d4f8580a56d553e19c1beab1f8c22132e84':
refactor the logic for changing languages in global strings. instead of using separate <span> elements for each language, provide a unique attribute in each <a> element for each localized version of that link's title.
2012-10-02 20:29:45 -07:00
Scott Main
235f4d4f85
refactor the logic for changing languages in global strings.
...
instead of using separate <span> elements for each language,
provide a unique attribute in each <a> element for each localized
version of that link's title.
Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
2012-10-02 17:44:42 -07:00
Scott Main
04874a5486
am 4a19942e
: am ca1ee0fd
: am 817c0882
: am 74811834
: am dd3d3eea
: add localize langs for global strings
...
* commit '4a19942ef99ec05f82a21a80ca0ca0094f646f78':
add localize langs for global strings
2012-10-02 14:54:33 -07:00
Scott Main
817c088203
am 74811834
: am dd3d3eea
: add localize langs for global strings
...
* commit '748118343d76ed8b48c7b9ff48cbed8e2ab44ebb':
add localize langs for global strings
2012-10-02 14:49:07 -07:00
Scott Main
748118343d
am dd3d3eea
: add localize langs for global strings
...
* commit 'dd3d3eea1d953e4a174edb6e75cfdf0fcf03060f':
add localize langs for global strings
2012-10-02 14:47:52 -07:00
Scott Main
dd3d3eea1d
add localize langs for global strings
...
Change-Id: I90412e1e03a2676d927796187fe811481bf38455
2012-10-02 14:44:54 -07:00
Scott Main
01b73267b4
am 9b423a82
: am 57a0a4c1
: am dcce7ca6
: am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit '9b423a82d823f3516fcd969ac2cbc6c04e04e281':
add style for code captions; ignore sidenav headers for HRs
2012-09-24 00:49:45 -07:00
Scott Main
57a0a4c1fe
am dcce7ca6
: am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit 'dcce7ca6a82cf08a7047d0fd23ba05b47be831c1':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:56:35 -07:00
Scott Main
dcce7ca6a8
am 582db97b
: add style for code captions; ignore sidenav headers for HRs
...
* commit '582db97b23982f8e9cac7926ac3f5806b6a9cc71':
add style for code captions; ignore sidenav headers for HRs
2012-09-21 14:54:09 -07:00
Scott Main
582db97b23
add style for code captions;
...
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
2012-09-21 14:33:43 -07:00
Keun young Park
b7eb93d4b9
am 62526137
: am fe1d3b12
: Merge "fix PDK build" into jb-mr1-dev
...
* commit '62526137891e38aceb8562459a85eef1a73c3856':
fix PDK build
2012-09-20 15:46:14 -07:00
Keun young Park
6530b38d7c
fix PDK build
...
- build tools not coming from prebuilts for PDK
Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f
2012-09-20 14:31:17 -07:00
Doug Zongker
b8a35577d7
am 85c118b1
: am c4d68391
: Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
...
* commit '85c118b1323a954786cb36f47fbfab9515a7950a':
fix merge-event-log-tags.py deprecation warning
2012-09-20 12:52:51 -07:00
Ying Wang
b1337dce87
am 47424a68
: am 295cf570
: Use prebuilt for PDK builds.
...
* commit '47424a686f0ccb7413d54ebae7288f2e4e02b64e':
Use prebuilt for PDK builds.
2012-09-20 12:52:50 -07:00
Doug Zongker
c4d68391cc
Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
2012-09-20 12:02:24 -07:00
Doug Zongker
6ce87a1fc8
fix merge-event-log-tags.py deprecation warning
...
Prefer using the hashlib module if it's available, instead of the
deprecated md5 module.
Change-Id: Id5e50af125ae47f34d011d8612059424472c7c3f
2012-09-20 11:50:34 -07:00
Ying Wang
295cf570d6
Use prebuilt for PDK builds.
...
Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d
2012-09-20 10:37:39 -07:00
Ying Wang
6ea43e3cf8
am 61ff681b
: am 4da2f9ca
: Use prebuilt signapk.jar for unbundled branch.
...
* commit '61ff681bb2791479ff54de33732e4351db5328d4':
Use prebuilt signapk.jar for unbundled branch.
2012-09-20 06:19:00 -07:00
Doug Zongker
3b53120004
am b4a914ed
: am 147626e6
: change SignApk.java to use bouncy castle for signing
...
* commit 'b4a914ed19c37680d914dc4c214f92752eaa06dd':
change SignApk.java to use bouncy castle for signing
2012-09-20 06:18:58 -07:00
Ying Wang
4da2f9caaa
Use prebuilt signapk.jar for unbundled branch.
...
Change-Id: I762b23931042f7ffde829aaf928f54df46a49d78
2012-09-19 17:51:21 -07:00
Doug Zongker
147626e624
change SignApk.java to use bouncy castle for signing
...
Remove use of the private sun.security.* classes for generating pkcs7
signatures and use bouncy castle instead.
Change-Id: Ie8213575461975085d119e000e764d2a28c26715
2012-09-18 23:29:10 -07:00
Scott Main
a7f07b5112
am 496d88cd
: am 8cf60ec1
: am 5acbfcf6
: am 7039b4a7
: create consistent spacing between lists and the paragraphs within them
...
* commit '496d88cdc099153bbeadcfec7d6c8fbe6944fa31':
create consistent spacing between lists and the paragraphs within them
2012-09-18 17:16:14 -07:00
Scott Main
8cf60ec166
am 5acbfcf6
: am 7039b4a7
: create consistent spacing between lists and the paragraphs within them
...
* commit '5acbfcf66aa60908213522a6b69b41f4b69f6f8e':
create consistent spacing between lists and the paragraphs within them
2012-09-18 15:54:12 -07:00
Scott Main
5acbfcf66a
am 7039b4a7
: create consistent spacing between lists and the paragraphs within them
...
* commit '7039b4a7bca269a898aacad9ddde693598ccecfc':
create consistent spacing between lists and the paragraphs within them
2012-09-18 15:40:02 -07:00
Scott Main
7039b4a7bc
create consistent spacing between lists and the paragraphs within them
...
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
2012-09-18 11:27:59 -07:00
Scott Main
79e7cc286a
am 83fe2784
: am 7d89e1ce
: am 7832dda0
: am 5b5ff1a6
: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
...
* commit '83fe27845c8c062600bb7257bce53c73461ce1bc':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 17:02:27 -07:00
Scott Main
930957f84f
am e276c244
: am b050ed29
: am 5f4e1ac6
: am ee7cb463
: Merge "add \'small\' style for long headings in Training courses" into jb-dev
...
* commit 'e276c2444bbbe185042bf65c4de82e0137681fdf':
add 'small' style for long headings in Training courses
2012-09-12 15:28:41 -07:00
Scott Main
7d89e1ce07
am 7832dda0
: am 5b5ff1a6
: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
...
* commit '7832dda030013a10cf2c161d37025bed5433326e':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 10:36:15 -07:00
Scott Main
7832dda030
am 5b5ff1a6
: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
...
* commit '5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
2012-09-12 10:34:15 -07:00
Scott Main
5b5ff1a6ae
more specific selector for new blockquote style to fix regressions
...
on other pages that use <blockquote>
Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
2012-09-12 10:29:45 -07:00
Scott Main
b050ed294a
am 5f4e1ac6
: am ee7cb463
: Merge "add \'small\' style for long headings in Training courses" into jb-dev
...
* commit '5f4e1ac6ee30784e458df3d90c0950595ad810a6':
add 'small' style for long headings in Training courses
2012-09-11 14:44:07 -07:00
Scott Main
5f4e1ac6ee
am ee7cb463
: Merge "add \'small\' style for long headings in Training courses" into jb-dev
...
* commit 'ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
add 'small' style for long headings in Training courses
2012-09-11 14:42:43 -07:00
Scott Main
ee7cb4637d
Merge "add 'small' style for long headings in Training courses" into jb-dev
2012-09-11 14:41:28 -07:00
Scott Main
6b2dc27c08
add 'small' style for long headings in Training courses
...
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
2012-09-11 14:27:34 -07:00
Scott Main
9f3dcd75c6
am 08a63c1e
: am 243b0dc1
: am 65cdbdcd
: am 65511c0a
: fix script bug. we were running some scripts that are only used in the reference
...
* commit '08a63c1e4b500bda750323bb9ce2e8bfe9392f09':
fix script bug. we were running some scripts that are only used in the reference
2012-09-10 17:08:42 -07:00
Scott Main
243b0dc136
am 65cdbdcd
: am 65511c0a
: fix script bug. we were running some scripts that are only used in the reference
...
* commit '65cdbdcdf09f8884141b2478e1eb4d48397880d9':
fix script bug. we were running some scripts that are only used in the reference
2012-09-07 16:19:11 -07:00
Scott Main
65cdbdcdf0
am 65511c0a
: fix script bug. we were running some scripts that are only used in the reference
...
* commit '65511c0a726751e9973486198086d8db6a141455':
fix script bug. we were running some scripts that are only used in the reference
2012-09-07 16:17:11 -07:00
Scott Main
65511c0a72
fix script bug. we were running some scripts that are only used in the reference
...
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
2012-09-07 15:51:32 -07:00
Conley Owens
aa1e31358a
am ef502c6d
: am 52bd431e
: am d65bb799
: am 86ffa1cd
: am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit 'ef502c6da0933e7eb51ff769a61c8321d51573a1':
Follow symlinks in findleaves
2012-09-04 11:12:56 -07:00
Conley Owens
52bd431e37
am d65bb799
: am 86ffa1cd
: am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit 'd65bb799ab31699067fd3b61b106a067575b154f':
Follow symlinks in findleaves
2012-09-04 11:08:16 -07:00
Conley Owens
86ffa1cd63
am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit '5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
Follow symlinks in findleaves
2012-09-04 10:29:43 -07:00
Conley Owens
d8a3285797
Follow symlinks in findleaves
...
If we replace the project directories with symlinks to the actual
directories, everything should build fine. Unfortunately, without
this fix, it does not.
Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
2012-08-24 16:24:45 -07:00
Jean-Baptiste Queru
8175d1aeb0
am d163c8ed
: am 781a83ae
: am 83af736f
: am 5ac65f86
: Merge "Fix reporting wrong error message for zipalign output file"
...
* commit 'd163c8eda25ff1c2e4de5a981331ab7e77aaeea1':
Fix reporting wrong error message for zipalign output file
2012-08-24 07:38:50 -07:00
Jean-Baptiste Queru
781a83ae12
am 83af736f
: am 5ac65f86
: Merge "Fix reporting wrong error message for zipalign output file"
...
* commit '83af736f28c03bcac552f83bc645433925135c7e':
Fix reporting wrong error message for zipalign output file
2012-08-24 07:30:00 -07:00
Jean-Baptiste Queru
83af736f28
am 5ac65f86
: Merge "Fix reporting wrong error message for zipalign output file"
...
* commit '5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
Fix reporting wrong error message for zipalign output file
2012-08-23 15:09:15 -07:00
Jean-Baptiste Queru
5ac65f8696
Merge "Fix reporting wrong error message for zipalign output file"
2012-08-23 14:52:41 -07:00
Andrew Hsieh
cd3050c541
am 4d69e06b
: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
...
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
2012-08-21 12:58:45 -07:00
Doug Zongker
2f64442926
am 5f0e7aee
: am b32161a2
: change recovery partition construction to use resource .dat
...
* commit '5f0e7aee9d5e91f7e1b039607d5cbb503cf7a3b5':
change recovery partition construction to use resource .dat
2012-08-21 10:54:01 -07:00
Doug Zongker
b32161a2a5
change recovery partition construction to use resource .dat
...
When /system/etc/recovery-resource.dat is available, use it to
construct the recovery-from-boot patch.
Change-Id: I1575f7d284711323186ca6823842eb2a866fd890
2012-08-21 10:33:44 -07:00
Andrew Hsieh
31ef1037bf
Added BUILD_HOST_static to build statically linked executable/shared-lib
...
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
2012-08-21 14:40:16 +08:00
Scott Main
3f7ef927e1
am 024380b9
: am 1e448946
: am 50187e53
: am f5089846
: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
...
* commit '024380b9329fc286f9f8f7f42bb96938f9bff745':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
2012-08-20 17:07:02 -07:00
Scott Main
1e44894605
am 50187e53
: am f5089846
: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
...
* commit '50187e53450fba54131e5d5857e5f05cb6b0e849':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
2012-08-20 17:02:56 -07:00
Scott Main
50187e5345
am f5089846
: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
...
* commit 'f5089846a1876f8e976d4bd1ddf383d3ed68d558':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
2012-08-20 17:01:19 -07:00
Jingwen Owen Ou
303213915d
Fix reporting wrong error message for zipalign output file
...
The problem is due to using variable inFileName instead of outFileName for printing out error message for output file.
Change-Id: Ie53a21b077fea5e7cd106fe6884cea159d2629a2
2012-08-17 16:21:11 -07:00
Doug Zongker
1bd26d3c87
am 18cb0198
: am 6937a447
: Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev
...
* commit '18cb0198efe5fa245765becfd310f801ab7faa39':
load SYSTEM/build.prop into the info_dict
2012-08-17 13:19:54 -07:00
Doug Zongker
6937a44742
Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev
2012-08-17 13:15:28 -07:00
Joe Onorato
cea08a5220
resolved conflicts for merge of 5836d3b3
to jb-mr1-dev
...
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
2012-08-17 00:09:27 -07:00
Joe Onorato
5836d3b3d9
am f72e34eb
: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
...
* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
2012-08-16 23:50:34 -07:00
Joe Onorato
88155422f2
More product debugging.
...
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:45:56 -07:00
Joe Onorato
35f74c479c
host modules don't need LOCAL_MODULE_TAGS
...
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:45:56 -07:00
Joe Onorato
8967523958
Add tool to parse make dependency info from new --deps flag.
...
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:45:55 -07:00
Joe Onorato
b5318d10cb
Use a more modern -j flag.
...
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:45:55 -07:00
Joe Onorato
8b46e302e6
make product-graph now filtered
...
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:45:55 -07:00
Joe Onorato
f3319452ad
More product debugging.
...
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2012-08-16 22:36:41 -07:00
Joe Onorato
b4da6b50fe
host modules don't need LOCAL_MODULE_TAGS
...
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
2012-08-16 22:36:40 -07:00
Joe Onorato
cc788043b7
Add tool to parse make dependency info from new --deps flag.
...
Change-Id: I59a88027d88cceee9f2933c84379612698952043
2012-08-16 22:36:40 -07:00
Joe Onorato
6ea77a2dc8
Use a more modern -j flag.
...
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
2012-08-16 22:36:40 -07:00
Joe Onorato
f5debbfee6
make product-graph now filtered
...
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
2012-08-16 22:36:40 -07:00
Doug Zongker
1eb74dd9a0
load SYSTEM/build.prop into the info_dict
...
Change-Id: Ic747106ba11773ffc9c2eebc163cfd22b1d7a4d5
2012-08-16 16:19:00 -07:00
Robert Ly
fd1eb13b33
pdk templates for docs
...
Change-Id: Ic1f780c0a8b62bf6e989dc4e1876e24e4cb6c179
2012-08-15 15:33:46 -07:00
Scott Main
f5089846a1
docs: combine all possible js files into one to reduce the number of requests
...
Also make change to doc template and css to fix footer layout bug introduced
by change 9edfa6db8c
Change-Id: Icfb1b499abfca6a39b5bff8fab576b14a1cf960a
2012-08-15 14:47:50 -07:00