Commit graph

678 commits

Author SHA1 Message Date
Scott Main
e59de21b8a am 74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit '74108deaf1747943a493751cbff9de321f1dd397' into froyo-plus-aosp

* commit '74108deaf1747943a493751cbff9de321f1dd397':
  fix css bug for paragraphs in table cells
2010-05-04 18:18:02 -07:00
Scott Main
74108deaf1 fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td

Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
The Android Open Source Project
ae4e14556b merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Alexey Tarasov
73fda1b973 Make expr more POSIXy
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
2010-04-29 14:19:28 -07:00
Bruce Beare
c25e503207 generic_x86 support
Add in Makefiles and support files for x86 builds
  Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
  Additional changes by: Mark Gross <mark.gross@intel.com>
  Additional changes by: Bruce Beare <brucex.j.beare@intel.com>

Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-04-28 16:52:51 -07:00
Doug Zongker
2ea21065b6 add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.

Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
2010-04-28 16:05:51 -07:00
Scott Main
c3d808a727 Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 14:23:04 -07:00
Raphael
4c70244cb1 Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
2010-04-23 13:15:37 -07:00
Scott Main
7f418a518b support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
Scott Main
d72731d213 docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell

Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
2010-04-20 15:35:49 -07:00
Scott Main
f655dab5e6 Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo 2010-04-20 15:34:22 -07:00
Roman Nurik
af23298447 cherry-pick from master: 42092024eb
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
2010-04-19 15:18:41 -07:00
Scott Main
7a0090b316 docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.

Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.

Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
2010-04-16 09:05:06 -07:00
Wu-cheng Li
fcc7cf7799 Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.

bug:2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
2010-04-13 23:49:18 +08:00
Scott Main
7b6cee7653 cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class

Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
2010-04-08 17:32:02 -07:00
Dirk Dougherty
4b2eb9734f cherry-pick db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
2010-03-26 18:59:47 -07:00
Dirk Dougherty
e123385cca cherry-pick fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
2010-03-26 18:56:30 -07:00
Scott Main
84f8a5e2ef docs: remove sidebox-inner style
Change-Id: Ia1e1b10e6756ecf6c9154c2cc25d0dbd58c1907f
2010-03-24 17:20:39 -07:00
Scott Main
b89740f8ba docs: stylesheet change for figure class
Change-Id: I1f47fc70382daf9f14e057a83375cf727fb8afa7
2010-03-24 13:49:49 -07:00
Scott Main
c9be89296a Merge "docs: style tweaks to sidebox and qv classes" 2010-03-24 13:47:22 -07:00
Doug Zongker
7afc97120b Merge "fix typo (leftover from some debugging code)" 2010-03-17 17:46:58 -07:00
Dan Egnor
5fe3b35846 Allow explicit and implicit numbering of the same tag.
Change-Id: I59c24cc211250da7e0aed9e0b0aa16517fd72d55
2010-03-17 16:59:12 -07:00
Doug Zongker
3475d362a7 fix typo (leftover from some debugging code)
Change-Id: I29a42820ccf8567508f1aeefcc89c2462e9ad43c
2010-03-17 16:39:30 -07:00
Scott Main
67c2a965bb docs: style tweaks to sidebox and qv classes
Removes extra whitespace from above the sidebox class and
adjusts the inner padding.

Removes extra whitespace from the right side of the quickview box
to align with the document margin.

Change-Id: I3d37ecc9a251a2c5c4e8d2c2942d05848c698faa
2010-03-16 17:18:24 -07:00
Doug Zongker
283e2a1e1b store filesystem config info in target files at build time
Store a dump of the desired uid/gid/mode for every system file in the
target_files zip.  Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).

b/2516887 - New android_filesystem_config.h needed

Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
2010-03-15 18:04:15 -07:00
Colin Cross
c208ccb73d Merge "Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt" 2010-03-10 18:14:31 -08:00
Marco Nelissen
8e20196b81 Update warn.py with more warnings
Change-Id: Ic65e6effe2be60d6a6c2a53c6acf356ad9e7ea94
2010-03-10 16:16:02 -08:00
Colin Cross
57b03f7613 Use ARCH_ARM_HAVE_ARMV7A to select qemu kernel for dexpreopt
Change-Id: I440d944e87324038e465415b1b71613b31052f99
2010-03-10 16:07:26 -08:00
Doug Zongker
b87e0e1d17 Merge commit '27bb6f5f' into manualmerge 2010-03-01 12:36:07 -08:00
Doug Zongker
27bb6f5f23 add signing checker script to releasetools
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files.  It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.

(This is a backport of a change in froyo.  It does not affect device
code, only the scripts that sign images and OTA packages.)
2010-03-01 12:26:17 -08:00
David 'Digit' Turner
171e0d0003 Temporary fix for ARMv7 -user builds.
This switches the emulator to "single step" emulation mode which is
slower but seems to work-around the current ARMv7 emulation bug.

This allows the dexreopt passes to go through normally.
2010-02-25 14:05:05 -08:00
Doug Zongker
c8d446bcde pass blobs to applypatch in incremental OTAs
applypatch now takes patches as blob-valued arguments instead of just
filenames, eliminating the need to unpack all patches to /tmp before
starting to apply them.

