Commit Graph

2752 Commits

Author SHA1 Message Date
Android Git Automerger
fc6e75e533 am 228bbae1: am e259566c: Put this change back, false alert with build breakage
Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp

* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
  Put this change back, false alert with build breakage
2009-11-13 13:11:09 -08:00
Android Git Automerger
228bbae1e3 am e259566c: Put this change back, false alert with build breakage
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2

* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
  Put this change back, false alert with build breakage
2009-11-13 13:06:11 -08:00
Android Git Automerger
e259566cef Put this change back, false alert with build breakage
This reverts commit a9046e418e.
2009-11-13 12:26:06 -08:00
Android Git Automerger
2c97ad648c am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Merge commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb' into eclair-mr2-plus-aosp

* commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:55:32 -08:00
Android Git Automerger
0bf9cdf569 am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
Merge commit 'a9046e418e539e208af6f3723a513666074ec6a1' into eclair-mr2

* commit 'a9046e418e539e208af6f3723a513666074ec6a1':
  Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:50:47 -08:00
Android Git Automerger
a9046e418e Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
This reverts commit 18e1486a27.
2009-11-13 11:40:40 -08:00
Jason Sams
5a571291d3 am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
Merge commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5' into eclair-mr2-plus-aosp

* commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5':
  Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:14:43 -08:00
Jason Sams
0c0d7d25fd am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
Merge commit '18e1486a2749055414579f487b125021eb79b8ca' into eclair-mr2

* commit '18e1486a2749055414579f487b125021eb79b8ca':
  Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:07:33 -08:00
Jason Sams
18e1486a27 Remove surface from rs init and handle surfaceChanged correctly. 2009-11-12 15:08:27 -08:00
Brett Chabot
ca603e23d3 am b2876c0c: am cf87c98a: Add contacts launch performance test definition.
Merge commit 'b2876c0c46107aadabd0ccc2f1b10c04f4c2f169' into eclair-mr2-plus-aosp

* commit 'b2876c0c46107aadabd0ccc2f1b10c04f4c2f169':
  Add contacts launch performance test definition.
2009-11-12 12:08:18 -08:00
Xavier Ducrohet
0034543d23 am 7ec1c45b: am c84040c1: Merge change I6fd4cd01 into eclair
Merge commit '7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4' into eclair-mr2-plus-aosp

* commit '7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4':
  Add an overlay to make the latinIME the default one in the SDK
2009-11-12 12:08:14 -08:00
Brett Chabot
b2876c0c46 am cf87c98a: Add contacts launch performance test definition.
Merge commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f' into eclair-mr2

* commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f':
  Add contacts launch performance test definition.
2009-11-12 12:04:10 -08:00
Xavier Ducrohet
7ec1c45b3a am c84040c1: Merge change I6fd4cd01 into eclair
Merge commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394' into eclair-mr2

* commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394':
  Add an overlay to make the latinIME the default one in the SDK
2009-11-12 12:04:06 -08:00
Brett Chabot
cf87c98ad1 Add contacts launch performance test definition.
Change-Id: I8d4376e676a682c59accbb129a4d77efb5696e28
2009-11-12 11:47:16 -08:00
Fred Quintana
864f49d8e9 am c34c79fc: am cf229bb0: make consistent with new RegisteredServicesCache API
Merge commit 'c34c79fc6627329f1c9586d51524d95d57022aaf' into eclair-mr2-plus-aosp

* commit 'c34c79fc6627329f1c9586d51524d95d57022aaf':
  make consistent with new RegisteredServicesCache API
2009-11-11 17:24:03 -08:00
Fred Quintana
c34c79fc66 am cf229bb0: make consistent with new RegisteredServicesCache API
Merge commit 'cf229bb013317db77034980c212ab07bea260261' into eclair-mr2

* commit 'cf229bb013317db77034980c212ab07bea260261':
  make consistent with new RegisteredServicesCache API
2009-11-11 17:07:27 -08:00
Android (Google) Code Review
c84040c18b Merge change I6fd4cd01 into eclair
* changes:
  Add an overlay to make the latinIME the default one in the SDK
