OSDN Git Service
Brian Muramatsu [Fri, 2 Jul 2010 18:28:34 +0000 (11:28 -0700)]
Merge "Update Android CTS Download Link to 2.1_r3"
Dianne Hackborn [Fri, 2 Jul 2010 02:38:16 +0000 (19:38 -0700)]
am
7475d2e7: am
2c5db16b: Merge "Stub code no longer needed." into gingerbread
Merge commit '
7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac'
* commit '
7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac':
Stub code no longer needed.
Dianne Hackborn [Fri, 2 Jul 2010 02:36:18 +0000 (19:36 -0700)]
am
2c5db16b: Merge "Stub code no longer needed." into gingerbread
Merge commit '
2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c' into gingerbread-plus-aosp
* commit '
2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c':
Stub code no longer needed.
Dianne Hackborn [Fri, 2 Jul 2010 02:34:50 +0000 (19:34 -0700)]
Merge "Stub code no longer needed." into gingerbread
Dianne Hackborn [Fri, 2 Jul 2010 02:27:06 +0000 (19:27 -0700)]
Stub code no longer needed.
Change-Id: I985acdba1dd1c0acf00d88d2851b5f604475bf4c
Dianne Hackborn [Fri, 2 Jul 2010 02:26:54 +0000 (19:26 -0700)]
Dianne Hackborn [Fri, 2 Jul 2010 02:24:58 +0000 (19:24 -0700)]
am
2b352d76: Native activity now draws!
Merge commit '
2b352d76d84817725bf530e7e33f3b47ffb15401' into gingerbread-plus-aosp
* commit '
2b352d76d84817725bf530e7e33f3b47ffb15401':
Native activity now draws!
Dianne Hackborn [Fri, 2 Jul 2010 01:47:16 +0000 (18:47 -0700)]
Native activity now draws!
Very simple and dumb, but we now get touch events and fill the
window with a color (using OpenGL) based on its location.
Change-Id: I6657d2bb013570238bc0fe639f33c59f1ab68872
Dianne Hackborn [Thu, 1 Jul 2010 23:02:09 +0000 (16:02 -0700)]
am
cddd9de7: am
88510488: Update native_activity sample code to use ANativeWindow.
Merge commit '
cddd9de737d5670b4898b9b7bc12c7e7bb7f63ee'
* commit '
cddd9de737d5670b4898b9b7bc12c7e7bb7f63ee':
Update native_activity sample code to use ANativeWindow.
Dianne Hackborn [Thu, 1 Jul 2010 23:00:13 +0000 (16:00 -0700)]
am
88510488: Update native_activity sample code to use ANativeWindow.
Merge commit '
88510488e99d02e3b778ae530bb6e1e6aee3a226' into gingerbread-plus-aosp
* commit '
88510488e99d02e3b778ae530bb6e1e6aee3a226':
Update native_activity sample code to use ANativeWindow.
Dianne Hackborn [Thu, 1 Jul 2010 01:36:34 +0000 (18:36 -0700)]
Update native_activity sample code to use ANativeWindow.
We now get the native window to the engine, all ready for something
to be done with it.
Change-Id: Ie4537e505cdf8a2fffc28de82b7e3cda448fde41
Jason Parks [Thu, 1 Jul 2010 19:51:30 +0000 (14:51 -0500)]
Change ExpandableList2 example to use async queries.
Change-Id: Ib3f79227808dcbcf6ec8f5f71c53b38932571ed4
Xia Wang [Wed, 30 Jun 2010 00:33:00 +0000 (17:33 -0700)]
am
e2166993: am
24ff9295: Merge "Add connectivity unit tests to test_defs.xml" into gingerbread
Merge commit '
e2166993c986cecaf84ceee72a900e3a41ecc2f0'
* commit '
e2166993c986cecaf84ceee72a900e3a41ecc2f0':
Add connectivity unit tests to test_defs.xml
Xia Wang [Wed, 30 Jun 2010 00:29:49 +0000 (17:29 -0700)]
am
24ff9295: Merge "Add connectivity unit tests to test_defs.xml" into gingerbread
Merge commit '
24ff92954baf143c31f7f8e260b2202f96f0663a' into gingerbread-plus-aosp
* commit '
24ff92954baf143c31f7f8e260b2202f96f0663a':
Add connectivity unit tests to test_defs.xml
Xia Wang [Wed, 30 Jun 2010 00:25:01 +0000 (17:25 -0700)]
Merge "Add connectivity unit tests to test_defs.xml" into gingerbread
Xia Wang [Tue, 29 Jun 2010 21:59:26 +0000 (14:59 -0700)]
Add connectivity unit tests to test_defs.xml
Change-Id: I15ecb95f7c534a9761cc8bbd16cd6ec661f7af5b
Dianne Hackborn [Tue, 29 Jun 2010 19:21:12 +0000 (12:21 -0700)]
am
778ebc04: am
21851dd5: Merge "Update to new native activity APIs." into gingerbread
Merge commit '
778ebc0473d01ced3a6372f5c91ceb11cf9e95c2'
* commit '
778ebc0473d01ced3a6372f5c91ceb11cf9e95c2':
Update to new native activity APIs.
Dianne Hackborn [Tue, 29 Jun 2010 19:18:54 +0000 (12:18 -0700)]
am
21851dd5: Merge "Update to new native activity APIs." into gingerbread
Merge commit '
21851dd54f9b70091e441cfb4a1dea661a3f6a0d' into gingerbread-plus-aosp
* commit '
21851dd54f9b70091e441cfb4a1dea661a3f6a0d':
Update to new native activity APIs.
Dianne Hackborn [Tue, 29 Jun 2010 19:17:28 +0000 (12:17 -0700)]
Merge "Update to new native activity APIs." into gingerbread
Dirk Dougherty [Tue, 29 Jun 2010 18:27:12 +0000 (11:27 -0700)]
am
ad486987: am
1bd47c04: am
e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide source files." into froyo
Merge commit '
ad48698760ee05a7326cfa786eb4204ef02db9d8'
* commit '
ad48698760ee05a7326cfa786eb4204ef02db9d8':
Doc change: Add index page pointing to downloadable user's guide source files.
Dirk Dougherty [Tue, 29 Jun 2010 18:24:56 +0000 (11:24 -0700)]
am
1bd47c04: am
e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide source files." into froyo
Merge commit '
1bd47c04baa9c5b435bc7677eb7663a4fa19e6ac' into gingerbread-plus-aosp
* commit '
1bd47c04baa9c5b435bc7677eb7663a4fa19e6ac':
Doc change: Add index page pointing to downloadable user's guide source files.
Dirk Dougherty [Tue, 29 Jun 2010 18:22:16 +0000 (11:22 -0700)]
am
e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide source files." into froyo
Merge commit '
e46d051439f8d9fdee102b6dbc43caa3357b073f' into gingerbread
* commit '
e46d051439f8d9fdee102b6dbc43caa3357b073f':
Doc change: Add index page pointing to downloadable user's guide source files.
Dirk Dougherty [Tue, 29 Jun 2010 18:19:12 +0000 (11:19 -0700)]
Merge "Doc change: Add index page pointing to downloadable user's guide source files." into froyo
Dirk Dougherty [Wed, 9 Jun 2010 18:54:43 +0000 (11:54 -0700)]
Doc change: Add index page pointing to downloadable user's guide source files.
Change-Id: Ia02cb211fc24f1293b66310c80e18d4ad8185173
Dianne Hackborn [Mon, 28 Jun 2010 22:38:48 +0000 (15:38 -0700)]
Update to new native activity APIs.
Change-Id: Id2a32fd0ed0de39b2f266216d5b3d903156fb761
Dianne Hackborn [Sat, 26 Jun 2010 00:15:39 +0000 (17:15 -0700)]
New fragment sample.
This shows more complicated list interaction: using a loader
to populate the list with results from a cursor. Makes use
of the new built-in empty message and indeterminant progress
features.
Change-Id: I04afb50879995bade286aab0eedfff40f6a5e304
Brian Muramatsu [Mon, 28 Jun 2010 20:36:58 +0000 (13:36 -0700)]
Update Android CTS Download Link to 2.1_r3
Change-Id: I168ff538cff0072c5b5fb429a3efe7b1b8067d05
The Android Open Source Project [Fri, 25 Jun 2010 21:20:57 +0000 (14:20 -0700)]
am
9bad20b0: merge from froyo-plus-aosp
Merge commit '
9bad20b019424a315c3f9a3d2b0e3a711bb43665'
* commit '
9bad20b019424a315c3f9a3d2b0e3a711bb43665':
Moving SDK howto docs from development.git into sdk.git.
The Android Open Source Project [Fri, 25 Jun 2010 16:46:08 +0000 (09:46 -0700)]
merge from froyo-plus-aosp
Change-Id: I1c7b0ce913903088729cce23fa0e8f39c9e8c15d
Bill Napier [Fri, 25 Jun 2010 16:41:03 +0000 (09:41 -0700)]
Merge "Fix to invalid call to manifest.app_info"
Yu Shan Emily Lau [Fri, 25 Jun 2010 00:16:34 +0000 (17:16 -0700)]
am
7c8c5d91: am
3bacdf93: am
1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '
7c8c5d911c670df2c58bf1ece73e6bc576360696'
* commit '
7c8c5d911c670df2c58bf1ece73e6bc576360696':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:43:28 +0000 (15:43 -0700)]
am
3bacdf93: am
1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '
3bacdf93002237f35530c1e756481db429285a96' into gingerbread-plus-aosp
* commit '
3bacdf93002237f35530c1e756481db429285a96':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:42:29 +0000 (15:42 -0700)]
am
1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '
1a132581a5ce6188989d8522d227392c05cb42f6' into froyo-plus-aosp
* commit '
1a132581a5ce6188989d8522d227392c05cb42f6':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:41:10 +0000 (15:41 -0700)]
am
1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Merge commit '
1a132581a5ce6188989d8522d227392c05cb42f6' into gingerbread
* commit '
1a132581a5ce6188989d8522d227392c05cb42f6':
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Yu Shan Emily Lau [Thu, 24 Jun 2010 22:30:29 +0000 (15:30 -0700)]
Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out." into froyo
Yu Shan Emily Lau [Thu, 24 Jun 2010 21:20:16 +0000 (14:20 -0700)]
Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the power log to start 10 seconds after the event was send out.
Change-Id: I3d98d56128b8a96ba712c7e11280e3ab88a7cc4a
The Android Open Source Project [Thu, 24 Jun 2010 21:02:21 +0000 (14:02 -0700)]
merge from open-source master
Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591
Gilles Debunne [Thu, 17 Jun 2010 22:02:41 +0000 (15:02 -0700)]
New XmlAdapter sample example.
This sample illustrate the use of the news Xml Adapters definition, as well
as the use on the new XmlDocumentProvider class.
Change-Id: Ie9738b5f0a0f00df2af643890a48573bace19311
Raphael Moll [Wed, 23 Jun 2010 22:59:59 +0000 (15:59 -0700)]
Moving SDK howto docs from development.git into sdk.git.
See Change I7827d3f3cc6b8ba96822170949618dc75d879d28 for
the CL that adds them back in sdk.git
Change-Id: I37a5b27875fc3ed6b52202ab8435888d38644ca5
Kenny Root [Wed, 23 Jun 2010 20:56:38 +0000 (13:56 -0700)]
am
60c91105: am
9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '
60c911051081fb2f2e786df7f45ac60b2bffdd2e'
* commit '
60c911051081fb2f2e786df7f45ac60b2bffdd2e':
Do not compress resources.arsc in android.jar
Kenny Root [Wed, 23 Jun 2010 20:54:32 +0000 (13:54 -0700)]
am
9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '
9e1400cdae7f3732808120db8b83de7b252340ca' into gingerbread-plus-aosp
* commit '
9e1400cdae7f3732808120db8b83de7b252340ca':
Do not compress resources.arsc in android.jar
Kenny Root [Wed, 23 Jun 2010 20:38:45 +0000 (13:38 -0700)]
Do not compress resources.arsc in android.jar
In framework-res.apk and in applications, resources are always stored in
zip files instead of compressed so that they may be accessed via mmap()
instead of needing to decompress them first.
This change makes sure the SDK's android.jar has the same behavior.
Change-Id: Ied881c34dca86ff5b5bd2ccfa4e316ae590ca473
Scott Main [Wed, 23 Jun 2010 19:41:27 +0000 (12:41 -0700)]
Yu Shan Emily Lau [Wed, 23 Jun 2010 17:32:38 +0000 (10:32 -0700)]
am
762e331c: am
259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '
762e331c2f302c508e5d28f22d0e537790458ef5'
* commit '
762e331c2f302c508e5d28f22d0e537790458ef5':
add test def for calculator
Dianne Hackborn [Wed, 23 Jun 2010 17:32:10 +0000 (10:32 -0700)]
am
36249f33: am
5468d768: Update native APIs for events.
Merge commit '
36249f33c42222167d1fc3e8124a00d49928dea2'
* commit '
36249f33c42222167d1fc3e8124a00d49928dea2':
Update native APIs for events.
Scott Main [Wed, 23 Jun 2010 01:43:35 +0000 (18:43 -0700)]
am
e660fef5: am
81b9c9d8: docs: fix doc link bug
Merge commit '
e660fef5523dc8ac3ee57fb4503ca53b922a531d' into gingerbread-plus-aosp
* commit '
e660fef5523dc8ac3ee57fb4503ca53b922a531d':
docs: fix doc link bug
Scott Main [Wed, 23 Jun 2010 01:42:23 +0000 (18:42 -0700)]
am
81b9c9d8: docs: fix doc link bug
Merge commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp
* commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
docs: fix doc link bug
Scott Main [Wed, 23 Jun 2010 01:41:36 +0000 (18:41 -0700)]
am
81b9c9d8: docs: fix doc link bug
Merge commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into gingerbread
* commit '
81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
docs: fix doc link bug
Yu Shan Emily Lau [Tue, 22 Jun 2010 18:42:26 +0000 (11:42 -0700)]
am
259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '
259651e2de730b513003cb0c2f966f53b9dffb5e' into gingerbread-plus-aosp
* commit '
259651e2de730b513003cb0c2f966f53b9dffb5e':
add test def for calculator
Yu Shan Emily Lau [Tue, 22 Jun 2010 18:41:10 +0000 (11:41 -0700)]
Merge "add test def for calculator" into gingerbread
Andrew Stadler [Tue, 22 Jun 2010 18:40:31 +0000 (11:40 -0700)]
Cleanup after bouncycastle moved and common went away
Change-Id: I3be20bb4999d33b5e5f69f4eb00c20429a5d36b3
Dianne Hackborn [Tue, 22 Jun 2010 18:24:15 +0000 (11:24 -0700)]
am
5468d768: Update native APIs for events.
Merge commit '
5468d768716a4a9de1012067d89908ba4893f9c8' into gingerbread-plus-aosp
* commit '
5468d768716a4a9de1012067d89908ba4893f9c8':
Update native APIs for events.
Scott Main [Tue, 22 Jun 2010 17:37:30 +0000 (10:37 -0700)]
docs: fix doc link bug
bug:
2788457
Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
Dianne Hackborn [Sat, 19 Jun 2010 01:12:05 +0000 (18:12 -0700)]
Update native APIs for events.
Copy current native event APIs over; start updating
sample code to use them.
The native activity sample is now much more real, creating
its own worker thread, which now monitors and prints any
incoming input events.
Note that due to the lack of default key handling, pressing
back no longer works! Will be fixed in a bit. This code
also needs to be refactored to put the engine part into
a separate source file.
Change-Id: I2ab3e6d9f840b99ec9a05bbc0d2cd9314beb23d7
Konstantin Lopyrev [Wed, 26 May 2010 21:51:35 +0000 (14:51 -0700)]
Fix
2677197: Adding support for minimum number of complex characters to the Device Admin Sample App.
Change-Id: I7570f005ee665adc150e8c4fb92068b4d8dcdbb1
Guang Zhu [Mon, 21 Jun 2010 23:55:00 +0000 (16:55 -0700)]
add test def for calculator
Change-Id: I2501f0699f6eb286037ed314c30be4818a25c643
Marco Nelissen [Mon, 21 Jun 2010 19:32:29 +0000 (12:32 -0700)]
Make simulator boot in master.
Change-Id: I13fa4c188645049152cbfcf2139cf21acebaa370
The Android Open Source Project [Mon, 21 Jun 2010 18:02:32 +0000 (11:02 -0700)]
am
29d09a18: merge from froyo-plus-aosp
Merge commit '
29d09a18c50a2dd9412ca393f2f5657d3199c414'
* commit '
29d09a18c50a2dd9412ca393f2f5657d3199c414':
remove apkbuilder.jar from the sdk build.
remove jarutils from the sdk packaging.
The Android Open Source Project [Mon, 21 Jun 2010 18:00:40 +0000 (11:00 -0700)]
merge from froyo-plus-aosp
Change-Id: Icd2fa05c77fd2ec7c878520647e0024bf89b0504
The Android Open Source Project [Fri, 18 Jun 2010 18:33:52 +0000 (11:33 -0700)]
merge from open-source master
Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281
Andrew Stadler [Thu, 17 Jun 2010 21:47:20 +0000 (14:47 -0700)]
Fix classpath to follow frameworks/base/policy changes.
Change-Id: I06cd6592af73ad8852983039a6d238f17eb979a9
Jeff Davidson [Thu, 17 Jun 2010 18:53:49 +0000 (11:53 -0700)]
Fix to invalid call to manifest.app_info
Change-Id: I7bb9f0b10ab814a6fd278d9c2ef1939d5ab9b671
Xavier Ducrohet [Thu, 17 Jun 2010 02:41:49 +0000 (19:41 -0700)]
am
2f8cb6de: am
fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit '
2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9'
* commit '
2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9':
remove apkbuilder.jar from the sdk build.
Xavier Ducrohet [Thu, 17 Jun 2010 01:26:09 +0000 (18:26 -0700)]
am
fdbc1d7b: remove apkbuilder.jar from the sdk build.
Merge commit '
fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9' into gingerbread-plus-aosp
* commit '
fdbc1d7bc1aa73c095b93808bd15b6eca02ea7c9':
remove apkbuilder.jar from the sdk build.
Xavier Ducrohet [Wed, 16 Jun 2010 01:04:44 +0000 (18:04 -0700)]
remove apkbuilder.jar from the sdk build.
Change-Id: I76f979a0d3aa196f25e8a5f2522437e26655a7d0
Xavier Ducrohet [Wed, 16 Jun 2010 01:04:44 +0000 (18:04 -0700)]
remove apkbuilder.jar from the sdk build.
Change-Id: I82cca5c159c1f3210b98deebfd78e2844728b2ac
Xavier Ducrohet [Tue, 15 Jun 2010 23:01:29 +0000 (16:01 -0700)]
am
e389abdc: am
442396be: remove jarutils from the sdk packaging.
Merge commit '
e389abdc29eb2a9d523e64531975dde25a8e9617'
* commit '
e389abdc29eb2a9d523e64531975dde25a8e9617':
remove jarutils from the sdk packaging.
Xavier Ducrohet [Tue, 15 Jun 2010 22:36:47 +0000 (15:36 -0700)]
am
442396be: remove jarutils from the sdk packaging.
Merge commit '
442396be27a82850f99d4a891d02b8c95c9c1ef1' into gingerbread-plus-aosp
* commit '
442396be27a82850f99d4a891d02b8c95c9c1ef1':
remove jarutils from the sdk packaging.
Xavier Ducrohet [Tue, 15 Jun 2010 20:00:13 +0000 (13:00 -0700)]
remove jarutils from the sdk packaging.
Change-Id: I49beab11b49f09451cbea9bfbc88aa522e7dbd85
The Android Open Source Project [Tue, 15 Jun 2010 22:02:27 +0000 (15:02 -0700)]
merge from open-source master
Change-Id: I3e12f866966fda80db5a0795eba9ff82bfe6547d
Xavier Ducrohet [Tue, 15 Jun 2010 20:00:13 +0000 (13:00 -0700)]
remove jarutils from the sdk packaging.
Change-Id: Ic3c91ff5e20a5bf6b7c3ad11eb6e6f4250c7613d
Brett Chabot [Tue, 15 Jun 2010 18:18:42 +0000 (11:18 -0700)]
resolved conflicts for merge of
fa6e5585 to master
Change-Id: I967289246c3472a30f4623581226cbc3054f0b56
Brett Chabot [Tue, 15 Jun 2010 17:49:09 +0000 (10:49 -0700)]
am
0e968fa2: Merge "Workaround for package-private framework tests in runtest." into gingerbread
Merge commit '
0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99' into gingerbread-plus-aosp
* commit '
0e968fa2eec9dcdbb0ab075be9489cc9e4ad9c99':
Workaround for package-private framework tests in runtest.
Brett Chabot [Tue, 15 Jun 2010 17:46:32 +0000 (10:46 -0700)]
Merge "Workaround for package-private framework tests in runtest." into gingerbread
Kenny Root [Fri, 11 Jun 2010 20:10:12 +0000 (13:10 -0700)]
Reorganize community IRC information
Add #android-firehose and add hyperlinks to the IRC channels themselves,
because we're using the HTML!
Change-Id: I4704235a00afe6b48187774debb80a101f304266
Ying Wang [Tue, 15 Jun 2010 02:01:47 +0000 (19:01 -0700)]
Also dist the original linux sdk package for wind_sdk build.
Change-Id: I64dab5763dc7c7398582c5a30c126c7e3e6afe32
Brett Chabot [Mon, 14 Jun 2010 22:19:25 +0000 (15:19 -0700)]
Workaround for package-private framework tests in runtest.
Checks if the test to run is a framework test based on path, and if so
disables the davlik verifier by writing to /data/local.prop and
rebooting device.
Change-Id: Ibf94fb921662b5ddf6136dd12360d5de83a3a284
Bill Napier [Mon, 14 Jun 2010 20:37:35 +0000 (13:37 -0700)]
Merge "Change help test generation to use clearsilver templates just like the rest of the system. This should more easily allow customization of the generated output."
Bill Napier [Mon, 14 Jun 2010 20:13:16 +0000 (13:13 -0700)]
Change help test generation to use clearsilver templates just like the rest of the system. This should more easily allow customization of the generated output.
Change-Id: I5c51f3781aab3ce85653ecb69c1f10fd76d8c172
Bill Napier [Mon, 14 Jun 2010 20:31:09 +0000 (13:31 -0700)]
Merge "Add in a help script to generate text and html formats of the MonkeyRunner help."
Bill Napier [Mon, 14 Jun 2010 20:17:21 +0000 (13:17 -0700)]
Add in a help script to generate text and html formats of the MonkeyRunner help.
Change-Id: I757cd716f67f9d376113274922e8bbf7ef97f663
Andrew Stadler [Mon, 14 Jun 2010 18:51:08 +0000 (11:51 -0700)]
Update classpath to include new external libphonenumber
Change-Id: I13656db22633953e3609469b4c4f8ea401e3b043
The Android Open Source Project [Mon, 14 Jun 2010 18:31:13 +0000 (11:31 -0700)]
am
8467544d: merge from froyo-plus-aosp
Merge commit '
8467544d4c8b4d23f1048775c145b087b73f2acf'
* commit '
8467544d4c8b4d23f1048775c145b087b73f2acf':
Cleaned up Samples by removing unsed imports and variables.
Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision
Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables
Reduced warnings by removing unused imports, unused variables and adding type arguments
The Android Open Source Project [Mon, 14 Jun 2010 18:28:22 +0000 (11:28 -0700)]
merge from froyo-plus-aosp
Change-Id: I1f4c76c89aad748b006cfc1370a767782e4ca3e7
Jeff Brown [Mon, 14 Jun 2010 18:06:58 +0000 (11:06 -0700)]
am
28e7280e: am
69825fa9: Merge "Added test definitions for framework UI and Utils libs." into kraken
Merge commit '
28e7280e1a2ec4d0d2dd4378c73f14c0b090ce2b'
* commit '
28e7280e1a2ec4d0d2dd4378c73f14c0b090ce2b':
Added test definitions for framework UI and Utils libs.
Jeff Brown [Mon, 14 Jun 2010 18:05:05 +0000 (11:05 -0700)]
am
69825fa9: Merge "Added test definitions for framework UI and Utils libs." into kraken
Merge commit '
69825fa9b898067f07abce3c6e63c6ac8fe89fd6' into gingerbread-plus-aosp
* commit '
69825fa9b898067f07abce3c6e63c6ac8fe89fd6':
Added test definitions for framework UI and Utils libs.
Jeff Brown [Mon, 14 Jun 2010 18:01:17 +0000 (11:01 -0700)]
Merge "Added test definitions for framework UI and Utils libs." into kraken
The Android Open Source Project [Mon, 14 Jun 2010 17:49:52 +0000 (10:49 -0700)]
merge from open-source master
Change-Id: I7d0f3b08f6e632b689c870017374741a544bc7e8
The Android Open Source Project [Mon, 14 Jun 2010 17:01:48 +0000 (10:01 -0700)]
merge from open-source master
Change-Id: Icb039ab90287961b1ad358b78eaead4a9aa2ae59
The Android Open Source Project [Mon, 14 Jun 2010 16:31:39 +0000 (09:31 -0700)]
merge from open-source master
Change-Id: I6d060597c1dffd56aacc0072104464ad651ef877
The Android Open Source Project [Mon, 14 Jun 2010 16:26:36 +0000 (09:26 -0700)]
merge from open-source master
Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:20:43 +0000 (09:20 -0700)]
Merge "Cleaned up Samples by removing unsed imports and variables. Changed deprecated Config.LOGD to Config.DEBUG Removed unnecessary whitespaces"
Jeff Brown [Mon, 14 Jun 2010 03:09:33 +0000 (20:09 -0700)]
Added test definitions for framework UI and Utils libs.
Change-Id: Idf1a5741cd60e7402d950a8080bcd5dcbc12be09
Guang Zhu [Sun, 13 Jun 2010 21:54:41 +0000 (14:54 -0700)]
Merge "update runtest due to libcore location change"
Dianne Hackborn [Sat, 12 Jun 2010 17:17:58 +0000 (10:17 -0700)]
New fragment sample code for ListFragment and context menus.
Change-Id: I97c64fa4c4140c81c7d0147026ba558ba1a76d2e
Christian Mehlmauer [Thu, 20 May 2010 19:02:04 +0000 (21:02 +0200)]
Cleaned up Samples by removing unsed imports and variables.
Changed deprecated Config.LOGD to Config.DEBUG
Removed unnecessary whitespaces
Change-Id: I01414dd83eb6f9a41e56762dd7fc00e7f1115039
Guang Zhu [Sat, 12 Jun 2010 01:46:56 +0000 (18:46 -0700)]
update runtest due to libcore location change
Change-Id: I2f273c8952ad60b999c964b3c223cae2b52d83bd
Romain Guy [Sat, 12 Jun 2010 01:37:31 +0000 (18:37 -0700)]
Merge "Reduced warnings by removing unused imports, unused variables and adding type arguments"
Jean-Baptiste Queru [Fri, 11 Jun 2010 23:10:46 +0000 (16:10 -0700)]
Merge "Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision"
Jean-Baptiste Queru [Fri, 11 Jun 2010 22:19:42 +0000 (15:19 -0700)]
Merge "Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables"
OSDN Git Service
