Commit Graph

2705 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
mike ritter
3fb2d576e9 am c0446aa9: Merge change I4d2a57bc into eclair-mr2
Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp

* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
  Moved values into attributes of xml elements where they belong
2009-11-05 13:58:42 -08:00
Fred Quintana
a04b9614ce am b5723869: Merge change I85aa2b1d into eclair
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2

* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 13:53:36 -08:00
Android (Google) Code Review
c0446aa9d2 Merge change I4d2a57bc into eclair-mr2
* changes:
  Moved values into attributes of xml elements where they belong
2009-11-05 16:50:10 -05:00
Android (Google) Code Review
b57238690e Merge change I85aa2b1d into eclair
* changes:
  create a test app that allows direct control of a sync adapter for testing purposes
2009-11-05 14:16:08 -05:00
Fred Quintana
d7a3ea819d create a test app that allows direct control of a sync adapter for testing purposes
http://b/issue?id=2239791
2009-11-05 11:05:11 -08:00
Xavier Ducrohet
019eca1a79 am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp

* commit '4e97e5da372f1be39e9eeccc9cad7a551c164828':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:25:12 -08:00
Xavier Ducrohet
4e97e5da37 am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2

* commit '421e8d3353de606444e5350d8feeee8c01c90394':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:15:19 -08:00
Xavier Ducrohet
421e8d3353 am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair

* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
  Ignore hidden files and vi swap files during packaging. (do not merge)
2009-11-04 15:05:34 -08:00
Xavier Ducrohet
7f305ce770 Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #2233458

This is integrated from eclair.
2009-11-04 14:46:40 -08:00
Eric Rowe
a6d49e3a2e am 80de9538: Fix bug where monkey always tries to run multiple scripts.
Merge commit '80de953874fd16dae6c89a2949e2fd5a14c1303f' into eclair-mr2-plus-aosp

* commit '80de953874fd16dae6c89a2949e2fd5a14c1303f':
  Fix bug where monkey always tries to run multiple scripts.
2009-11-03 18:42:55 -08:00
Eric Rowe
80de953874 Fix bug where monkey always tries to run multiple scripts.
Change condition so MonkeySourceRandromScript is only triggered on multiple
scripts.
2009-11-03 18:28:51 -08:00
Raphael
3d18353bac am 0136501f: am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp

* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:35:39 -08:00
Raphael
0136501f88 am 03684b9d: am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2

* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:25:07 -08:00
Raphael
03684b9d88 am 4bf2ce27: SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair

* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
  SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
2009-11-03 12:17:52 -08:00
Mike Reed
9aa2afdf71 am 093d9020: Merge change I01b36924 into eclair-mr2
Merge commit '093d9020e4569c499d6e0094183fc3a90542404d' into eclair-mr2-plus-aosp

* commit '093d9020e4569c499d6e0094183fc3a90542404d':
  click OK to toggle between demos
2009-11-03 11:54:45 -08:00
Android (Google) Code Review
093d9020e4 Merge change I01b36924 into eclair-mr2
* changes:
  click OK to toggle between demos
2009-11-03 14:45:53 -05:00
Xavier Ducrohet
3a8967f62c am 78c9bb59: am f9e0b264: Move check for hidden files in the proper method.
Merge commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp

* commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
  Move check for hidden files in the proper method.
2009-11-03 11:44:40 -08:00
Mike Reed
01b3692429 click OK to toggle between demos 2009-11-03 11:44:25 -08:00
Xavier Ducrohet
78c9bb59eb am f9e0b264: Move check for hidden files in the proper method.
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-mr2

* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
  Move check for hidden files in the proper method.
2009-11-03 11:34:02 -08:00
Xavier Ducrohet
f9e0b26442 Move check for hidden files in the proper method.
Change-Id: I0a364b118d60aaab259cba2b13edcc2c31c39148
2009-11-03 11:23:06 -08:00
Raphael
f2bf99c387 am a3dce5a0: am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit 'a3dce5a089e64ac0e52405ae34560392d360e964' into eclair-mr2-plus-aosp

* commit 'a3dce5a089e64ac0e52405ae34560392d360e964':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 10:02:24 -08:00
Raphael
a3dce5a089 am 8d700bdf: SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-mr2

* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
  SDK: fix build. checkFileForPackaging is used by ApkBuilder.
2009-11-03 09:53:32 -08:00
Raphael
8d700bdf67 SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6
Reference: Change If0d0751e
SDK BUG 2233458
2009-11-03 09:40:55 -08:00
Xavier Ducrohet
7f98994af2 am 35d140af: am f31f6303: Merge change If0d0751e into eclair
Merge commit '35d140afb413e52f0ed43e30d41050348688f2e2' into eclair-mr2-plus-aosp

* commit '35d140afb413e52f0ed43e30d41050348688f2e2':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:26:46 -08:00
Xavier Ducrohet
35d140afb4 am f31f6303: Merge change If0d0751e into eclair
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
  Ignore hidden files and vi swap files during packaging.
2009-11-02 23:16:41 -08:00
Android (Google) Code Review
f31f630320 Merge change If0d0751e into eclair
* changes:
  Ignore hidden files and vi swap files during packaging.
2009-11-03 02:06:32 -05:00
Xavier Ducrohet
b159651709 Ignore hidden files and vi swap files during packaging.
BUG #2233458

Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
2009-11-02 18:31:46 -08:00
Brett Chabot
78ba4a5444 am 56af356a: am a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit '56af356a420bb6329cf309d7ad972f8441fd911c' into eclair-mr2-plus-aosp

* commit '56af356a420bb6329cf309d7ad972f8441fd911c':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:25:16 -08:00
Brett Chabot
56af356a42 am a9982898: (-s ours) Merge change Ida443c07 into eclair
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-mr2

* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 17:14:46 -08:00
Android (Google) Code Review
a9982898b3 Merge change Ida443c07 into eclair
* changes:
  Remove calendar provider suite from continuous. DO NOT MERGE
2009-11-02 20:08:06 -05:00
Raphael
4bf2ce27a0 SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
SDK BUG 2232091

Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
2009-11-02 16:43:32 -08:00
Eric Rowe
7ccaafad0c am fd2d528e: Merge change I20a74d79 into eclair-mr2
Merge commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f' into eclair-mr2-plus-aosp

* commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f':
  Create way to run monkey with multiple scripts.
2009-11-02 14:40:29 -08:00