Commit Graph

2182 Commits

Author SHA1 Message Date
Elliott Hughes 6b5635e446 Make a full list of locales available, and use it for the sim build.
Bug: 2498876
Change-Id: I59b8d851c6cd242d199c189f3e3dfde9baf3e6e0
2010-04-26 10:49:43 -07:00
Raphael d7036e3cc0 Merge "Make zipalign build for the Win SDK under Linux." 2010-04-23 09:56:54 -07:00
Dianne Hackborn b1ae8ab97d Merge "Mmmmmm... Gingerbread!" 2010-04-22 16:24:19 -07:00
Doug Zongker 6717059ccc don't use the -m option when building OTA packages any more
The -m option no longer exists; we only support one OTA package script
language in gingerbread.

Change-Id: I9b532a30f8c3b297b8ffdb2a570a24db37f056d1
2010-04-21 14:53:07 -07:00
Doug Zongker 9ce2ebf5d3 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Ie7179a5f2e5ca0d2c0305000344ac39b1dd7385f
2010-04-21 14:17:21 -07:00
Ying Wang 3533eca851 Add build number to apks by appending it to versionName.
Change-Id: I476ff3514068814211d67e8ed956f1923be33bcd
http://b/issue?id=2557312
2010-04-21 10:23:42 -07:00
Scott Main 475089cc25 am 19ca463e: am 55f1fca1: am d72731d2: 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 2010-04-20 17:46:25 -07:00
Scott Main 19ca463e87 am 55f1fca1: am d72731d2: 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
Merge commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b' into kraken

* commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b':
  docs: misc css changes
2010-04-20 17:37:28 -07:00
Scott Main 55f1fca10e am d72731d2: 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
Merge commit 'd72731d213269f63f2bb80631f02914800f556ad' into froyo-plus-aosp

* commit 'd72731d213269f63f2bb80631f02914800f556ad':
  docs: misc css changes
2010-04-20 17:33:03 -07:00
Scott Main c1d74726cb am 6f467f62: am e3e590be: am f655dab5: 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:52:32 -07:00
Raphael 925a3279b7 Make zipalign build for the Win SDK under Linux.
Change-Id: Ibd667437d6637fbc5b21147f57eb41e81cbd8577
2010-04-20 15:46:54 -07:00
Scott Main 6f467f6206 am e3e590be: am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8' into kraken

* commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8':
  docs: add script to capture the ctrl+f key event (initiates 'find' search
2010-04-20 15:43:19 -07:00
Scott Main e3e590be4e am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit 'f655dab5e611d8e013f1e5ad4ddcb269f7db05a6' into froyo-plus-aosp

* commit 'f655dab5e611d8e013f1e5ad4ddcb269f7db05a6':
  docs: add script to capture the ctrl+f key event (initiates 'find' search
2010-04-20 15:38:17 -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
Guang Zhu 155afe393f enhancement for building app with emma code coverage
* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
2010-04-20 13:38:49 -07:00
Jean-Baptiste Queru 1c75692147 am 488891d8: Merge "Replace AlarmClock with DeskClock in the SDK" into kraken 2010-04-20 11:06:45 -07:00
Jean-Baptiste Queru 488891d8c9 Merge "Replace AlarmClock with DeskClock in the SDK" into kraken 2010-04-20 10:58:59 -07:00
Kenny Root a51b76e15b Merge "Add subdir under frameworks/base for code ported from icu4j." 2010-04-20 10:21:02 -07:00
Roman Nurik dc85191a6f am 34cbced9: am d1d9f048: am af232984: cherry-pick from master: 42092024eb 2010-04-19 16:47:11 -07:00
Roman Nurik 34cbced96e am d1d9f048: am af232984: cherry-pick from master: 42092024eb
Merge commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c' into kraken

* commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c':
  cherry-pick from master: 42092024eb
2010-04-19 16:36:57 -07:00
Roman Nurik d1d9f048b1 am af232984: cherry-pick from master: 42092024eb
Merge commit 'af23298447b211a8417e58cda982ea787360e9ff' into froyo-plus-aosp

* commit 'af23298447b211a8417e58cda982ea787360e9ff':
  cherry-pick from master: 42092024eb
2010-04-19 16:30:12 -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
Dianne Hackborn d6f9929f4a Mmmmmm... Gingerbread!
Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
2010-04-19 15:09:47 -07:00
Roman Nurik e01d8a70d5 Merge "Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive." 2010-04-19 14:34:13 -07:00
Roman Nurik 42092024eb Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: Ifa52bb48c7b03c9aa7ad03cfe3e0049024f71a8d
2010-04-19 14:28:18 -07:00
Brad Fitzpatrick c01c284dda am 492adf41: am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling. 2010-04-19 11:49:25 -07:00
Brad Fitzpatrick 492adf4169 am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
Merge commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91' into kraken

* commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91':
  For userdebug builds, enable Dalvik lock contention sampling.
2010-04-19 11:40:48 -07:00
Brad Fitzpatrick dc5f3888d0 am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
Merge commit '135677a71800c27d7747b5c86712d05a74392f62' into froyo-plus-aosp

* commit '135677a71800c27d7747b5c86712d05a74392f62':
  For userdebug builds, enable Dalvik lock contention sampling.
2010-04-19 11:35:26 -07:00
Jean-Baptiste Queru a454d328bc Replace AlarmClock with DeskClock in the SDK
Change-Id: I82a8fe1b1fbea78acde5ad61dc595fe8272377bc
2010-04-19 09:38:42 -07:00
Brad Fitzpatrick 135677a718 For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
2010-04-19 07:51:12 -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
Dianne Hackborn 472e07c8f4 am cc45ee9c: On to Kraken... 2010-04-15 16:59:38 -07:00
Dianne Hackborn cc45ee9c3c On to Kraken...
Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
2010-04-15 14:06:28 -07:00
Brian Carlstrom 67a9131270 Merge "Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP" 2010-04-15 13:08:09 -07:00
Wu-cheng Li 05a119ea27 am d31ae2fc: am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag. 2010-04-13 16:22:33 -07:00
Dan Morrill 6d30b72be1 Removing unnecessary tabs, and fixing an IE bug.
Change-Id: I055243ebd47c9319333aa837061015650d57d923
2010-04-13 14:51:28 -07:00
Wu-cheng Li d31ae2fc73 am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag.
Merge commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd' into kraken

* commit '8b687440688ac41d6b6754537bf4a0f9dcb14fbd':
  Fix the check of double quoted @see tag.
2010-04-13 11:53:15 -07:00
Wu-cheng Li 8b68744068 am fcc7cf77: Fix the check of double quoted @see tag.
Merge commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd' into froyo-plus-aosp

* commit 'fcc7cf779905613d6bd48344b5c3a994237c02bd':
  Fix the check of double quoted @see tag.
2010-04-13 09:20:18 -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 d9ec1f1c5d am 52e67ac2: am db00a567: am 479f4a5c: Merge "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 res 2010-04-10 11:56:33 -07:00
Scott Main 52e67ac24e am db00a567: am 479f4a5c: Merge "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 d
Merge commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7' into kraken

* commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:46:50 -07:00
Scott Main db00a56775 am 479f4a5c: Merge "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 st
Merge commit '479f4a5cc4db72024123d36145028fe557e72f98' into froyo-plus-aosp

* commit '479f4a5cc4db72024123d36145028fe557e72f98':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
2010-04-10 11:40:08 -07:00
Scott Main 479f4a5cc4 Merge "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" into froyo 2010-04-09 17:03:42 -07:00
Xavier Ducrohet 8797d5333b am b15c119d: am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build. 2010-04-09 08:52:54 -07:00
Jean-Baptiste Queru ff59a5a60f resolved conflicts for merge of 693e6555 to master
Change-Id: I968f5cf82764562ce5a0b61408b8d290d4027aac
2010-04-09 08:49:11 -07:00
Xavier Ducrohet b15c119d26 am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build.
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken

* commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0':
  Add camera sounds to the emulator system image build.
2010-04-08 22:50:33 -07:00
Xavier Ducrohet 19e9fff37e am 74134a50: Add camera sounds to the emulator system image build.
Merge commit '74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp

* commit '74134a503fc908b28ad0ff87e1291698fbceb9cf':
  Add camera sounds to the emulator system image build.
2010-04-08 22:38:52 -07:00
Xavier Ducrohet 74134a503f Add camera sounds to the emulator system image build.
Bug: 2538315

Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
2010-04-08 18:07:40 -07: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