Scott Main
e104f77318
Merge "docs: modify style for toggle stuff so text isn't blue" into honeycomb
2011-01-31 17:51:13 -08:00
Scott Main
219687b25c
docs: modify style for toggle stuff so text isn't blue
...
Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
2011-01-31 17:24:07 -08:00
The Android Open Source Project
3b6bf4484e
Mass merge from gingerbread - do not merge
...
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Jean-Baptiste Queru
6e47f1cd0c
Merge 66888a7c
from gingerbread
...
Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
2011-01-29 09:24:41 -08:00
Doug Zongker
4f471d48b1
am 79cad63f
: am b54972c9
: Merge "fix check_target_files_signatures" into honeycomb
...
* commit '79cad63f61874f2d6f3fc4f931cd79c2a5f2a9a9':
fix check_target_files_signatures
2011-01-27 10:36:27 -08:00
Doug Zongker
6ae5381670
fix check_target_files_signatures
...
common.UnzipTemp now returns a 2-tuple instead of just a string.
Bug: 3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
2011-01-27 10:20:27 -08:00
Doug Zongker
74c1872875
am bc06b17c
: am 55d93284
: support use of prebuilt bootable images
...
* commit 'bc06b17c82ecfdec70314d45282207a41ea3ee5f':
support use of prebuilt bootable images
2011-01-26 09:56:30 -08:00
Doug Zongker
55d932840f
support use of prebuilt bootable images
...
img_from_target_files now, with the -z flag, will produce an output
zip with only the bootable partitions (boot and recovery).
img_ and ota_from_target_files can take, instead of a simple
"target_files.zip", a name of the form
"target_files.zip+bootable_images.zip", where the second zip contains
bootable images that should be used instead of building them from the
target_files.zip. (This should be the zip produced by the above -z
flag, perhaps with the images messed with in some way, such as by an
unnamed OEM's extra signature wrapper for their "secure boot"
process.)
Bug: 3391371
Change-Id: Iaf96dfc8f30e806ae342dcf3241566e76ae372d4
2011-01-25 17:07:09 -08:00
Doug Zongker
e128cbda07
check syntax of description field in logtags files
...
EventLog.java checks that the field descriptions are bracketed by
parens, so we should to in order to avoid a runtime error from a
logtag entry with bad syntax.
Bug: 3381309
Change-Id: I1d4cbb190da6b81ec0b1f1de9b5bc3f3394d7ec1
2011-01-23 12:57:19 -08:00
Michael Chan
b43ac8fc2f
Fix build break
...
Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775
2011-01-19 21:12:41 -08:00
Ken Sumrall
6f2f23a46f
Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
2011-01-19 17:35:30 -08:00
Ken Sumrall
a67616acfd
Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
...
If making /data and it's an EMMC interface, reserve the last 16 Kbytes
of the partition for the crypto footer.
Change-Id: Ia2c0bb53a545f074e79fc9d6ac04faee75fb9be4
2011-01-19 17:14:51 -08:00
Scott Main
58286dcd1f
fix build
...
Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556
2011-01-17 18:23:21 -08:00
Scott Main
cc08909978
update sdk template... thought this was merged already,
...
but also re-add section for offline preview
Change-Id: I4337f06657603c71e326398dfe7b4d1507252a16
2011-01-17 16:44:10 -08:00
Scott Main
7bc0fb1b32
docs: revise preview statement and links
...
Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3
2011-01-17 16:16:12 -08:00
Scott Main
66888a7c42
docs: update the sdk doc template to remove a bunch of obsolete
...
things and clean up the logic statements for clarity
Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97
2011-01-13 16:35:51 -08:00
Scott Main
0a53dc4984
docs: make only the expando link not-underlined
...
and wait until close animation is done before collapsing the toggle
Change-Id: Ie75f99a5cf5fcc2cbf33bb46a00ce79cd688ce5c
2011-01-12 17:35:53 -08:00
Scott Main
e578119466
docs: implement toggle features for documentation content.
...
There existed another form of this script and styles, but it was not used.
Change-Id: I5d3bf0b4f6b8159e8f837692e9b1613aae140e24
2011-01-12 14:33:58 -08:00
Dirk Dougherty
78064b4c69
Doc change: Remove redundant dir and image.
...
Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7
2011-01-07 17:07:43 -08:00
Scott Main
fd85d42e83
docs: catchup templates to non-merged changes from gingerbread,
...
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo
Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
2011-01-07 12:40:42 -08:00
Scott Main
6ea057563d
resolved conflicts for merge of 1c4fe5aa
to master
...
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
2010-12-06 16:36:53 -08:00
Scott Main
1c4fe5aaff
am dad569b4
: docs: fix link
...
* commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1':
docs: fix link
2010-12-05 19:04:18 -08:00
Scott Main
dad569b4e8
docs: fix link
...
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
2010-12-05 18:03:23 -08:00
Scott Main
b73777e56b
docs: revisions to the sdk doc template for preview sdk,
...
remove ndk download table for offline docs
Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
2010-11-22 16:25:09 -08:00
Scott Main
63e9ccd1d6
docs: revise stylesheet to allow "notes" in divs, not just paragraphs
...
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
2010-11-18 13:54:40 -08:00
Ying Wang
c5a07ce038
Pass extfs sparse image flag to the release tool.
...
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
2010-11-17 17:45:36 -08:00
Scott Main
19c43fea22
docs: add preliminary watermark to docs
...
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
2010-11-16 16:24:42 -08:00
Joe Onorato
25939e224e
Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
...
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
2010-11-09 08:53:01 -08:00
Scott Main
9d1d63e2a7
am 1be24531
: am badffa84
: docs: revise intro to reflect changes to quick start
...
* commit '1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
2010-11-08 19:25:01 -08:00
Scott Main
1be245314d
am badffa84
: docs: revise intro to reflect changes to quick start
...
* commit 'badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
2010-11-08 17:10:25 -08:00
Scott Main
badffa8432
docs: revise intro to reflect changes to quick start
...
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
Scott Main
00c837da0a
am 9f7e7946
: am c775c754
: docs: add gingerbread logo for homepage
...
* commit '9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
2010-11-06 16:25:09 -07:00
Scott Main
d5c09153a7
am 56c69603
: am ec97fd30
: docs: revisions to ndk download intro
...
* commit '56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
2010-11-06 16:24:08 -07:00
Dirk Dougherty
8ad27435f5
Doc change: Merge commit '9561b575' into master
...
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
2010-11-06 16:18:20 -07:00
Scott Main
9f7e794695
am c775c754
: docs: add gingerbread logo for homepage
...
* commit 'c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
2010-11-06 14:21:16 -07:00
Scott Main
c775c754f1
docs: add gingerbread logo for homepage
...
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
Scott Main
56c69603ad
am ec97fd30
: docs: revisions to ndk download intro
...
* commit 'ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
2010-11-05 13:57:15 -07:00
Robert Ly
9561b57543
am 706e41e5
: Update the template text for the NDK download page to point to new links
...
* commit '706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
2010-11-05 13:57:10 -07:00
Scott Main
ec97fd30a6
docs: revisions to ndk download intro
...
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
Robert Ly
706e41e55f
Update the template text for the NDK download page to point to new
...
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
2010-11-04 13:36:37 -07:00
Scott Main
987fb055d1
am 2e94aa25
: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
...
* commit '2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
2010-11-01 20:21:39 -07:00
Scott Main
2e94aa25d4
docs: make the resizable side nav standard. DO NOT MERGE.
...
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
2010-11-01 15:53:06 -07:00
Scott Main
e9e311a47b
am fa83b5e4
: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
...
* commit 'fa83b5e4daf43a431463e80c56fe115a6db3ca04':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:53:08 -07:00
Scott Main
f086a6e434
docs: update sdk download template DO NOT MERGE
...
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -07:00
Scott Main
6084cc948c
am 9d32bd5b
: docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Merge commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
2010-10-25 17:22:50 -07:00
Scott Main
9d32bd5b03
docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -07:00
Scott Main
672066778b
am c0aa1e1b
: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
...
Merge commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp
* commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-15 18:22:09 -07:00
Scott Main
5466af5017
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
...
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Ying Wang
421b46e0cb
resolved conflicts for merge of 18c00c5c
to master
...
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
2010-09-28 10:45:54 -07:00
Ying Wang
18c00c5c6a
am bb2b82bd
: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
...
Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp
* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
2010-09-27 18:05:22 -07:00