OSDN Git Service
The Android Automerger [Fri, 21 May 2010 19:59:19 +0000 (12:59 -0700)]
FRF51
Change-Id: I14c23a70aba39001873862a33bbfae93d3f8af64
The Android Automerger [Thu, 20 May 2010 19:28:22 +0000 (12:28 -0700)]
FRF50
Change-Id: Ie060d31c557cfce996f1d4c1d316d03af7d0bd67
The Android Automerger [Thu, 20 May 2010 19:28:03 +0000 (12:28 -0700)]
Merge branch 'froyo' into froyo-release
Dirk Dougherty [Wed, 19 May 2010 05:12:23 +0000 (22:12 -0700)]
Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
Dirk Dougherty [Thu, 20 May 2010 01:25:33 +0000 (18:25 -0700)]
Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
The Android Automerger [Wed, 19 May 2010 02:46:15 +0000 (19:46 -0700)]
FRF48
Change-Id: I8962097f15b656d8b3579c0ba921802341cf9274
The Android Automerger [Tue, 18 May 2010 00:38:14 +0000 (17:38 -0700)]
FRF47B
Change-Id: If37080f70de84e166156cfa08c7d9f280fa20929
The Android Automerger [Mon, 17 May 2010 22:19:17 +0000 (15:19 -0700)]
FRF47
Change-Id: Ic1b582bc9d7d67cffcaca1eefc67cfa3a41a64f6
The Android Automerger [Fri, 14 May 2010 19:12:31 +0000 (12:12 -0700)]
FRF44
Change-Id: I9463c0ac1febf8088f655040816903ad8176405d
The Android Automerger [Thu, 13 May 2010 02:53:35 +0000 (19:53 -0700)]
FRF42
Change-Id: Ief4e6ddd16774091121603cb6b167dfbe79b27f0
The Android Automerger [Tue, 11 May 2010 23:40:31 +0000 (16:40 -0700)]
FRF41
Change-Id: I7aeb48a7f6a7af6d807a00905ffc3c57028e5880
The Android Automerger [Tue, 11 May 2010 01:12:11 +0000 (18:12 -0700)]
FRF40
Change-Id: I318dee92db24bebe11234cea595b864eb7caac34
The Android Automerger [Tue, 11 May 2010 01:11:58 +0000 (18:11 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Mon, 10 May 2010 15:18:26 +0000 (08:18 -0700)]
docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
Scott Main [Fri, 7 May 2010 18:32:12 +0000 (11:32 -0700)]
Merge "add froyo graphic for homepage and fix css bug" into froyo
The Android Automerger [Fri, 7 May 2010 17:58:05 +0000 (10:58 -0700)]
FRF37
Change-Id: I6e5c40cb315e84fd9d21f64c2a21e071fb4db4b9
The Android Automerger [Fri, 7 May 2010 00:55:18 +0000 (17:55 -0700)]
FRF36
Change-Id: I659c91146118ae9cb8270cd96a45fb2b96041c3c
The Android Automerger [Fri, 7 May 2010 00:55:05 +0000 (17:55 -0700)]
Merge branch 'froyo' into froyo-release
Dan Bornstein [Thu, 6 May 2010 02:33:47 +0000 (19:33 -0700)]
Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.
Bug:
2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
Scott Main [Thu, 6 May 2010 18:43:08 +0000 (11:43 -0700)]
add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
The Android Automerger [Thu, 6 May 2010 05:11:46 +0000 (22:11 -0700)]
FRF35
Change-Id: I6251d32cd9dcaefefd1bd7d35e33e6a3a9c92f04
The Android Automerger [Thu, 6 May 2010 05:11:33 +0000 (22:11 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Wed, 5 May 2010 21:50:04 +0000 (14:50 -0700)]
Merge "Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk" into froyo-release
Dan Bornstein [Wed, 5 May 2010 21:36:04 +0000 (14:36 -0700)]
Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Dan Bornstein [Mon, 3 May 2010 22:15:57 +0000 (15:15 -0700)]
Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).
* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.
* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).
* Added a bit of documentation about the whole deal.
Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.
Bug:
2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
Ying Wang [Tue, 4 May 2010 23:37:33 +0000 (16:37 -0700)]
Hack to skip dexpreopt on Maps.apk and SholesQuickOffice.apk
Change-Id: I733dd28a5df2542ba364095376c1ac033ef62bbd
http://b/issue?id=
2650711
Scott Main [Wed, 5 May 2010 00:24:26 +0000 (17:24 -0700)]
fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td
Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
android-build SharedAccount [Mon, 3 May 2010 22:15:03 +0000 (15:15 -0700)]
FRF33B
Change-Id: I43e4e71d977ff530cc36565a0450edded231a34b
The Android Automerger [Mon, 3 May 2010 15:10:21 +0000 (08:10 -0700)]
FRF33
Change-Id: I7991b820eb9ef0671dbbef2729dbfc3efd21e3af
The Android Automerger [Mon, 3 May 2010 15:10:08 +0000 (08:10 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Fri, 30 Apr 2010 01:00:16 +0000 (18:00 -0700)]
FRF29B
Change-Id: Ib1d0b8236ef81f4c4e2fa4b97ed9be776b5602d1
The Android Automerger [Thu, 29 Apr 2010 20:34:27 +0000 (13:34 -0700)]
FRF29
Change-Id: I420d44a306f38461d0443142ce1ee0ea426d5cc0
Doug Zongker [Wed, 28 Apr 2010 23:05:21 +0000 (16:05 -0700)]
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
The Android Automerger [Wed, 28 Apr 2010 19:21:35 +0000 (12:21 -0700)]
FRF28
Change-Id: I73b82507a9c4bd71e678771c9e0135806617857a
The Android Automerger [Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Tue, 27 Apr 2010 21:23:04 +0000 (14:23 -0700)]
Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
The Android Automerger [Mon, 26 Apr 2010 18:45:10 +0000 (11:45 -0700)]
FRF26
Change-Id: Ia56baf9d3ec4d1836cc41b13841ad7d5299cdb87
The Android Automerger [Mon, 26 Apr 2010 18:44:47 +0000 (11:44 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Fri, 23 Apr 2010 22:00:19 +0000 (15:00 -0700)]
FRF23B
Change-Id: Ieac192af4ede1c43949e9a25825382a8f5cc4b38
Raphael [Sat, 17 Apr 2010 00:50:09 +0000 (17:50 -0700)]
Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
Raphael [Wed, 14 Apr 2010 19:19:12 +0000 (12:19 -0700)]
Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
The Android Automerger [Fri, 23 Apr 2010 18:55:17 +0000 (11:55 -0700)]
FRF23
Change-Id: I11369ad3f740a7f32924666a2be2d2324892d468
Scott Main [Fri, 23 Apr 2010 18:41:30 +0000 (11:41 -0700)]
support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct
Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
The Android Automerger [Thu, 22 Apr 2010 23:16:49 +0000 (16:16 -0700)]
FRF22
Change-Id: Id599e3f330ee19ce3c521b618406a399fc05cc30
android-build SharedAccount [Wed, 21 Apr 2010 22:49:51 +0000 (15:49 -0700)]
FRF21B
Change-Id: I81caf83e64aeb793df87132a2b70105cfc37cf6f
The Android Automerger [Wed, 21 Apr 2010 17:46:53 +0000 (10:46 -0700)]
FRF21
Change-Id: I0a48513425a3b5d327fc4baca48d660e1e7f3d51
The Android Automerger [Wed, 21 Apr 2010 17:46:41 +0000 (10:46 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Thu, 15 Apr 2010 23:34:41 +0000 (16:34 -0700)]
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
Scott Main [Tue, 20 Apr 2010 22:34:22 +0000 (15:34 -0700)]
Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo
Roman Nurik [Tue, 13 Apr 2010 23:23:42 +0000 (16:23 -0700)]
cherry-pick from master:
42092024ebd81896e741829c50f37a7e0095392e
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
The Android Automerger [Mon, 19 Apr 2010 19:50:36 +0000 (12:50 -0700)]
FRF19
Change-Id: I0001f872e23dafac03eea530997403dc924398ea
The Android Automerger [Mon, 19 Apr 2010 19:50:23 +0000 (12:50 -0700)]
Merge branch 'froyo' into froyo-release
Brad Fitzpatrick [Fri, 16 Apr 2010 23:55:41 +0000 (16:55 -0700)]
For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
android-build SharedAccount [Fri, 16 Apr 2010 20:29:19 +0000 (13:29 -0700)]
FRF15D
Change-Id: Ie9d5588da5e7ba40af0aa59380dbefdb2ae2190d
android-build SharedAccount [Fri, 16 Apr 2010 18:44:21 +0000 (11:44 -0700)]
FRF15C
Change-Id: I18c1bcf6c5dafcab5fddfac9c91f2cb719989955
Scott Main [Fri, 16 Apr 2010 16:00:29 +0000 (09:00 -0700)]
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
android-build SharedAccount [Thu, 15 Apr 2010 22:43:06 +0000 (15:43 -0700)]
FRF15B
Change-Id: Ie0b692ab96a598d5ce86151bc189bfd1ec339ae3
The Android Automerger [Thu, 15 Apr 2010 15:12:44 +0000 (08:12 -0700)]
FRF15
Change-Id: Ieb6a3aa05ecac44676e1f9af2ff42cb7b0982a7a
The Android Automerger [Wed, 14 Apr 2010 18:28:38 +0000 (11:28 -0700)]
FRF14
Change-Id: I029b56662620274c63afb26239cd3aa982626bd7
The Android Automerger [Wed, 14 Apr 2010 18:28:25 +0000 (11:28 -0700)]
Merge branch 'froyo' into froyo-release
Wu-cheng Li [Sun, 4 Apr 2010 09:14:23 +0000 (17:14 +0800)]
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
The Android Automerger [Tue, 13 Apr 2010 15:08:05 +0000 (08:08 -0700)]
FRF13
Change-Id: I42ad464136133700fb6e727bbb8d5c68899ede5f
The Android Automerger [Mon, 12 Apr 2010 22:45:43 +0000 (15:45 -0700)]
FRF12B
Change-Id: I35a7addef84c4f4f1b31e6f3185155f44915f4b6
The Android Automerger [Mon, 12 Apr 2010 16:45:42 +0000 (09:45 -0700)]
FRF12
Change-Id: I83a967378dddbdf116e41ebe1b8f2d667151d4ea
The Android Automerger [Mon, 12 Apr 2010 16:45:29 +0000 (09:45 -0700)]
Merge branch 'froyo' into froyo-release
Scott Main [Sat, 10 Apr 2010 00:03:42 +0000 (17:03 -0700)]
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
Xavier Ducrohet [Fri, 9 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Add camera sounds to the emulator system image build.
Bug:
2538315
Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
Scott Main [Mon, 29 Mar 2010 16:50:34 +0000 (09:50 -0700)]
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
Daniel Sandler [Thu, 8 Apr 2010 23:54:50 +0000 (16:54 -0700)]
Merge "Add Protips to all builds." into froyo
The Android Automerger [Thu, 8 Apr 2010 15:27:32 +0000 (08:27 -0700)]
FRF08
Change-Id: I11fef9bff647fb2cebe3f1377c2b36a1f75c4ea3
The Android Automerger [Thu, 8 Apr 2010 15:27:19 +0000 (08:27 -0700)]
Merge branch 'froyo' into froyo-release
Dianne Hackborn [Wed, 7 Apr 2010 21:13:47 +0000 (14:13 -0700)]
Add clean step for SDK version change.
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
Daniel Sandler [Wed, 7 Apr 2010 20:48:47 +0000 (16:48 -0400)]
Add Protips to all builds.
Bug:
2559083
Change-Id: Ibd6333516a798f88e4d4ef08a6246812b1009a76
The Android Automerger [Wed, 7 Apr 2010 15:12:13 +0000 (08:12 -0700)]
FRF07
Change-Id: Ic2c57d9f58c7a79b44462f3f2350fef99da8acb4
The Android Automerger [Wed, 7 Apr 2010 15:12:01 +0000 (08:12 -0700)]
Merge branch 'froyo' into froyo-release
The Android Automerger [Tue, 6 Apr 2010 15:07:50 +0000 (08:07 -0700)]
FRF06
Change-Id: Ie3ed548f504bcb99828210310b12a18e709a2af5
Dianne Hackborn [Mon, 5 Apr 2010 19:33:11 +0000 (12:33 -0700)]
It's beginning to look a lot like release time!
Everywhere we build...
Froyo is now Android 2.2, API 8.
This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?
Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
The Android Automerger [Mon, 5 Apr 2010 19:26:32 +0000 (12:26 -0700)]
FRF05B
Change-Id: I7ab57347ccfd76674fdbcd9b5879c0a68f1abf72
The Android Automerger [Mon, 5 Apr 2010 15:03:01 +0000 (08:03 -0700)]
FRF05
Change-Id: I35bfa4963157b395365fe0b5bcf64e448de244be
The Android Automerger [Mon, 5 Apr 2010 15:02:49 +0000 (08:02 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Thu, 1 Apr 2010 20:36:40 +0000 (13:36 -0700)]
FRF01B
Change-Id: Ib9adba6d4da02287673c97267f479ecc3f1a308a
Xavier Ducrohet [Thu, 1 Apr 2010 20:20:21 +0000 (13:20 -0700)]
Package the proper vold config file in SDK system image.
Change-Id: I7698c76d8d704837106450a32cba7b9c8f5b4446
Xavier Ducrohet [Thu, 1 Apr 2010 17:50:01 +0000 (10:50 -0700)]
Merge "Add CarHome to the SDK." into froyo
The Android Automerger [Thu, 1 Apr 2010 15:07:49 +0000 (08:07 -0700)]
FRF01
Change-Id: If4b7c952f5213ed766aa2360ff47f379b4156d47
The Android Automerger [Thu, 1 Apr 2010 15:07:37 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Thu, 1 Apr 2010 00:29:04 +0000 (17:29 -0700)]
Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=
2394164
android-build SharedAccount [Wed, 31 Mar 2010 22:25:11 +0000 (15:25 -0700)]
FRE90B
Change-Id: I988b5b158dc10093c05df77a7ac6d5254a11d778
The Android Automerger [Wed, 31 Mar 2010 15:07:38 +0000 (08:07 -0700)]
FRE90
Change-Id: I7102ec597dab436550826238e06fea33c54f29c3
The Android Automerger [Wed, 31 Mar 2010 15:07:17 +0000 (08:07 -0700)]
Merge branch 'froyo' into froyo-release
Ying Wang [Tue, 30 Mar 2010 23:42:15 +0000 (16:42 -0700)]
Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
Ying Wang [Tue, 30 Mar 2010 19:55:13 +0000 (12:55 -0700)]
Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=
2557214
Xavier Ducrohet [Tue, 30 Mar 2010 18:42:55 +0000 (11:42 -0700)]
Add CarHome to the SDK.
Bug:
2526512
Change-Id: Ia4f127a4b5ac3bf52ff9664cfbca6fdbda3aa154
The Android Automerger [Tue, 30 Mar 2010 15:05:29 +0000 (08:05 -0700)]
FRE89
Change-Id: I05edf6916bcaaae3ba09177558fac3a55fd92a4a
The Android Automerger [Mon, 29 Mar 2010 16:25:26 +0000 (09:25 -0700)]
FRE88B
Change-Id: I849dad0ea5c86f9c63b0929f83fd8b166270780a
The Android Automerger [Mon, 29 Mar 2010 16:25:17 +0000 (09:25 -0700)]
Merge branch 'froyo' into froyo-release
android-build SharedAccount [Mon, 29 Mar 2010 16:19:04 +0000 (09:19 -0700)]
burn FRE88
Change-Id: I67c228bb4f3a7885164406f4b68bdb89e810de86
Dirk Dougherty [Tue, 9 Mar 2010 01:31:26 +0000 (17:31 -0800)]
cherry-pick
db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
Dirk Dougherty [Wed, 3 Mar 2010 22:34:51 +0000 (14:34 -0800)]
cherry-pick
fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
Jean-Baptiste Queru [Fri, 26 Mar 2010 18:22:03 +0000 (11:22 -0700)]
Add separate language packs, for extra flexibility.
This way, languages can be managed more carefully through
the inheritance chain.
Bug:
2546758
Change-Id: I14e3d4d60716355fa702cc77128e9da04e30a612
Jean-Baptiste Queru [Fri, 26 Mar 2010 00:41:04 +0000 (17:41 -0700)]
Add Gallery3D in all builds.
Bug:
2546464
Change-Id: I110de0fe56bcc7128f490b3ed516637786777773
OSDN Git Service
