Commit Graph

2705 Commits

Author SHA1 Message Date
Android (Google) Code Review
fd2d528e36 Merge change I20a74d79 into eclair-mr2
* changes:
  Create way to run monkey with multiple scripts.
2009-11-02 17:31:49 -05:00
Xavier Ducrohet
ed52a500e3 am dd43447b: am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517' into eclair-mr2-plus-aosp

* commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:57:19 -08:00
Xavier Ducrohet
dd43447bb2 am 208c7569: (-s ours) am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2

* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:45:31 -08:00
Xavier Ducrohet
208c75697e am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)
Merge commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair

* commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92':
  Only apply permission to files with +x (do not merge)
2009-11-02 12:34:39 -08:00
Xavier Ducrohet
0dd85d89fa Only apply permission to files with +x (do not merge)
integrated from eclair branch.
2009-11-02 12:13:45 -08:00
Xavier Ducrohet
5d41c599a7 am 99906d6e: am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a' into eclair-mr2-plus-aosp

* commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a':
  Only apply permission to files with +x
2009-11-02 11:58:31 -08:00
Xavier Ducrohet
99906d6e17 am 192d5db1: Merge change Ied3304a0 into eclair
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2

* commit '192d5db1fedef99404644256f80740bb3763b049':
  Only apply permission to files with +x
2009-11-02 11:48:45 -08:00
Android (Google) Code Review
192d5db1fe Merge change Ied3304a0 into eclair
* changes:
  Only apply permission to files with +x
2009-11-02 14:40:10 -05:00
Brett Chabot
4277838e68 Remove calendar provider suite from continuous. DO NOT MERGE
Bug 2171501
2009-10-30 17:49:36 -07:00
Xavier Ducrohet
67ba2de9e7 Only apply permission to files with +x
Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
2009-10-30 16:34:47 -07:00
Raphael
3bb9432474 am 62ad060a: am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '62ad060a05c3f9d76cdc768e1654d3db3f359280' into eclair-mr2-plus-aosp

* commit '62ad060a05c3f9d76cdc768e1654d3db3f359280':
  SDK Manager: Display error when saving settings
2009-10-30 13:18:14 -07:00
Raphael
62ad060a05 am 8a370089: am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4' into eclair-mr2

* commit '8a370089b824f5acd97b5986b9b1e5bff3aefca4':
  SDK Manager: Display error when saving settings
2009-10-30 13:08:23 -07:00
Raphael
8a370089b8 am d3f9eb79: SDK Manager: Display error when saving settings
Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair

* commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de':
  SDK Manager: Display error when saving settings
2009-10-30 13:01:22 -07:00
Raphael
d3f9eb79c7 SDK Manager: Display error when saving settings
SDK BUG 2226029

Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
2009-10-29 21:28:45 -07:00
Dmitri Plotnikov
a883d5af06 am 7cb020a9: am 41c271bb: Merge change Iae0bc856 into eclair
Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp

* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
  A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 19:52:34 -07:00
Raphael
914c1ad15f am fa273bbf: am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit 'fa273bbf016bcd96e17a70b20962be997683b746' into eclair-mr2-plus-aosp

* commit 'fa273bbf016bcd96e17a70b20962be997683b746':
  SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 19:52:28 -07:00
Brett Chabot
f09e872d7d am 4ab62412: am da78534e: Merge change Ia94518e3 into eclair
Merge commit '4ab624121684ae57461ab85828eecc6de05cf64b' into eclair-mr2-plus-aosp

* commit '4ab624121684ae57461ab85828eecc6de05cf64b':
  ADT test fixes.
2009-10-29 19:52:15 -07:00
Raphael
9403f1ce47 am 23e92c7d: am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '23e92c7d3187e8c29a02ef82c666b84380557eff' into eclair-mr2-plus-aosp

* commit '23e92c7d3187e8c29a02ef82c666b84380557eff':
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 19:52:09 -07:00
Raphael
fabe8b0f3f am ec176735: am 1a29f28e: (-s ours) am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit 'ec1767356bc2249387d0e60d20cf64d752d86ab2' into eclair-mr2-plus-aosp

* commit 'ec1767356bc2249387d0e60d20cf64d752d86ab2':
  SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 19:52:01 -07:00
Xavier Ducrohet
dc7f152a6d am f4513d58: am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit 'f4513d58e27c13d40494f41cfa11421e7c15ea59' into eclair-mr2-plus-aosp

* commit 'f4513d58e27c13d40494f41cfa11421e7c15ea59':
  Move SDK tools package to r4
2009-10-29 19:51:54 -07:00
Xavier Ducrohet
a20fa0d939 am aa02f40c: am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
Merge commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081' into eclair-mr2-plus-aosp

* commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081':
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 19:51:46 -07:00
Mike Reed
16f13724ad am 8d0b3af5: Merge change Ia8fe3f64 into eclair-mr2
Merge commit '8d0b3af557553992d8a4f1eab6567c6535544f92' into eclair-mr2-plus-aosp

* commit '8d0b3af557553992d8a4f1eab6567c6535544f92':
  add graphicslab test app
2009-10-29 19:51:36 -07:00
Dmitri Plotnikov
7cb020a947 am 41c271bb: Merge change Iae0bc856 into eclair
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2

* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
  A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 19:32:52 -07:00
Raphael
fa273bbf01 am 7a42c8f4: am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae' into eclair-mr2

