aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ADT test data references.Brett Chabot2009-11-0314-138/+64
| | | | | | - Remove reference to ADT from sdklib tests. - Move ADT test data to be closer to their test classes, and to make it obvious this data is only for ADT unit tests.
* SDK: fix build. checkFileForPackaging is used by ApkBuilder.Raphael2009-11-031-1/+2
| | | | | | Change-Id: I91e9c63adcd6e069b1ec15627b95565c26cd3bc6 Reference: Change If0d0751e SDK BUG 2233458
* Merge change If0d0751e into eclairAndroid (Google) Code Review2009-11-031-1/+6
|\ | | | | | | | | * changes: Ignore hidden files and vi swap files during packaging.
| * Ignore hidden files and vi swap files during packaging.Xavier Ducrohet2009-11-021-1/+6
| | | | | | | | | | | | BUG #2233458 Change-Id: If0d0751ed7b896a7803e9b69fb0e6bff97dd4330
* | Merge change Ida443c07 into eclairAndroid (Google) Code Review2009-11-020-0/+0
|\ \ | | | | | | | | | | | | * changes: Remove calendar provider suite from continuous. DO NOT MERGE
| * | Remove calendar provider suite from continuous. DO NOT MERGEBrett Chabot2009-10-300-0/+0
| | | | | | | | | | | | Bug 2171501
* | | am 0dd85d89: (-s ours) Only apply permission to files with +x (do not merge)Xavier Ducrohet2009-11-020-0/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Merge commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair * commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92': Only apply permission to files with +x (do not merge)
| * | Only apply permission to files with +x (do not merge)Xavier Ducrohet2009-11-021-10/+9
| | | | | | | | | | | | integrated from eclair branch.
* | | Merge change Ied3304a0 into eclairAndroid (Google) Code Review2009-11-021-10/+9
|\ \ \ | | | | | | | | | | | | | | | | * changes: Only apply permission to files with +x
| * | | Only apply permission to files with +xXavier Ducrohet2009-10-301-10/+9
| | |/ | |/| | | | | | | Change-Id: Ied3304a0f9687b601666c4ec7ce7a34157254d7c
* | | am d3f9eb79: SDK Manager: Display error when saving settingsRaphael2009-10-302-11/+49
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de' into eclair * commit 'd3f9eb79c79752b76e483d5d6774b76bcf91a8de': SDK Manager: Display error when saving settings
| * SDK Manager: Display error when saving settingsRaphael2009-10-292-11/+49
| | | | | | | | | | | | SDK BUG 2226029 Change-Id: I568c71b80bddb5c4409df0bd1b02e35b82d6d1ba
* | Merge change Iae0bc856 into eclairAndroid (Google) Code Review2009-10-290-0/+0
|\ \ | | | | | | | | | | | | * changes: A sample application that demonstrates use of legacy and current contacts APIs.
| * | A sample application that demonstrates use of legacy and current contacts APIs.Dmitri Plotnikov2009-10-290-0/+0
| | | | | | | | | | | | | | | | | | | | | 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
* | | am be4cbcc2: SDK Manager: fix NPE in AVD > Start when there\'s no skin name.Raphael2009-10-292-23/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'be4cbcc2267e3778776c68785b52f871f72c67f7' into eclair * commit 'be4cbcc2267e3778776c68785b52f871f72c67f7': SDK Manager: fix NPE in AVD > Start when there's no skin name.
| * | SDK Manager: fix NPE in AVD > Start when there's no skin name.Raphael2009-10-292-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | Also log missing config.ini path. SDK BUG 2223760 Change-Id: I4517005e03e90c0b5a52bcb40b0d32eddd03c1f3
* | | Merge change Ia94518e3 into eclairAndroid (Google) Code Review2009-10-2912-150/+140
|\ \ \ | | | | | | | | | | | | | | | | * changes: ADT test fixes.
| * | | ADT test fixes.Brett Chabot2009-10-2812-150/+140
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdkRaphael2009-10-290-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair * commit '940073e267695a7c4a404cb2174b48e893c15a45': SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
| * | Merge change I28aa1104 into eclair-sdkAndroid (Google) Code Review2009-10-291-15/+40
| |\ \ | | | | | | | | | | | | | | | | * changes: SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
| | * | SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.Raphael2009-10-291-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also prints a more obvious message in case Java doesn't have an XML Schema validator. SDK BUGS 2219284 2198427 Change-Id: I28aa1104957d2fe7791dcf0377a42d37f777a19d
* | | | am dd77d69f: (-s ours) Merge change I6b97fee0 into eclair-sdkRaphael2009-10-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e' into eclair * commit 'dd77d69f9e8eca2bd81f418f867d1b4b3bd6462e': SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
| * | | Merge change I6b97fee0 into eclair-sdkAndroid (Google) Code Review2009-10-291-4/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.
| | * | | SDK Manager > AVD > Start: print computed scale. DO NOT MERGE.Raphael2009-10-291-4/+30
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 3c5557bb: Merge change Idd4c6e5f into eclair-sdkXavier Ducrohet2009-10-290-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf' into eclair * commit '3c5557bb5e9235737c4c7ddda4c66f14396105cf': Move SDK tools package to r4
| * | | Merge change Idd4c6e5f into eclair-sdkAndroid (Google) Code Review2009-10-291-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * changes: Move SDK tools package to r4
| | * | Move SDK tools package to r4Xavier Ducrohet2009-10-291-1/+1
| | | |
* | | | am 275de810: Merge change I2089d86d into eclair-sdkXavier Ducrohet2009-10-291-4/+3
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Merge commit '275de810e99814cefd11321fd934bda1a4b53cc9' into eclair * commit '275de810e99814cefd11321fd934bda1a4b53cc9': Fix the android launcher script to not force Java 1.5 on MacOS
| * | Merge change I2089d86d into eclair-sdkAndroid (Google) Code Review2009-10-291-4/+3
| |\ \ | | |/ | | | | | | | | | * changes: Fix the android launcher script to not force Java 1.5 on MacOS
| | * Fix the android launcher script to not force Java 1.5 on MacOSXavier Ducrohet2009-10-291-4/+3
| | |
* | | Merge change Ie496edfa into eclairAndroid (Google) Code Review2009-10-271-15/+40
|\ \ \ | | | | | | | | | | | | | | | | * changes: SDK Updater: don't load sdk-repo XML that failed to validate.
| * | | SDK Updater: don't load sdk-repo XML that failed to validate.Raphael2009-10-271-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also prints a more obvious message in case Java doesn't have an XML Schema validator. SDK BUGS 2219284 2198427 Change-Id: Ie496edfa7f0ca2802a537a7c6e84a88f177991a9
* | | | Prepare version numbers for next SDK & toolsRaphael2009-10-274-7/+7
|/ / / | | | | | | | | | Change-Id: I8e57df22462ec3e14e0f119b57999c208bb9d1fd
* | | Merge change I3778cb73 into eclairAndroid (Google) Code Review2009-10-260-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * changes: Fix runcommand logging exception.
| * | | Fix runcommand logging exception.Brett Chabot2009-10-260-0/+0
| | | | | | | | | | | | | | | | BUG 2215978
* | | | Merge change I337b2644 into eclairAndroid (Google) Code Review2009-10-261-5/+31
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * changes: SDK Manager > AVD > Start: print computed scale.
| * | | SDK Manager > AVD > Start: print computed scale.Raphael2009-10-261-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge change I7f60270f into eclairAndroid (Google) Code Review2009-10-261-4/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * changes: ADT/GEL: Reenable config popup when switching from a device with only 1 config
| * | | | ADT/GEL: Reenable config popup when switching from a device with only 1 configXavier Ducrohet2009-10-261-4/+1
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I7f60270ffbcaae420f4da245ff3d9b271885fa37 BUG: 2218975
* | | | Merge change I25e7415f into eclairAndroid (Google) Code Review2009-10-260-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * changes: Add runtest --path.
| * | | Add runtest --path.Brett Chabot2009-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supports specifying a file system path to test(s) to run. The path can be a java test class file, a java package directory, or a parent directory containing many tests. This change allows users to run tests independently from test_defs.xml. BUG 2133198
* | | | SDK Manager: properly reset tree when changing updates onlyRaphael2009-10-231-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | SDK BUG 2210573 Change-Id: I32ce7387470cab771001a783b8afad399ab98f6a
* | | | Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functionsDavid 'Digit' Turner2009-10-220-0/+0
|/ / / | | | | | | | | | from native code through JNI.
* | | Merge change Ie00595bd into eclairAndroid (Google) Code Review2009-10-220-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * changes: Remove runtest dependency on current dir being build top.
| * | | Remove runtest dependency on current dir being build top.Brett Chabot2009-10-210-0/+0
| | | | | | | | | | | | | | | | This change is necessary to support relative path based args.
* | | | am aa95bfe2: doc change only: update gae python server script (tested)Dirk Dougherty2009-10-221-47/+208
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53' into eclair * commit 'aa95bfe2ace8940d6ab3ea5f17c733addfba2e53': doc change only: update gae python server script (tested)
| * | | doc change only: update gae python server script (tested)Dirk Dougherty2009-10-211-47/+208
| | |/ | |/|
* | | am 5d2a01ad: Merge change I235da4a8 into eclair-sdkRaphael2009-10-221-11/+15
|\ \ \ | |/ / | | / | |/ |/| | | | | Merge commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947' into eclair * commit '5d2a01adfe11b9513cdf5da0fd6331c8cca05947': SDK android "update project" must not require --target parameter.
| * Merge change I235da4a8 into eclair-sdkAndroid (Google) Code Review2009-10-211-11/+15
| |\ | | | | | | | | | | | | * changes: SDK android "update project" must not require --target parameter.
| | * SDK android "update project" must not require --target parameter.Raphael2009-10-211-11/+15
| | | | | | | | | | | | | | | | | | SDK BUG 2203846 Change-Id: I235da4a8892de9a4334d5630667484220472f168