Commit Graph

10548 Commits

Author SHA1 Message Date
The Android Open Source Project
b196f541f8 Merge commit 'remotes/goog/donut' into donut-release 2009-07-30 08:37:53 -07:00
Android (Google) Code Review
1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Phil Dubach
e7faad965f am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
  CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
Daisuke Miyakawa
cca2cdf1ae am 981bafb1: AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'

* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
  AI 150131: Remove English/Chinese IME from OpenWnn.
2009-07-30 06:56:45 -07:00
Jean-Baptiste Queru
3a37cdf3a2 am 239637ea: (-s ours) findleaves.sh: Properly fix arguments.
Merge commit '239637eac86c8f4f92384891a8f99085039a5778'

* commit '239637eac86c8f4f92384891a8f99085039a5778':
  findleaves.sh: Properly fix arguments.
2009-07-29 16:48:32 -07:00
Android (Google) Code Review
a86afb626f am c16c0a41: Merge change 8942 into donut
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
  Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Scott Main
a7f49e3b95 am df09424f: Patch 2: some fixes to the developer-docs stylesheet.... Patch 3: add "Since:" to the api level info Patch 4: fix packages page and styles to reveal class summary
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'

* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
  Patch 2: some fixes to the developer-docs stylesheet....
2009-07-29 16:44:56 -07:00
Jean-Baptiste Queru
7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Android (Google) Code Review
7ebafd5aa0 Merge change 9009 into donut
* changes:
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-29 13:58:07 -07:00
Android (Google) Code Review
94a7e48086 Merge change 9010
* changes:
  include GoogleContactsSyncAdapter in products with google
2009-07-29 13:55:29 -07:00
Fred Quintana
e4e5b5865a include GoogleContactsSyncAdapter in products with google 2009-07-29 12:47:54 -07:00
Dirk Dougherty
3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Phil Dubach
951f3d89fb CTS: Add telephony and webkit test cases to CTS makefile 2009-07-29 11:58:11 -07:00
Daisuke Miyakawa
981bafb11b AI 150131: Remove English/Chinese IME from OpenWnn.
Automated import of CL 150131
2009-07-29 11:41:01 -07:00
The Android Open Source Project
295b1129e1 ERC29 2009-07-29 08:37:57 -07:00
The Android Open Source Project
db675fa7d4 DRC29 2009-07-29 08:37:52 -07:00
The Android Open Source Project
20c23286d8 Merge commit 'remotes/goog/master' into eclair-release 2009-07-29 08:37:43 -07:00
The Android Open Source Project
f84d16dd82 Merge commit 'remotes/goog/donut' into donut-release 2009-07-29 08:37:37 -07:00
Jean-Baptiste Queru
239637eac8 findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).

Conflicts:

	tools/findleaves.sh
2009-07-29 07:35:15 -07:00
Android (Google) Code Review
c16c0a41f5 Merge change 8942 into donut
* changes:
  Add CTS permission2 test package to cts.
2009-07-28 20:38:42 -07:00
Brett Chabot
7b5edc3e8a Add CTS permission2 test package to cts. 2009-07-28 20:11:24 -07:00
Joe Onorato
cffab81686 Make the product graph slightly more readable. 2009-07-28 18:29:19 -07:00
Scott Main
df09424f19 Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary

Squashed commit of the following:

commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.

commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.
2009-07-28 09:53:59 -07:00
The Android Open Source Project
4cb7fde4b5 ERC28 2009-07-28 08:38:42 -07:00
The Android Open Source Project
24fdba97a7 DRC28 2009-07-28 08:38:34 -07:00
The Android Open Source Project
157f99121e Merge commit 'remotes/goog/master' into eclair-release 2009-07-28 08:38:27 -07:00
The Android Open Source Project
58f6fbe334 ERC27B 2009-07-27 10:17:16 -07:00
Wei Huang
99b2a774c5 clean step for data messaging api. 2009-07-27 08:46:24 -07:00
The Android Open Source Project
f90757b58e ERC27 2009-07-27 08:38:15 -07:00
The Android Open Source Project
5bcb9b05db DRC27 2009-07-27 08:38:04 -07:00
The Android Open Source Project
646c73ddf0 Merge commit 'remotes/goog/master' into eclair-release 2009-07-27 08:37:57 -07:00
The Android Open Source Project
b616f8d223 Merge commit 'remotes/goog/donut' into donut-release 2009-07-27 08:37:49 -07:00
Jean-Baptiste Queru
7cc41cfadb reconcile korg/master into goog/master 2009-07-26 11:43:53 -07:00
Jean-Baptiste Queru
7c07cf9a82 Merge korg/donut into korg/master
Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Dirk Dougherty
5f07e2908c am 882bbe14: Merge commit \'5db40c6db73db3f4433dd3456107efb4468a4a99\' into manualmergeDroiddoc
Merge commit '882bbe1489518cabb661e06f6e87a6561d9239df'

