Commit Graph

3376 Commits

Author SHA1 Message Date
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
Bjorn Bringert
4ad6bb5395 am f702fa41: Merge change I53c8228b into eclair
Merge commit 'f702fa413273d175ba499bcb9bd352d208621d95' into eclair-plus-aosp

* commit 'f702fa413273d175ba499bcb9bd352d208621d95':
  Fix type of _id col in SearchableDictionary
2009-11-09 11:48:06 -08:00
Xavier Ducrohet
5928b532a4 am 7e56f226: Merge change I68a71c11 into eclair
Merge commit '7e56f226f745c2397b2cec4d0da1f61276e1b150' into eclair-plus-aosp

* commit '7e56f226f745c2397b2cec4d0da1f61276e1b150':
  Add Japanese font to SDK.
2009-11-09 11:48:02 -08:00
Brett Chabot
584f31391d am f765a70a: Update adt-tests build.properties to include new test data location.
Merge commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0' into eclair-plus-aosp

* commit 'f765a70ac7dd8aabbaca696af5860c2bffdf8df0':
  Update adt-tests build.properties to include new test data location.
2009-11-09 11:47:56 -08:00
Dan Morrill
5856aaca18 Forgot to remove now-obsolete PDK files in last commit. 2009-11-09 10:13:58 -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
Android (Google) Code Review
00689a7e23 Merge change I3cd199f9
* changes:
  Work-in-progress snapshot of the source.android.com (formerly PDK) site refresh.
2009-11-09 08:07:16 -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
Jean-Baptiste Queru
731555636a merge from open-source master 2009-11-08 16:09:19 -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
2ea6d59567 am c35d9654: am e458201d: am 534b520e: Merge change If5b2f9df into eclair
Merge commit 'c35d96542787333ee87b4b356aa499a64cdc78d7'

* commit 'c35d96542787333ee87b4b356aa499a64cdc78d7':
  Fix ADT test data references.
2009-11-07 13:08:39 -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
a089077443 am 534b520e: Merge change If5b2f9df into eclair
Merge commit '534b520e4add964f75cf6a8a612b54916d46da2e' into eclair-plus-aosp

* commit '534b520e4add964f75cf6a8a612b54916d46da2e':
  Fix ADT test data references.
2009-11-07 12:49:49 -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
a64b9fcdcd am d80d98a5: am a4ebc122: am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c'

* commit 'd80d98a5591a68fff9f02b768a08c0e1076aa36c':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 17:00:35 -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
4c6d950c99 am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk
Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-plus-aosp

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
2009-11-06 16:24:45 -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
098e9de155 am 86df89cf: am 2d2d3408: am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c'

* commit '86df89cf62b4f4f274858b840fa97a50c1a9d50c':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:29:58 -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
Raphael
d833bbd1f0 am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-plus-aosp

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:09:07 -08:00
Raphael
2d2d340865 am bf9a70fb: am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63' into eclair-mr2

* commit 'bf9a70fb1beb15944cb47d267c7b15ab699dca63':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:08:28 -08:00
Dan Morrill
3cd199f9a6 Work-in-progress snapshot of the source.android.com (formerly PDK) site
refresh.
2009-11-06 14:04:16 -08:00
Raphael
bf9a70fb1b am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair

* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.
2009-11-06 14:00:55 -08:00
Raphael
ca4603db2f SDK: fix NPE in AVD Manager > Start when skin.path is missing.
Change-Id: I0e42d3f110cfc4e313972f3021b7d2d84dfbd64d
2009-11-06 13:42:28 -08:00
Xavier Ducrohet
ab566dea57 am 01262b3a: am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '01262b3ae709cbe1f141ab8976e4926510fd429d'

* commit '01262b3ae709cbe1f141ab8976e4926510fd429d':
  ADT now launches app as if launched from launcher.
2009-11-06 11:34:55 -08:00
Xavier Ducrohet
01262b3ae7 am f0f501ec: am 396a10e4: Merge change I793a35a9 into eclair
Merge commit 'f0f501ec27a4b37bf06288de808bc083d251921a' into eclair-mr2-plus-aosp

* commit 'f0f501ec27a4b37bf06288de808bc083d251921a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:24:31 -08:00
Xavier Ducrohet
f0f501ec27 am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-mr2

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:15:38 -08:00
Xavier Ducrohet
d0fecc9c49 am 396a10e4: Merge change I793a35a9 into eclair
Merge commit '396a10e48d7201215e54821fa0d7901ffde3a30a' into eclair-plus-aosp

* commit '396a10e48d7201215e54821fa0d7901ffde3a30a':
  ADT now launches app as if launched from launcher.
2009-11-06 11:14:54 -08:00
Android (Google) Code Review
396a10e48d Merge change I793a35a9 into eclair
* changes:
  ADT now launches app as if launched from launcher.
2009-11-06 14:08:24 -05:00
Xavier Ducrohet
efc6be0e33 ADT now launches app as if launched from launcher.
BUG 2243142

Change-Id: I793a35a92cf0f818242e74e4794d74a681b25d83
2009-11-06 10:50:27 -08:00
Xavier Ducrohet
3f27e97385 am 886119f5: am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '886119f56de90a5569915be9782de4b69460930a'

* commit '886119f56de90a5569915be9782de4b69460930a':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:46:46 -08:00
Xavier Ducrohet
886119f56d am e9373a42: am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit 'e9373a42114a9ed37dbdc68991250bd40f54552f' into eclair-mr2-plus-aosp

* commit 'e9373a42114a9ed37dbdc68991250bd40f54552f':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:36:18 -08:00
Xavier Ducrohet
e9373a4211 am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-mr2

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:26:37 -08:00
Xavier Ducrohet
dc84e4c722 am 7853d243: Merge change I1fa1ae88 into eclair
Merge commit '7853d243aa0f2947249aa610972d74622cdddd82' into eclair-plus-aosp

* commit '7853d243aa0f2947249aa610972d74622cdddd82':
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 10:26:19 -08:00
Android (Google) Code Review
7853d243aa Merge change I1fa1ae88 into eclair
* changes:
  Move Tools to rev 5, and ADT to 0.9.5
2009-11-06 13:15:45 -05:00
Xavier Ducrohet
c48867aab4 Move Tools to rev 5, and ADT to 0.9.5
Change-Id: I1fa1ae883eea4d27d5718788594ab0cb52ca6445
2009-11-06 10:05:53 -08:00
Fred Quintana
193b41e32b am ae8ea92c: am a04b9614: am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214'

* commit 'ae8ea92c1111e993e4fb5eb115ff6d2c5c21d214':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 14:11:53 -08:00
mike ritter
0e6c468b95 am 3fb2d576: am c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276'

* commit '3fb2d576e9f386ecaa6a2637131c8fac89d05276':
  Moved values into attributes of xml elements where they belong
2009-11-05 14:11:46 -08:00
Fred Quintana
ae8ea92c11 am a04b9614: am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp

* commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 13:58:54 -08:00