Revert the last change I made where sha1_check(read_file(...)) was
substituted for apply_patch_check(...).  apply_patch_check() knows to
check /cache/saved.file if the original source file is missing or has
a bad checksum, which is important if the device loses power or
otherwise restarts during patching.

Change-Id: Ia5b761474b0f809a5a5eed29455b1b145145699e
2010-02-22 15:41:53 -08:00
Doug Zongker
5a48209541 relocate applypatch; check patch integrity
- Delete the applypatch code (it's being moved to bootable/recovery).

- Change the OTA script generator to verify the sha1sum of all the
  patch files after they are unpacked into /tmp.

b/2361316 - VZW Issue PP628: Continuous reset to Droid logo:
            framework-res.apk update failed (CR LIBtt59130)

Change-Id: I5858d48f10127f72e708d50d3de844569d1aff27
2010-02-19 12:14:53 -08:00
Doug Zongker
7431dac607 allow java eventlogtags to be generated for packages that aren't included
If there are packages that specify logtags being built that aren't
included in the product, their logtags won't be included in the merged
file.  Assign an arbitrary tag number to them so they can be built
anyway.

Change-Id: I4929016bf289b7a814b48bc51f324c09f500fab1
2010-02-17 09:07:55 -08:00
Doug Zongker
abfbbe2e1d allow EventLog tag numbers to be auto-assigned
With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)

This is pretty straightforward to do:

- make merge-event-log-tags.py assign numbers to any tags that specify
  "?"

- make the generated java files depend on the merged output

- make java-event-log-tags.py read both the original .logtags and the
  merged output, and fill in tag numbers for any "?" using the merged
  version.

Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
2010-02-16 14:32:08 -08:00
Doug Zongker
42265390d9 change incremental OTA file install order
(Cherry-pick from donut.)

Delete the old recovery-from-boot patch before patching system files,
then install the new one at the end of the process.  Also fix an issue
with applypatch returning the wrong status.

Change-Id: I614fce39f307eded696ba792912b863f9fb0580b
2010-02-12 12:20:49 -08:00
Scott Main
ee629d9c9d revise script and styles for the expandable widget in the dev
guide side nav to allow nested toggle lists. This is necessary
for the new resources docs that have an expandable list nested
in an expandable list.
2010-02-05 14:37:58 -08:00
Doug Zongker
14833605d2 add UnmountAll function to OTA script; support radio images w/path
Three unrelated changes:

- change the add-radio-file makefile function to support adding files
  with paths.  (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
  that we can explicitly unmount everything we've mounted (in addition
  to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
  device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
2010-02-03 09:21:22 -08:00
Doug Zongker
30f1d2cf29 am 20d93db1: am cdb621bf: retry patch using cache if in-place write fails
Merge commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca'

* commit '20d93db18de9001dcb5af46e4d1d2bac10aa2eca':
  retry patch using cache if in-place write fails
2010-02-02 09:38:39 -08:00
Doug Zongker
20d93db18d am cdb621bf: retry patch using cache if in-place write fails
Merge commit 'cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp

* commit 'cdb621bfea3083afbea238dbf374826742aca6d0':
  retry patch using cache if in-place write fails
2010-02-02 08:53:17 -08:00
Doug Zongker
cdb621bfea retry patch using cache if in-place write fails
[cherry-pick from donut branch]

Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.

Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
2010-02-02 08:44:12 -08:00
Bjorn Bringert
76a72277c9 Generate write<TAG> methods in logtags-generated Java code
Change-Id: Iebca77f2f710ee4c15bf7089647f8d79fe79f33a
2010-02-02 10:40:06 +00:00
Scott Main
80ec85cc47 am 5729dbfa: am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit '5729dbfa00ffb659c5758195b617af4349c0ef75'

* commit '5729dbfa00ffb659c5758195b617af4349c0ef75':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-28 15:06:03 -08:00
Jesse Wilson
98647acd91 Merge "Suppress the annoying "XML missing method" warnings from the doc build." 2010-01-28 13:33:29 -08:00
Jesse Wilson
b127997b14 Suppress the annoying "XML missing method" warnings from the doc build. 2010-01-28 10:50:58 -08:00
Dirk Dougherty
7260470e76 am 262e8214: am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '262e821409fbd59b593e56cb75a339e8a2364533'

* commit '262e821409fbd59b593e56cb75a339e8a2364533':
  doc change: add announce for developer lab at mwc.
2010-01-28 10:48:00 -08:00
Scott Main
5729dbfa00 am e6fed880: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp

* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
  docs: accept the enter key on key-down, rather than key-up,
2010-01-26 15:01:13 -08:00
Scott Main
e6fed8807f Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair 2010-01-25 15:39:40 -08:00
Scott Main
9033c12688 docs: accept the enter key on key-down, rather than key-up,
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug: 1909300
2010-01-25 15:26:10 -08:00
Dirk Dougherty
262e821409 am 6339cfe8: Merge "doc change: add announce for developer lab at mwc." into eclair
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp

* commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
  doc change: add announce for developer lab at mwc.
2010-01-22 14:27:55 -08:00