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

1269 Commits

Author SHA1 Message Date
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
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
b159651709 Ignore hidden files and vi swap files during packaging. 
BUG #2233458

Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
 2009-11-02 18:31:46 -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
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
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
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
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
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
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
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
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
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
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
Brett Chabot
a94518e3bc ADT test fixes. 
Temporarily remove SampleProjectTest from continuous, since its failing at
every CL.
Adjust ApiDemosRenderingTest to use the SDK loaded by ADT.
Remove SdkEnvTestCase since it doesn't work in all situations.
Fix test data lookup for NinePatchTest and BridgeXmlBlockParserTest.

Bugs 2222616, 2218682
 2009-10-28 18:22:15 -07:00
Raphael
ecccc1eb56 am 6fa10fac: am b3bca018: Merge change I337b2644 into eclair 
Merge commit '6fa10fac30f79f7a2c59c2c477c757ede18f3aab' into eclair-mr2-plus-aosp

* commit '6fa10fac30f79f7a2c59c2c477c757ede18f3aab':
  SDK Manager > AVD > Start: print computed scale.
 2009-10-28 11:52:27 -07:00
Xavier Ducrohet
c02e450461 am 1bba62b3: am a73e4f9a: Merge change I7f60270f into eclair 
Merge commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3' into eclair-mr2-plus-aosp

* commit '1bba62b3cba57906bcddd9868e67aa1ef2d150d3':
  ADT/GEL: Reenable config popup when switching from a device with only 1 config
 2009-10-28 10:41:55 -07:00
Android (Google) Code Review
107b1a9ee6 Merge change Ie496edfa into eclair 
* changes:
  SDK Updater: don't load sdk-repo XML that failed to validate.
 2009-10-27 20:57:02 -04:00
Raphael
1de51457fa SDK Updater: don't load sdk-repo XML that failed to validate. 
This also prints a more obvious message in case Java doesn't
have an XML Schema validator.

SDK BUGS 2219284 2198427

Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
 2009-10-27 17:48:16 -07:00
Raphael
09c5201adc Prepare version numbers for next SDK & tools 
Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
 2009-10-27 15:33:17 -07:00
Android (Google) Code Review
b3bca01878 Merge change I337b2644 into eclair 
* changes:
  SDK Manager > AVD > Start: print computed scale.
 2009-10-26 19:12:43 -04:00
Xavier Ducrohet
d5f6e05716 ADT/GEL: Reenable config popup when switching from a device with only 1 config 
Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37
BUG: 2218975
 2009-10-26 13:55:27 -07:00
Raphael
87636aef44 SDK Manager > AVD > Start: print computed scale. 
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: I337b264437dee81aed1bb9a1fbd11ccc9f506e88
 2009-10-26 12:26:27 -07:00
Raphael
ccddf0ac0b am 12dac0b1: am e7ff49b8: SDK Manager: properly reset tree when changing updates only 
Merge commit '12dac0b13bce0aa19cdc933107e1a733bc62e116' into eclair-mr2-plus-aosp

* commit '12dac0b13bce0aa19cdc933107e1a733bc62e116':
  SDK Manager: properly reset tree when changing updates only
 2009-10-23 14:06:59 -07:00
Raphael
e7ff49b82d SDK Manager: properly reset tree when changing updates only 
SDK BUG 2210573

Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
 2009-10-23 13:45:57 -07:00
Dirk Dougherty
71f843c4bd am 0bea8039: am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested) 
Merge commit '0bea80394096734af9a6c98d0cc6ef8b8b8e1826' into eclair-mr2-plus-aosp

* commit '0bea80394096734af9a6c98d0cc6ef8b8b8e1826':
  doc change only: update gae python server script (tested)
 2009-10-22 11:41:30 -07:00
Raphael
3fbb07ad37 am 1a0b151c: am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk 
Merge commit '1a0b151ce6d3303554781f73e65e45cedaca5b17' into eclair-mr2-plus-aosp

* commit '1a0b151ce6d3303554781f73e65e45cedaca5b17':
  SDK android "update project" must not require --target parameter.
 2009-10-22 11:41:25 -07:00
Dirk Dougherty
52508ffa96 am aa95bfe2: doc change only: update gae python server script (tested) 
Merge commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair

* commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53':
  doc change only: update gae python server script (tested)
 2009-10-22 11:21:34 -07:00
Raphael
a16a134a86 am 5d2a01ad: Merge change I235da4a8 into eclair-sdk 
Merge commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair

* commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947':
  SDK android "update project" must not require --target parameter.
 2009-10-22 11:20:33 -07:00
Raphael
6dc8fc626a am e9059bc8: am f6f2d37d: Merge change I03351f1b into eclair 
Merge commit 'e9059bc82263ae8f359100ab90e46ca8d36ffad3' into eclair-mr2-plus-aosp

* commit 'e9059bc82263ae8f359100ab90e46ca8d36ffad3':
  SDK Updater: switch UdpateChooserDialog to jface.
 2009-10-22 10:57:48 -07:00
Raphael
3c2e880a79 am 66d13f19: am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk 
Merge commit '66d13f192b50aef39272da5330d4484de7d68ca4' into eclair-mr2-plus-aosp

* commit '66d13f192b50aef39272da5330d4484de7d68ca4':
  SDK Updater: UI polish
 2009-10-22 06:51:42 -07:00
Raphael
377912f3f6 am 71ae9b3e: am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk 
Merge commit '71ae9b3e2f79a7fbfaf9283f75252988e1df5414' into eclair-mr2-plus-aosp

* commit '71ae9b3e2f79a7fbfaf9283f75252988e1df5414':
  AVD Manager: Properly disable AVD > Start > ? under Windows
 2009-10-22 06:51:38 -07:00
Raphael
b62c420829 am d9d3891b: am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk 
Merge commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0' into eclair-mr2-plus-aosp

* commit 'd9d3891bf5f4922520783f2fbb1ff4ec61403ba0':
  Fix potential NPE in manifest editor when switching SDKs
 2009-10-21 22:31:00 -07:00
Raphael
736393ef2c am 17180783: am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy. 
Merge commit '17180783e53f84d244e7c61d890039d9fa783443' into eclair-mr2-plus-aosp

* commit '17180783e53f84d244e7c61d890039d9fa783443':
  Android.bat: remove /O in xcopy.
 2009-10-21 22:30:55 -07:00
Dirk Dougherty
aa95bfe2ac doc change only: update gae python server script (tested) 2009-10-21 18:36:20 -07:00
Android (Google) Code Review
5d2a01adfe Merge change I235da4a8 into eclair-sdk 
* changes:
  SDK android "update project" must not require --target parameter.
 2009-10-21 16:09:28 -04:00
Raphael
842122bcf9 SDK android "update project" must not require --target parameter. 
SDK BUG 2203846

Change-Id: I235da4a8892de9a4334d5630667484220472f168
 2009-10-21 12:52:11 -07:00