* commit '7a42c8f4d58306dfd2aa14d7d3ee52ebb54a19ae':
  SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 19:32:40 -07:00
Brett Chabot
4ab6241216 am da78534e: Merge change Ia94518e3 into eclair
Merge commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c' into eclair-mr2

* commit 'da78534e3aefa41c7b76f6570cfcd7cea296325c':
  ADT test fixes.
2009-10-29 19:32:34 -07:00
Raphael
23e92c7d31 am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2

* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 19:31:07 -07:00
Raphael
ec1767356b am 1a29f28e: (-s ours) am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43' into eclair-mr2

* commit '1a29f28e13c32fd8e62f08677c23d1d37644dd43':
  SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 19:31:01 -07:00
Xavier Ducrohet
f4513d58e2 am 8d7fa52a: am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '8d7fa52af11670e2640b12466cc094960f0455b1' into eclair-mr2

* commit '8d7fa52af11670e2640b12466cc094960f0455b1':
  Move SDK tools package to r4
2009-10-29 19:30:19 -07:00
Xavier Ducrohet
aa02f40c1b am f7f145dc: am 275de810: Merge change I2089d86d into eclair-sdk
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2

* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 19:29:38 -07:00
Android (Google) Code Review
41c271bb20 Merge change Iae0bc856 into eclair
* changes:
  A sample application that demonstrates use of legacy and current contacts APIs.
2009-10-29 17:49:26 -04:00
Raphael
7a42c8f4d5 am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.
Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair

* commit 'be4cbcc2267e3778776c68785b52f871f72c67f7':
  SDK Manager: fix NPE in AVD > Start when there's no skin name.
2009-10-29 14:31:05 -07:00
Dmitri Plotnikov
5635cf46c1 A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API.  The correct implementation
is chosen at runtime based on the version of the SDK.

Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
2009-10-29 14:23:44 -07:00
Raphael
be4cbcc226 SDK Manager: fix NPE in AVD > Start when there's no skin name.
Also log missing config.ini path.

SDK BUG 2223760

Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
2009-10-29 13:52:56 -07:00
Android (Google) Code Review
da78534e3a Merge change Ia94518e3 into eclair
* changes:
  ADT test fixes.
2009-10-29 16:45:53 -04:00
Raphael
aad90b62c7 am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair

* commit '940073e267695a7c4a404cb2174b48e893c15a45':
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 13:30:46 -07:00
Raphael
1a29f28e13 am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdk
Merge commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair

* commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e':
  SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 13:30:39 -07:00
Android (Google) Code Review
940073e267 Merge change I28aa1104 into eclair-sdk
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
2009-10-29 16:22:26 -04:00
Android (Google) Code Review
dd77d69f9e Merge change I6b97fee0 into eclair-sdk
* changes:
  SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
2009-10-29 16:14:35 -04:00
Xavier Ducrohet
8d7fa52af1 am 3c5557bb: Merge change Idd4c6e5f into eclair-sdk
Merge commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair

* commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf':
  Move SDK tools package to r4
2009-10-29 13:09:24 -07:00
Android (Google) Code Review
3c5557bb5e Merge change Idd4c6e5f into eclair-sdk
* changes:
  Move SDK tools package to r4
2009-10-29 16:00:32 -04:00
Raphael
93ead92dbb SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
This displays the scale computed by AVD Start.
I find it more intuitive to use if I see what the
emulator will be called with.

Change-Id: I6b97fee06bd4e6dc36c977ffef3c25315469b766
2009-10-29 13:00:11 -07:00
Raphael
34d8e2790b SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
2009-10-29 12:56:16 -07:00
Xavier Ducrohet
f7f145dc04 am 275de810: Merge change I2089d86d into eclair-sdk
Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair

* commit '275de810e99814cefd11321fd934bda1a4b53cc9':
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 12:39:03 -07:00
Android (Google) Code Review
8d0b3af557 Merge change Ia8fe3f64 into eclair-mr2
* changes:
  add graphicslab test app
2009-10-29 15:31:48 -04:00
Mike Reed
a8fe3f6431 add graphicslab test app 2009-10-29 15:31:08 -04:00
Android (Google) Code Review
275de810e9 Merge change I2089d86d into eclair-sdk
* changes:
  Fix the android launcher script to not force Java 1.5 on MacOS
2009-10-29 15:28:07 -04:00
Xavier Ducrohet
dd4c6e5f3e Move SDK tools package to r4 2009-10-29 12:27:50 -07:00
Xavier Ducrohet
7bb72933c5 Fix the android launcher script to not force Java 1.5 on MacOS 2009-10-29 12:15:02 -07:00
Raphael
3a58ebb389 am f8c770bb: am 107b1a9e: Merge change Ie496edfa into eclair
Merge commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144' into eclair-mr2-plus-aosp

* commit 'f8c770bbd504dfa05fd5ef1398c7e7d8b0290144':
  SDK Updater: don't load sdk-repo XML that failed to validate.
2009-10-29 01:37:43 -07:00
Raphael
7d2bb73d20 am b242a1de: am 09c5201a: Prepare version numbers for next SDK & tools
Merge commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad' into eclair-mr2-plus-aosp

* commit 'b242a1dea689d6d9de6f9d70af2126025e00ddad':
  Prepare version numbers for next SDK & tools
2009-10-29 01:37:36 -07:00