1462 Commits

Author SHA1 Message Date
The Android Open Source Project
bff1389c9a fix conflict markers 2009-04-29 13:41:02 -07:00
The Android Open Source Project
c6e3de9e09 am 203464a: Add searchSuggestThreshold to searchable meta-data. 2009-04-29 13:40:03 -07:00
Android (Google) Code Review
adf431b54a am 493b00a: Merge change 640 into donut
Merge commit '493b00afbfd4f603939ee98540a4d8df084107fd'

* commit '493b00afbfd4f603939ee98540a4d8df084107fd':
  Add GLOBAL_SEARCH intent for finding global search provider.
2009-04-29 13:35:48 -07:00
Eric Fischer
4c4c51b78e am 7ffeac8: am a21e376: AI 147962: Import updated zh_TW translations.
Merge commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc'

* commit '7ffeac8db927c0179a9d24d20dbbb49087e604cc':
  AI 147962: Import updated zh_TW translations.
2009-04-29 13:35:48 -07:00
Scott Main
eff18de604 am c13fe2c: am c804836: AI 147951: delete unused files
Merge commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081'

* commit 'c13fe2c00b05dfdf3b5ee220ab0327358ed04081':
  AI 147951: delete unused files
2009-04-29 13:35:47 -07:00
Scott Main
c9a847a4b1 am b2b841d: am 998234e: AI 147947: update the sitemap. add disallow in r
Merge commit 'b2b841db08057a6dbc86f99fd35106ed741da126'

* commit 'b2b841db08057a6dbc86f99fd35106ed741da126':
  AI 147947: update the sitemap. add disallow in robots file for the sdk/preview/
2009-04-29 13:35:47 -07:00
Dirk Dougherty
f7af2c5b7f am 0b8c4fa: am 752aaf9: AI 147874: Fix format and link errors in docs.
Merge commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624'

* commit '0b8c4faee30bb06f8e5d7cd7ecb5b8a0f8ce1624':
  AI 147874: Fix format and link errors in docs.
2009-04-29 13:35:47 -07:00
Scott Main
5a2390d491 am 9eb6ac8: am 5fe696f: AI 147814: tweaks to the hello world tutorial.
Merge commit '9eb6ac878e47ba5340896cab10ac17e269b518d1'

* commit '9eb6ac878e47ba5340896cab10ac17e269b518d1':
  AI 147814: tweaks to the hello world tutorial.
2009-04-29 13:35:46 -07:00
Scott Main
e485fa5192 am 563dc08: am 2222c9e: AI 147812: close <em> tag
Merge commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2'

* commit '563dc08ec0d80d60926ec27385733bfe4c8c5ee2':
  AI 147812: close <em> tag
2009-04-29 13:35:46 -07:00
Scott Main
af0092dc7e am dfe88ae: am 0ee4f86: AI 147811: typo fixes and edits for upgrading an
Merge commit 'dfe88ae496494fb95782e3c028a53069e951f89e'

* commit 'dfe88ae496494fb95782e3c028a53069e951f89e':
  AI 147811: typo fixes and edits for upgrading and installing docs
2009-04-29 13:35:45 -07:00
Scott Main
124217d186 am 7e35614: am 263ed76: AI 147810: fix links on the homepage
Merge commit '7e35614162d0da1e2949a28d9c87f76a4c77877d'

* commit '7e35614162d0da1e2949a28d9c87f76a4c77877d':
  AI 147810: fix links on the homepage
2009-04-29 13:35:45 -07:00
Dirk Dougherty
878cffcfa8 am db24820: am 7eeb5d5: AI 147807: Miscellaneous doc fixes needed for 1.
Merge commit 'db248204f05a94a973f6de9983e594a779fdb366'

* commit 'db248204f05a94a973f6de9983e594a779fdb366':
  AI 147807: Miscellaneous doc fixes needed for 1.5 SDK push
2009-04-29 13:35:45 -07:00
Scott Main
f8b522b6d7 am 323d821: am ce878be: AI 147804: add new doc about Dialogs
Merge commit '323d82130c440b3f2327916a42eed1f1b2b1592f'

* commit '323d82130c440b3f2327916a42eed1f1b2b1592f':
  AI 147804: add new doc about Dialogs
2009-04-29 13:35:44 -07:00
Scott Main
3813fdaa8f am 8419fcd: am b8b3645: AI 147803: add docs and images for docs on Toast
Merge commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4'

* commit '8419fcdfaf908aec4f8fa093ef1850616c7704b4':
  AI 147803: add docs and images for docs on Toast and  Notification docs