2009-11-11 11:20:09 -08:00
Xavier Ducrohet
d9750719c3 Add an overlay to make the latinIME the default one in the SDK
BUG 2225111

Change-Id: I6fd4cd0159f1eb90b78e3398a8e97d74d6396f9f
2009-11-10 18:14:11 -08:00
Fred Quintana
cf229bb013 make consistent with new RegisteredServicesCache API 2009-11-10 16:33:20 -08:00
Marco Nelissen
0badc7f8c3 am 81515abc: am 42c35199: Update live wallpaper examples to new api.
Merge commit '81515abca85e742584db3c7cdacc5b840f0eb650' into eclair-mr2-plus-aosp

* commit '81515abca85e742584db3c7cdacc5b840f0eb650':
  Update live wallpaper examples to new api.
2009-11-09 19:40:25 -08:00
Marco Nelissen
81515abca8 am 42c35199: Update live wallpaper examples to new api.
Merge commit '42c35199db9b3ec2ec467f926538e5d748e0b49d' into eclair-mr2

* commit '42c35199db9b3ec2ec467f926538e5d748e0b49d':
  Update live wallpaper examples to new api.
2009-11-09 19:36:46 -08:00
Raphael
d4f5e0a9dd am a7f3e75e: am 2d03b2a5: am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit 'a7f3e75ebb849bff947d12b3be24145c4cb9de9a' into eclair-mr2-plus-aosp

* commit 'a7f3e75ebb849bff947d12b3be24145c4cb9de9a':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 16:23:29 -08:00
Raphael
a7f3e75ebb am 2d03b2a5: am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e' into eclair-mr2

* commit '2d03b2a5d172e7f9a3fd8e50e27b9c5a3a87b96e':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 16:17:21 -08:00
Marco Nelissen
42c35199db Update live wallpaper examples to new api. 2009-11-09 15:45:02 -08:00
Derek Sollenberger
c3e07f9d44 am 606fe528: Merge change Ib4a23918 into eclair-mr2
Merge commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934' into eclair-mr2-plus-aosp

* commit '606fe5281d830a6f4eb7ba36bf7127eb3b8cd934':
  Updating sample plugin to test java class loading.
2009-11-09 12:47:14 -08:00
Android (Google) Code Review
606fe5281d Merge change Ib4a23918 into eclair-mr2
* changes:
  Updating sample plugin to test java class loading.
2009-11-09 12:43:03 -08:00
Derek Sollenberger
b4a23918d3 Updating sample plugin to test java class loading. 2009-11-09 15:38:58 -05:00
Bjorn Bringert
f9e27790eb am e8b11328: am f702fa41: Merge change I53c8228b into eclair
Merge commit 'e8b11328e22d4e187e195753f1aacb59c5e30179' into eclair-mr2-plus-aosp

* commit 'e8b11328e22d4e187e195753f1aacb59c5e30179':
  Fix type of _id col in SearchableDictionary
2009-11-09 12:14:29 -08:00
Xavier Ducrohet
538ff70d5f am 811d2c75: am 7e56f226: Merge change I68a71c11 into eclair
Merge commit '811d2c7507b03f04391c7b21e0de795c6ad12f5d' into eclair-mr2-plus-aosp

* commit '811d2c7507b03f04391c7b21e0de795c6ad12f5d':
  Add Japanese font to SDK.
2009-11-09 12:14:25 -08:00
Brett Chabot
11ea938d2a am 851c913b: am f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b' into eclair-mr2-plus-aosp

* commit '851c913b6e3cdf7cb334d4b24ae3e1079554203b':
  Update adt-tests build.properties to include new test data location.
2009-11-09 12:14:20 -08:00
Raphael
2d03b2a5d1 am 8ccddf4c: Merge change Id49751eb into eclair-sdk
Merge commit '8ccddf4c00464c6fee998d56da1f08b4662abf62' into eclair

* commit '8ccddf4c00464c6fee998d56da1f08b4662abf62':
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-09 11:59:37 -08:00
Bjorn Bringert
e8b11328e2 am f702fa41: Merge change I53c8228b into eclair
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-mr2

* commit 'f702fa413273d175ba499bcb9bd352d208621d95':
  Fix type of _id col in SearchableDictionary
