Mike Reed
3f14f59ee6
update demo to use boundary patch
2009-10-28 15:47:54 -04:00
Brett Chabot
37a59807b8
am 0c62341e: Merge change I3778cb73 into eclair
...
Merge commit '0c62341e8ec194a18bbf35fb380287c15d2da70d' into eclair-mr2
* commit '0c62341e8ec194a18bbf35fb380287c15d2da70d':
Fix runcommand logging exception.
2009-10-28 11:36:51 -07:00
Raphael
6fa10fac30
am b3bca018: Merge change I337b2644 into eclair
...
Merge commit 'b3bca018783a0621b981ec8eb98dbbd15f450677' into eclair-mr2
* commit 'b3bca018783a0621b981ec8eb98dbbd15f450677':
SDK Manager > AVD > Start: print computed scale.
2009-10-28 11:35:39 -07:00
Xavier Ducrohet
1bba62b3cb
am a73e4f9a: Merge change I7f60270f into eclair
...
Merge commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2' into eclair-mr2
* commit 'a73e4f9af7cafc9db6331ab0522c27bf75b2c3b2':
ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-28 10:29:06 -07:00
Brett Chabot
2aa7a8b8c7
am 3777f090: Merge change I25e7415f into eclair
...
Merge commit '3777f090a3a187bc251705028fe8cb019400e330' into eclair-mr2
* commit '3777f090a3a187bc251705028fe8cb019400e330':
Add runtest --path.
2009-10-28 10:28:49 -07:00
Android (Google) Code Review
0c62341e8e
Merge change I3778cb73 into eclair
...
* changes:
Fix runcommand logging exception.
2009-10-26 20:55:49 -04:00
Brett Chabot
99e5f91aab
Fix runcommand logging exception.
...
BUG 2215978
2009-10-26 17:52:34 -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
Android (Google) Code Review
a73e4f9af7
Merge change I7f60270f into eclair
...
* changes:
ADT/GEL: Reenable config popup when switching from a device with only 1 config
2009-10-26 17:16:46 -04:00
Android (Google) Code Review
3777f090a3
Merge change I25e7415f into eclair
...
* changes:
Add runtest --path.
2009-10-26 17:05:20 -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
Brett Chabot
59b4778dd6
Add runtest --path.
...
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
2009-10-26 12:22:46 -07:00
Android (Google) Code Review
c21395950e
Merge change I65440eb5 into eclair-mr2
...
* changes:
Fix how the monkey counts events for scripts.
2009-10-23 18:51:06 -04:00
Raphael
12dac0b13b
am e7ff49b8: SDK Manager: properly reset tree when changing updates only
...
Merge commit 'e7ff49b82da151037ef5f221a95b95c897deab30' into eclair-mr2
* commit 'e7ff49b82da151037ef5f221a95b95c897deab30':
SDK Manager: properly reset tree when changing updates only
2009-10-23 13:57:00 -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
David 'Digit' Turner
c5679c4123
am 27ad1ef8: Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions from native code through JNI.
...
Merge commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2' into eclair-mr2
* commit '27ad1ef820ef0fd8bfe47b440330975a3931b9c2':
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
2009-10-22 17:46:49 -07:00
David 'Digit' Turner
27ad1ef820
Add a new sample named "hello-gl2" that shows how to call OGL ES 2.0 functions
...
from native code through JNI.
2009-10-22 17:34:32 -07:00
Eric Rowe
65440eb58d
Fix how the monkey counts events for scripts.
...
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
2009-10-22 14:13:27 -07:00
Brett Chabot
cdbfd8ceda
am cdfea21f: Merge change Ie00595bd into eclair
...
Merge commit 'cdfea21f9285641d3040d4fb19138873086c9869' into eclair-mr2
* commit 'cdfea21f9285641d3040d4fb19138873086c9869':
Remove runtest dependency on current dir being build top.
2009-10-22 14:12:05 -07:00
Android (Google) Code Review
cdfea21f92
Merge change Ie00595bd into eclair
...
* changes:
Remove runtest dependency on current dir being build top.
2009-10-22 17:03:44 -04:00
Dirk Dougherty
0bea803940
am 52508ffa: am aa95bfe2: doc change only: update gae python server script (tested)
...
Merge commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d' into eclair-mr2
* commit '52508ffa962b1fd9a47899b83e2e9106eac5b14d':
doc change only: update gae python server script (tested)
2009-10-22 11:31:46 -07:00
Raphael
1a0b151ce6
am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk
...
Merge commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2' into eclair-mr2
* commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2':
SDK android "update project" must not require --target parameter.
2009-10-22 11:31:41 -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
Brett Chabot
6ec0e33eeb
am 1cd61741: Add support to run only tests in a given java package.
...
Merge commit '1cd617413095758758beef03e3f45d26e9ad7751' into eclair-mr2
* commit '1cd617413095758758beef03e3f45d26e9ad7751':
Add support to run only tests in a given java package.
2009-10-22 10:48:14 -07:00
Brett Chabot
b083cef9fb
am 3447c407: Merge change I8f6ac3c9 into eclair
...
Merge commit '3447c407dc70a365d6d7faade0f3725315d05e54' into eclair-mr2
* commit '3447c407dc70a365d6d7faade0f3725315d05e54':
Refactor runtest test_defs to allow programmatic creation.
2009-10-22 10:47:38 -07:00
David 'Digit' Turner
1dcfd370d6
am 9eff6cbf: Add OpenGL 2.0 headers and libraries to the NDK.
...
Merge commit '9eff6cbfaa210af0f5500f75576b457565cfafae' into eclair-mr2
* commit '9eff6cbfaa210af0f5500f75576b457565cfafae':
Add OpenGL 2.0 headers and libraries to the NDK.
2009-10-22 10:47:08 -07:00
David 'Digit' Turner
cf89eb6c2d
am 975491c9: Add android-5 platform to the NDK.
...
Merge commit '975491c9ebb8ec659d96318df5f37f92c903f09f' into eclair-mr2
* commit '975491c9ebb8ec659d96318df5f37f92c903f09f':
Add android-5 platform to the NDK.
2009-10-22 10:46:26 -07:00
Brett Chabot
2ad4d5f31b
am 4ee04869: Merge change I12f05ef0 into eclair
...
Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2
* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
Add ability to retrieve instrumentations from android_manifest parser.
2009-10-22 10:46:22 -07:00
Raphael
e9059bc822
am f6f2d37d: Merge change I03351f1b into eclair
...
Merge commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954' into eclair-mr2
* commit 'f6f2d37d9365ad1bfd53da2134eeed8604c36954':
SDK Updater: switch UdpateChooserDialog to jface.
2009-10-22 10:46:07 -07:00
David 'Digit' Turner
476ba9449a
am b48ab640: Allow applications to target future API levels
...
Merge commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6' into eclair-mr2
* commit 'b48ab6402801d82ac205b34ffa1bc6787a0042b6':
Allow applications to target future API levels
2009-10-22 10:45:58 -07:00
android-build SharedAccount
a8bd6dacdc
Previously merged by hand, now empty merge commit 'ec59a8834bbca256495045a6687a672f66b52df0' into eclair-mr2
2009-10-22 10:37:51 -07:00
android-build SharedAccount
1a4a01d6a7
Part 2 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:36:13 -07:00
android-build SharedAccount
b562394bfe
Part 1 of 2 for merge of ec59a8834b to workaround a git issue
2009-10-22 10:32:15 -07:00
David 'Digit' Turner
6e8cfcece9
am 6f605c32: Merge change If7aa22af into eclair
...
Merge commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a' into eclair-mr2
* commit '6f605c32adfe3ac23bb91f857fa89b9cb037237a':
Remove bash-ism from build-ndk-sysroot.sh
2009-10-22 06:38:55 -07:00
David 'Digit' Turner
1c962f8758
am fb766f44: Merge change I898b43fe into eclair
...
Merge commit 'fb766f44a71f7b97610065fd1628652026f69880' into eclair-mr2
* commit 'fb766f44a71f7b97610065fd1628652026f69880':
Refresh NDK C library headers for all platforms
2009-10-22 06:38:38 -07:00
Raphael
66d13f192b
am e97d99d0: am d58cd1b5: Merge change I075d2eae into eclair-sdk
...
Merge commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99' into eclair-mr2
* commit 'e97d99d02c655d3fa2801bb81787a1aff2d36d99':
SDK Updater: UI polish
2009-10-22 06:38:12 -07:00
Raphael
71ae9b3e2f
am d75c03e4: am 7c1adfe7: Merge change I5b1f8bca into eclair-sdk
...
Merge commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe' into eclair-mr2
* commit 'd75c03e4f18b11ba6f13112be3232db6795ed0fe':
AVD Manager: Properly disable AVD > Start > ? under Windows
2009-10-22 06:38:07 -07:00
Raphael
d9d3891bf5
am 90b60a39: am c9b04450: Merge change I4151529e into eclair-sdk
...
Merge commit '90b60a3985d07f6113d91737fcd37da2d282ce8f' into eclair-mr2
* commit '90b60a3985d07f6113d91737fcd37da2d282ce8f':
Fix potential NPE in manifest editor when switching SDKs
2009-10-21 22:22:16 -07:00
Raphael
17180783e5
am bf2cc38e: am 5708d157: Android.bat: remove /O in xcopy.
...
Merge commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d' into eclair-mr2
* commit 'bf2cc38e5b2a30f2f0906f3f37ed767af092956d':
Android.bat: remove /O in xcopy.
2009-10-21 22:22:11 -07:00
Brett Chabot
e00595bdbe
Remove runtest dependency on current dir being build top.
...
This change is necessary to support relative path based args.
2009-10-21 20:01:31 -07:00
Dirk Dougherty
aa95bfe2ac
doc change only: update gae python server script (tested)
2009-10-21 18:36:20 -07:00
Brett Chabot
1cd6174130
Add support to run only tests in a given java package.
2009-10-21 17:00:58 -07:00
Android (Google) Code Review
3447c407dc
Merge change I8f6ac3c9 into eclair
...
* changes:
Refactor runtest test_defs to allow programmatic creation.
2009-10-21 18:53:58 -04:00
David 'Digit' Turner
9eff6cbfaa
Add OpenGL 2.0 headers and libraries to the NDK.
...
This is only available for platform android-5. A sample
application will be available in a next patch.
2009-10-21 14:43:09 -07:00
Brett Chabot
924c089879
Refactor runtest test_defs to allow programmatic creation.
...
Previously a test definition could only be created via xml.
Also fix some minor lint warnings.
2009-10-21 14:35:37 -07:00
David 'Digit' Turner
975491c9eb
Add android-5 platform to the NDK.
...
For now, this is an exact copy of android-4. Another patch will
provide additionnal headers and libraries for OpenGL 2.0 plus
the relevant documentation bits and a sample app.
2009-10-21 14:31:53 -07:00
Android (Google) Code Review
4ee0486913
Merge change I12f05ef0 into eclair
...
* changes:
Add ability to retrieve instrumentations from android_manifest parser.
2009-10-21 17:26:32 -04:00
Android (Google) Code Review
f6f2d37d93
Merge change I03351f1b into eclair
...
* changes:
SDK Updater: switch UdpateChooserDialog to jface.
2009-10-21 17:19:40 -04:00