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

2446 Commits

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