2009-04-29 13:35:44 -07:00
Dirk Dougherty
c7a3631498 am bce7bc9: am 596451c: AI 147796: Add widget design guidelines to new U
Merge commit 'bce7bc9286d1f470b6d141b058d5df47261827a8'

* commit 'bce7bc9286d1f470b6d141b058d5df47261827a8':
  AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
2009-04-29 13:35:44 -07:00
Scott Main
70346c2e9e am 856d015: am 6fc27f7: AI 147793: cleanup broken links and delete all i
Merge commit '856d0150da8dffbadd17e9853bcf0847c030b9c9'

* commit '856d0150da8dffbadd17e9853bcf0847c030b9c9':
  AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
2009-04-29 13:35:43 -07:00
Dirk Dougherty
28f4185402 am cbf17dd: am 47f3a7a: AI 147782: Add a link to the JET docs from media
Merge commit 'cbf17dd673f8e2519f435748fad1eeb2b7a7fd54'

* commit 'cbf17dd673f8e2519f435748fad1eeb2b7a7fd54':
  AI 147782: Add a link to the JET docs from media index page.
2009-04-29 13:35:43 -07:00
Scott Main
47565d0f47 am 0db2557: am 4afe275: AI 147780: add summary of "future-proofing your
Merge commit '0db255749155f8f56790e6683501c3d4276c915c'

* commit '0db255749155f8f56790e6683501c3d4276c915c':
  AI 147780: add summary of "future-proofing your apps" and links
2009-04-29 13:35:43 -07:00
Scott Main
80d5a8196e am 6585cc1: am 094d9af: AI 147777: add release notes links for each down
Merge commit '6585cc1bbdc49bed71d0e5ca7b9f86849a5a8b97'

* commit '6585cc1bbdc49bed71d0e5ca7b9f86849a5a8b97':
  AI 147777: add release notes links for each download page
2009-04-29 13:35:42 -07:00
Scott Main
71975b1fe6 am 5e8ead2: am 6bbf389: AI 147767: set 1.1 download page to include "not
Merge commit '5e8ead2647f37015f8265a4d7e8d99debdb852b3'

* commit '5e8ead2647f37015f8265a4d7e8d99debdb852b3':
  AI 147767: set 1.1 download page to include "not current" disclaimer
2009-04-29 13:35:42 -07:00
Dirk Dougherty
f65b2cbe68 am d41f950: am 7b54237: AI 147755: Add sizes and checksums for 1.5 SDK d
Merge commit 'd41f950acad2d70e3df243d49cf8ba725b7cd1de'

* commit 'd41f950acad2d70e3df243d49cf8ba725b7cd1de':
  AI 147755: Add sizes and checksums for 1.5 SDK downloadables.
2009-04-29 13:35:42 -07:00
Scott Main
2b5ecfca3d am 4681c01: am 6f1826c: AI 147752: dang, there was another unclosed tag.
Merge commit '4681c017a1af9cec99a0ad699a59c701f0424816'

* commit '4681c017a1af9cec99a0ad699a59c701f0424816':
  AI 147752: dang, there was another unclosed tag... tested it this time.
2009-04-29 13:35:42 -07:00
Scott Main
1e56d5fd43 am 9dfad65: am a055e5e: AI 147742: close <code> tag and remove some bold
Merge commit '9dfad65f76a7110146271e465a15b18bbc2a3fe6'

* commit '9dfad65f76a7110146271e465a15b18bbc2a3fe6':
  AI 147742: close <code> tag and remove some bolding
2009-04-29 13:35:41 -07:00
Scott Main
08f1edf235 am 073bc61: am 8a4c53a: AI 147732: fix broken links
Merge commit '073bc611ce22e798e90559689aaf771df4a8bf4c'

* commit '073bc611ce22e798e90559689aaf771df4a8bf4c':
  AI 147732: fix broken links
2009-04-29 13:35:41 -07:00
Jorg Pleumann
e07cd1a4c3 am 19aa8e0: am b867019: AI 147725: Some fixes for the CTS test runner. O
Merge commit '19aa8e01b8fe4ebd6d518bd48ea9b53ec95a49a7'

* commit '19aa8e01b8fe4ebd6d518bd48ea9b53ec95a49a7':
  AI 147725: Some fixes for the CTS test runner. One is a
2009-04-29 13:35:41 -07:00
Bill Napier
1fd11b4bdb am e17210c: am 14533d2: AI 147720: Set default language for NL to nl.
Merge commit 'e17210c17aa26d600f825e2f45c9aa66452e9988'