* commit '882bbe1489518cabb661e06f6e87a6561d9239df':
  AI 150594: change the homepage markup and styles to allow variable height in
  AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
  AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
  AI 150535: add the Videos page to the site
2009-07-25 10:12:09 -07:00
Dirk Dougherty
24f96bd17d am da069618: Merge commit \'db3b6e832261e7b9a09e1c646f7963b839d954cc\' into manualmergeDroiddoc
Merge commit 'da0696187b6927270a6b8a15785aaa328c3030bd'

* commit 'da0696187b6927270a6b8a15785aaa328c3030bd':
  AI 150470: CTS: Fix naming for extra permission tests and include them in makefile
  AI 150428: update the jquery library to version 1.3.2.
  AI 150398: fix the sdk build break
  AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
  AI 150389: Fix handling of cookie writes for intl pages.
  AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css.  DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
2009-07-25 10:12:07 -07:00
Scott Main
353f53c1a6 am 1aa2380c: AI 150428: update the jquery library to version 1.3.2. the incentive is to utilize an improvement made in the :hidden selector (for the videos page); this update should also hopefully improve some performance, but it is otherwise the same as before
Merge commit '1aa2380c95a107842972f87ce1dfd7be9f859882'

* commit '1aa2380c95a107842972f87ce1dfd7be9f859882':
  AI 150428: update the jquery library to version 1.3.2.
2009-07-25 10:12:06 -07:00
Scott Main
bbd6743f9e am 8576132a: AI 150393: edit the reference\'s navtree highlighting logic to handle intl/ directories BUG=1790234
Merge commit '8576132a38f4242c5f5da3133e832525a70766e6'

* commit '8576132a38f4242c5f5da3133e832525a70766e6':
  AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
2009-07-25 10:12:04 -07:00
Dirk Dougherty
afac918686 am 1cb43f69: AI 150389: Fix handling of cookie writes for intl pages. BUG=1790234
Merge commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4'

* commit '1cb43f69d4b09f19cff39a68b3cd00de3ecca4a4':
  AI 150389: Fix handling of cookie writes for intl pages.
2009-07-25 10:12:03 -07:00
Dirk Dougherty
901dd0074a am 233bc0b8: AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this
Merge commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6'

* commit '233bc0b84aef261a67a364ff3a8e91077fd70fd6':
  AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css.  DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
2009-07-25 10:12:01 -07:00
Android (Google) Code Review
8180f31b90 am 9e202af9: Merge change 8340 into donut
Merge commit '9e202af99c02b2dc45114b566ea20799e77c73fb'

* commit '9e202af99c02b2dc45114b566ea20799e77c73fb':
  AI 150131: Remove English/Chinese IME from OpenWnn.
2009-07-25 10:11:59 -07:00
Android (Google) Code Review
8104c7c4b7 am eaf299f8: Merge change 8339 into donut
Merge commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589'

* commit 'eaf299f8b465d7db2f37f068b33ace9a5d6d1589':
  AI 150083: Minor updates to the ndk docs based on approved messaging.
2009-07-25 10:11:58 -07:00
Android (Google) Code Review
423ea3e04a am e85be87e: Merge change 3175 into donut
Merge commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62'

* commit 'e85be87ee6e17df30c1cdfee523e8e8f255ebf62':
  page load perfomance improvements...
2009-07-25 10:11:56 -07:00
Android (Google) Code Review
4387b34839 Merge change 8494
* changes:
  Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
2009-07-25 00:54:27 -07:00
Dirk Dougherty
882bbe1489 Merge commit '5db40c6db73db3f4433dd3456107efb4468a4a99' into manualmergeDroiddoc 2009-07-24 20:31:36 -07:00
Dirk Dougherty
da0696187b Merge commit 'db3b6e832261e7b9a09e1c646f7963b839d954cc' into manualmergeDroiddoc 2009-07-24 20:30:53 -07:00
Scott Main
1aa2380c95 AI 150428: update the jquery library to version 1.3.2.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
  this update should also hopefully improve some performance, but it is otherwise the same
  as before and this file still includes the core library, plus the UI core and resizable libraries

Automated import of CL 150428
2009-07-24 18:39:20 -07:00
Scott Main
8576132a38 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-24 18:39:20 -07:00
Dirk Dougherty
1cb43f69d4 AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-24 18:39:20 -07:00
Dirk Dougherty
233bc0b84a AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
BUG=1910893

Automated import of CL 150370
2009-07-24 18:39:20 -07:00