LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,677 Commits 2 Branches 0 Tags
a6d49e3a2ea9b6b4f4cb01c32fc910ea070db45e
Commit Graph

2677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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