* commit 'e17210c17aa26d600f825e2f45c9aa66452e9988':
  AI 147720: Set default language for NL to nl.
2009-04-29 13:35:40 -07:00
Jean-Michel Trivi
51086686bd am d7ffb29: am 864750c: AI 147718: Created .jd doc file for the JetCreat
Merge commit 'd7ffb29b1f2afcad30234896e6ad1677cc149dc6'

* commit 'd7ffb29b1f2afcad30234896e6ad1677cc149dc6':
  AI 147718: Created .jd doc file for the JetCreator manual. Cleaned up the content to only use HTML tags, no more ugly Word generated tags. Removed references to visio files, converted all assets to PNG and renamed them with human understandable names. Added reference to JetPlayer javadoc.
2009-04-29 13:35:40 -07:00
Dirk Dougherty
7734dbf697 am ec82e35: am 6edea74: AI 147711: Fix link text in highlights doc. Copy
Merge commit 'ec82e353087453d6413d54ec38aa3218232cfe87'

* commit 'ec82e353087453d6413d54ec38aa3218232cfe87':
  AI 147711: Fix link text in highlights doc. Copy "New APIs" section to Version Notes doc.
2009-04-29 13:35:39 -07:00
Dirk Dougherty
a57156e7fe am 8b300f3: am d97e8dc: AI 147710: Add redirects for sdk/preview pages.
Merge commit '8b300f3db90850a8faa73bea36ce6b551c1d71a9'

* commit '8b300f3db90850a8faa73bea36ce6b551c1d71a9':
  AI 147710: Add redirects for sdk/preview pages.
2009-04-29 13:35:39 -07:00
Bill Napier
2074bc6c24 am 819c102: am 78b1511: AI 147541: Add cs as default language for cz.
Merge commit '819c102394bfee2960997fb3fa0c85d3b6427dfc'

* commit '819c102394bfee2960997fb3fa0c85d3b6427dfc':
  AI 147541: Add cs as default language for cz.
2009-04-29 13:35:39 -07:00
Scott Main
64b786f159 am af3289e: am 620986a: AI 147438: add app widget docs to dev guide
Merge commit 'af3289e4448971b38ae4e95269401452dbc6077e'

* commit 'af3289e4448971b38ae4e95269401452dbc6077e':
  AI 147438: add app widget docs to dev guide
2009-04-29 13:35:39 -07:00
Dirk Dougherty
3d31904115 am 181634f: am 134e8e4: AI 147433: Fix broken link to sdk/samples dir in
Merge commit '181634f0803d5d18ce48e811f697ea658852a95e'

* commit '181634f0803d5d18ce48e811f697ea658852a95e':
  AI 147433: Fix broken link to sdk/samples dir in the offline.html page.
2009-04-29 13:35:38 -07:00
Android (Google) Code Review
212548f634 am 76b25e5: Merge change 692 into donut
Merge commit '76b25e5e78dde3443f9c57c47e5989ad8ff43771'

* commit '76b25e5e78dde3443f9c57c47e5989ad8ff43771':
  location: Optimize use of mProviders ArrayList.
2009-04-29 13:35:38 -07:00
Mitsuru Oshima
c2839e0870 am 13735a2: Merge branch \'readonly-p4-donut\' into donut
Merge commit '13735a255dedd2c2e3b0cff66f0be2e17671f553'

* commit '13735a255dedd2c2e3b0cff66f0be2e17671f553':
  AI 147976: Compatibility mode support. Part 2.
2009-04-29 13:35:38 -07:00
Android (Google) Code Review
c36349034a am d306052: Merge change 542 into donut
Merge commit 'd30605200b8b0f10e4740a9d7266d240023e69cd'

* commit 'd30605200b8b0f10e4740a9d7266d240023e69cd':
  enable additional cdma sms fields and user data encodings
2009-04-29 13:35:37 -07:00
Android (Google) Code Review
77c8adf9ff am 5f2788b: Merge change 686 into donut
Merge commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826'

* commit '5f2788bc9d947f7793aaea06f7e21d6b74c98826':
  gps: Don't crash if no XTRA servers are specified.
2009-04-29 13:35:37 -07:00
Android (Google) Code Review
a73b41ae60 am 0124a15: Merge change 626 into donut
Merge commit '0124a150157d69a9f0ea109be2390afb5399b8a7'

* commit '0124a150157d69a9f0ea109be2390afb5399b8a7':
  fix 1803886 android15 Translucent GLSurfaceView demo does not display properly