2009-11-09 11:57:37 -08:00
Xavier Ducrohet
811d2c7507 am 7e56f226: Merge change I68a71c11 into eclair
Merge commit '7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-mr2

* commit '7e56f226f745c2397b2cec4d0da1f61276e1b150':
  Add Japanese font to SDK.
2009-11-09 11:57:33 -08:00
Brett Chabot
851c913b6e am f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-mr2

* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
  Update adt-tests build.properties to include new test data location.
2009-11-09 11:57:18 -08:00
Android (Google) Code Review
f702fa4132 Merge change I53c8228b into eclair
* changes:
  Fix type of _id col in SearchableDictionary
2009-11-09 08:58:40 -08:00
Jean-Baptiste Queru
515a94b25a merge from open-source master 2009-11-09 08:04:49 -08:00
Android (Google) Code Review
7e56f226f7 Merge change I68a71c11 into eclair
* changes:
  Add Japanese font to SDK.
2009-11-08 17:02:05 -08:00
Xavier Ducrohet
808c454132 Add Japanese font to SDK.
BUG 2041229

Change-Id: I68a71c11ae4f61c987a888dadf205f585b577c61
2009-11-08 15:17:25 -08:00
Brett Chabot
f765a70ac7 Update adt-tests build.properties to include new test data location.
Missed this file in the 31885 commit.
2009-11-08 13:46:35 -08:00
Android (Google) Code Review
8ccddf4c00 Merge change Id49751eb into eclair-sdk
* changes:
  SDK Manager: reuse complete downloads, retry Windows locks.
2009-11-08 13:34:15 -08:00
Brett Chabot
c35d965427 am e458201d: am 534b520e: Merge change If5b2f9df into eclair
Merge commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f' into eclair-mr2-plus-aosp

* commit 'e458201d1ab45d9b72027d3d319d16810bf0b94f':
  Fix ADT test data references.
2009-11-07 12:59:10 -08:00
Brett Chabot
e458201d1a am 534b520e: Merge change If5b2f9df into eclair
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-mr2

* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
  Fix ADT test data references.
2009-11-07 12:49:46 -08:00
Android (Google) Code Review
534b520e4a Merge change If5b2f9df into eclair
* changes:
  Fix ADT test data references.
2009-11-07 15:40:26 -05:00
Raphael
28f6fda581 SDK Manager: reuse complete downloads, retry Windows locks.
This resolves 2 main issues with the SDK updater:
- Completed downloads are not cleared till the install is successful
- They are also stored in SDK/temp rather than the real Windows TEMP
  folder, making them more discoverable for savvy users.
- There's a retry loop on failed install when due to a directory
  being locked.
- The retry loop comes with the a Big Fat Warning[tm] in a modal
  dialog box. You can't miss it. And it explicitly mentions the
  antivirus software can be the root cause.

SDK BUG 2235058

Change-Id: Id49751ebd67e7291a0e7005136b22576335729c1
2009-11-06 19:04:28 -08:00
Raphael
d80d98a559 am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6' into eclair-mr2-plus-aosp

* commit 'a4ebc12213eafa5297343c6c3e73c7a5acda3fb6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:51:10 -08:00
Raphael
a4ebc12213 am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:42:10 -08:00
Raphael
3de259034c am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '8e3442f1b0fc19c8213978d4e7ac005774462297' into eclair

* commit '8e3442f1b0fc19c8213978d4e7ac005774462297':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:13:41 -08:00
Android (Google) Code Review
8e3442f1b0 Merge change Ic291d534 into eclair-sdk
* changes:
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 19:06:48 -05:00
Raphael
3e9f34498a SDK Manager: refresh sources when HTTP/S pref is changed.
Currently you need to use the Refresh button in the remote page
after you change the HTTP/s setting and many users think
instead they need to close/restart the SDK manager.

Change-Id: Ic291d53459624558910bbc417295df5ddc7b037d
2009-11-06 15:18:57 -08:00
Raphael
86df89cf62 am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '2d2d34086516a36e8d26f927c75b9944fd07b69f' into eclair-mr2-plus-aosp

* commit '2d2d34086516a36e8d26f927c75b9944fd07b69f':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:18:37 -08:00