2009-04-29 13:35:37 -07:00
Karl Rosaen
2f7e0447ac am 98e333f: Fix back key and ime behavior for search dialog.
Merge commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b'

* commit '98e333f551a4bf2ebb50bb97a2a56b14bfdcd74b':
  Fix back key and ime behavior for search dialog.
2009-04-29 13:35:36 -07:00
Android (Google) Code Review
d17d8b4f12 am 4924ae8: Merge change 618 into donut
Merge commit '4924ae8d1f7610b8639e55b1088f6b4a993bfd40'

* commit '4924ae8d1f7610b8639e55b1088f6b4a993bfd40':
  Fixes #1816088. Avoid initializing empty Rects when they are useless, especially in Zygote.
2009-04-29 13:35:36 -07:00
Android (Google) Code Review
36ef99673b am e4de845: Merge change 625 into donut
Merge commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0'

* commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0':
  fix 1812272 SensorManager method returns hidden object
2009-04-29 13:35:35 -07:00
Android (Google) Code Review
d3f78458dd am 6fcddb0: Merge change 629 into donut
Merge commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f'

* commit '6fcddb05eee19edfd3063b9eefbdb0de0dbd4f4f':
  Display the app icon to the left of the search field for search within apps.
2009-04-29 13:35:35 -07:00
Android (Google) Code Review
a5a51e1724 am 77c9990: Merge change 599 into donut
Merge commit '77c9990ae0806575ae7a2750459f3e74f0bec092'

* commit '77c9990ae0806575ae7a2750459f3e74f0bec092':
  Add call to (new) Canvas.freeCaches() in response to low-memory
2009-04-29 13:35:35 -07:00
Mike Lockwood
73ee32d41b am b8adcad: location: Remove obsolete fake provider support.
Merge commit 'b8adcad61d9225ecdabde1a01b73455f484cbed7'

* commit 'b8adcad61d9225ecdabde1a01b73455f484cbed7':
  location: Remove obsolete fake provider support.
2009-04-29 13:35:34 -07:00
Mike Lockwood
05d0243296 am 79762a3: location: Move DummyLocationProvider.java and LocationProvid
Merge commit '79762a3ee34eb8be5549bcb183af844b6f19c266'

* commit '79762a3ee34eb8be5549bcb183af844b6f19c266':
  location: Move DummyLocationProvider.java and LocationProviderImpl.java to the internal package.
2009-04-29 13:35:34 -07:00
Mike Lockwood
8749fecd99 am eedf815: location: Remove redundant mLocationTracking field from GpsL
Merge commit 'eedf815a2bd44c365a6885553a52cd2fcbfdce8c'

* commit 'eedf815a2bd44c365a6885553a52cd2fcbfdce8c':
  location: Remove redundant mLocationTracking field from GpsLocationProvider
2009-04-29 13:35:34 -07:00
Android (Google) Code Review
7c8dbb5418 am 7cb8ed2: Merge change 414 into donut
Merge commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66'

* commit '7cb8ed23ab81b7cffdff6fc1cad473f55732ea66':
  location: Run LocationManagerService in a separate thread.
2009-04-29 13:35:34 -07:00
Android (Google) Code Review
070d4c023a am 3de05ff: Merge change 586 into donut
Merge commit '3de05ffb910b572f7816b838628567c760540f7d'

* commit '3de05ffb910b572f7816b838628567c760540f7d':
  Manage imagecache ram budget
2009-04-29 13:35:33 -07:00
Android (Google) Code Review
8e64406227 am 17f213b: Merge change 602 into donut
Merge commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781'

* commit '17f213bc528cf296e133e9ec9c9e0ce5dce41781':
  Bug fix(1807910): media recorder crash due to the use of locked camera object (last part)
2009-04-29 13:35:33 -07:00
Android (Google) Code Review
1d066287d3 am 04ab1c7: Merge change 573 into donut
Merge commit '04ab1c767199bc674a7b7424fdd0d527c32252ac'

* commit '04ab1c767199bc674a7b7424fdd0d527c32252ac':
  Add a grey line to the top of the search plate image so it doesn't
2009-04-29 13:35:33 -07:00
Mitsuru Oshima
4cc574be4e am 257eef3: Merge branch \'readonly-p4-donut\' into donut
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a'

* commit '257eef353dfc9519b63e3fe2616505c5534b460a':
  AI 147845: Compatibility mode support. Part 1
2009-04-29 13:35:29 -07:00