OSDN Git Service
The Android Open Source Project [Wed, 2 Jun 2010 14:50:35 +0000 (07:50 -0700)]
am
08a42a05: am
9867f949: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:49:09 +0000 (07:49 -0700)]
am
4912afb1: am
2d75ee4a: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:47:55 +0000 (07:47 -0700)]
am
9867f949: merge from open-source master
Merge commit '
9867f9491cb0b61a7ddeae616b2fdd4dca709f63' into kraken
* commit '
9867f9491cb0b61a7ddeae616b2fdd4dca709f63':
Replaced Deprecated GestureDetector API Call
The Android Open Source Project [Wed, 2 Jun 2010 14:46:27 +0000 (07:46 -0700)]
am
2d75ee4a: merge from open-source master
Merge commit '
2d75ee4ad0034d81350602567b8d76b1278e7edc' into kraken
* commit '
2d75ee4ad0034d81350602567b8d76b1278e7edc':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:45:47 +0000 (07:45 -0700)]
merge from open-source master
Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0
The Android Open Source Project [Wed, 2 Jun 2010 14:45:37 +0000 (07:45 -0700)]
am
d31ee22f: am
aebe000c: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:44:48 +0000 (07:44 -0700)]
merge from open-source master
Change-Id: I69d4b5355019fa58ef5a00e6f53e553ea71f2f90
The Android Open Source Project [Wed, 2 Jun 2010 14:44:11 +0000 (07:44 -0700)]
am
4a4484be: am
4bdec4ab: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:42:49 +0000 (07:42 -0700)]
am
aebe000c: merge from open-source master
Merge commit '
aebe000cfa26eb84031f7385bf363868a70f39ff' into kraken
* commit '
aebe000cfa26eb84031f7385bf363868a70f39ff':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:42:37 +0000 (07:42 -0700)]
am
5482eca1: am
032ae72e: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:41:00 +0000 (07:41 -0700)]
am
4bdec4ab: merge from open-source master
Merge commit '
4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken
* commit '
4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 14:37:37 +0000 (07:37 -0700)]
am
032ae72e: merge from open-source master
Merge commit '
032ae72e19d9a12fff483664b975392ef63f2fb7' into kraken
* commit '
032ae72e19d9a12fff483664b975392ef63f2fb7':
Removed unused import
The Android Open Source Project [Wed, 2 Jun 2010 14:37:36 +0000 (07:37 -0700)]
am
0f57228b: am
43abe820: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:37:13 +0000 (07:37 -0700)]
merge from open-source master
Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a
The Android Open Source Project [Wed, 2 Jun 2010 14:35:57 +0000 (07:35 -0700)]
merge from open-source master
Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6
The Android Open Source Project [Wed, 2 Jun 2010 14:31:14 +0000 (07:31 -0700)]
am
43abe820: merge from open-source master
Merge commit '
43abe820f2a46746dcd7b86db593c08b9e1f938d' into kraken
* commit '
43abe820f2a46746dcd7b86db593c08b9e1f938d':
Reduced Warnings
The Android Open Source Project [Wed, 2 Jun 2010 14:30:55 +0000 (07:30 -0700)]
am
74a0b220: am
740c3e2e: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:30:52 +0000 (07:30 -0700)]
am
85c4a21b: am
8cc5a816: merge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:30:37 +0000 (07:30 -0700)]
merge from open-source master
Change-Id: I3225d2a7b1e4b0ea60941a452285137980c1a921
The Android Open Source Project [Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)]
merge from open-source master
Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b
The Android Open Source Project [Wed, 2 Jun 2010 14:27:39 +0000 (07:27 -0700)]
am
740c3e2e: merge from open-source master
Merge commit '
740c3e2e97a4cca24ecb534de72663ced238156a' into kraken
* commit '
740c3e2e97a4cca24ecb534de72663ced238156a':
Updated deprecated Contacts API to ContactsContract
The Android Open Source Project [Wed, 2 Jun 2010 14:27:37 +0000 (07:27 -0700)]
am
8cc5a816: merge from open-source master
Merge commit '
8cc5a8166dcdccfdb7f379a05190cef43f91c423' into kraken
* commit '
8cc5a8166dcdccfdb7f379a05190cef43f91c423':
Updated Sensor Samples to newest API
The Android Open Source Project [Wed, 2 Jun 2010 14:23:24 +0000 (07:23 -0700)]
merge from open-source master
Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01
The Android Open Source Project [Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)]
merge from open-source master
Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650
Dan Morrill [Wed, 2 Jun 2010 00:19:15 +0000 (17:19 -0700)]
Adding a page to the compatibility site referenced by the 2.1 CDD.
This page lists the allowed version strings.
Change-Id: Iffbe0f1739a5daae8f2aa447b86af12aa7142a31
Xavier Ducrohet [Tue, 1 Jun 2010 23:58:34 +0000 (16:58 -0700)]
Merge "Remove obsolete Eclipse instruction for dev on tools."
Guang Zhu [Tue, 1 Jun 2010 23:11:18 +0000 (16:11 -0700)]
am
68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken
Kenny Root [Tue, 1 Jun 2010 23:10:22 +0000 (16:10 -0700)]
am
8aede04b: Add positional parameters to aid in i18n
Yu Shan Emily Lau [Tue, 1 Jun 2010 23:08:42 +0000 (16:08 -0700)]
am
67dfcbf1: am
59b6dce0: am
39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Konstantin Lopyrev [Tue, 1 Jun 2010 22:59:45 +0000 (15:59 -0700)]
Merge "Fix
2673731: Adding support for password history to the Device Admin Sample App."
Guang Zhu [Tue, 1 Jun 2010 22:55:21 +0000 (15:55 -0700)]
Merge "Add coverage_targets.xml into test image" into kraken
Guang Zhu [Tue, 1 Jun 2010 21:38:23 +0000 (14:38 -0700)]
Add coverage_targets.xml into test image
This file is needed to get coverage targets definition when running code
coverage
Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
Xavier Ducrohet [Tue, 1 Jun 2010 21:25:10 +0000 (14:25 -0700)]
Remove obsolete Eclipse instruction for dev on tools.
These (updated) will be added to a different section later.
Change-Id: Ib5bc1b768cd95c4bc8fd082a7395a3ebb2c0472e
Kenny Root [Fri, 28 May 2010 21:24:49 +0000 (14:24 -0700)]
Add positional parameters to aid in i18n
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.
Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
Jack Palevich [Mon, 31 May 2010 07:34:32 +0000 (15:34 +0800)]
Fix syntax errors in command lines for update-java-alternatives and curl.
Change-Id: Ib5b2be53b5d7f99d48f0c8366174ed94d4bcfa82
Dan Morrill [Fri, 28 May 2010 23:18:25 +0000 (16:18 -0700)]
Merge "Fixing accidentally-stripped formatting on the code style guidelines. Also fixing a bunch of @Annotation references, to silence some droiddoc warnings."
Dan Morrill [Fri, 28 May 2010 21:49:47 +0000 (14:49 -0700)]
Fixing accidentally-stripped formatting on the code style guidelines. Also
fixing a bunch of @Annotation references, to silence some droiddoc warnings.
Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603
Yu Shan Emily Lau [Fri, 28 May 2010 22:54:27 +0000 (15:54 -0700)]
am
59b6dce0: am
39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Merge commit '
59b6dce0d5035b44dd8d99523efc63a469246f42' into kraken
* commit '
59b6dce0d5035b44dd8d99523efc63a469246f42':
Added the instrumentation and power log monkey events fro the new power framework.
Yu Shan Emily Lau [Fri, 28 May 2010 22:50:23 +0000 (15:50 -0700)]
am
39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Merge commit '
39d7a7451b7e43dc1d71ac983821e76c88775a81' into froyo-plus-aosp
* commit '
39d7a7451b7e43dc1d71ac983821e76c88775a81':
Added the instrumentation and power log monkey events fro the new power framework.
Yu Shan Emily Lau [Fri, 28 May 2010 22:38:48 +0000 (15:38 -0700)]
Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo
Andrew Stadler [Fri, 28 May 2010 22:37:30 +0000 (15:37 -0700)]
Add CalendarProvider and ContactsProvider intermediates
Required for new usage of EventLogTags.
Change-Id: Ia90af8b791270217a2d2d3cf06b3d772aaaad137
Yu Shan Emily Lau [Wed, 26 May 2010 18:42:13 +0000 (11:42 -0700)]
Added the instrumentation and power log monkey events fro the new power framework.
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
Kenny Root [Wed, 26 May 2010 22:43:03 +0000 (15:43 -0700)]
am
13cf156b: am
8824549d: am
99cb1d16: Merge "Spelling fix for source download page" into froyo
Kenny Root [Wed, 26 May 2010 22:39:52 +0000 (15:39 -0700)]
am
8824549d: am
99cb1d16: Merge "Spelling fix for source download page" into froyo
Merge commit '
8824549dce27b5bb3085e6a83f06ca4d16b78ea6' into kraken
* commit '
8824549dce27b5bb3085e6a83f06ca4d16b78ea6':
Spelling fix for source download page
Kenny Root [Wed, 26 May 2010 22:38:05 +0000 (15:38 -0700)]
am
99cb1d16: Merge "Spelling fix for source download page" into froyo
Merge commit '
99cb1d16cc609866bb17c729d9b41926924ab4dd' into froyo-plus-aosp
* commit '
99cb1d16cc609866bb17c729d9b41926924ab4dd':
Spelling fix for source download page
Kenny Root [Wed, 26 May 2010 22:36:27 +0000 (15:36 -0700)]
Merge "Spelling fix for source download page" into froyo
Konstantin Lopyrev [Thu, 20 May 2010 23:12:19 +0000 (16:12 -0700)]
Fix
2673731: Adding support for password history to the Device Admin Sample App.
Change-Id: I1380ff9475c201d3c2ec2ec449b1103c3d55a3a7
Xavier Ducrohet [Wed, 26 May 2010 20:55:37 +0000 (13:55 -0700)]
am
d9c6e694: (-s ours) am
6e6c1ebd: (-s ours) am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:52:59 +0000 (13:52 -0700)]
am
6e6c1ebd: (-s ours) am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3' into kraken
* commit '
6e6c1ebd77a6a353bf2af77035c73c606311d8c3':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:51:54 +0000 (13:51 -0700)]
am
02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge
Merge commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7' into froyo-plus-aosp
* commit '
02ad7fc23a8f6a6eddf8ac25138c78f2fd5e8ed7':
Move the rev of the froyo sdk component to 2. Do not merge
Xavier Ducrohet [Wed, 26 May 2010 20:47:19 +0000 (13:47 -0700)]
Move the rev of the froyo sdk component to 2. Do not merge
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
Bill Napier [Tue, 25 May 2010 21:32:56 +0000 (14:32 -0700)]
- Improve ScriptRunner command line parsing to actually pass more of the arguments. (And a unit test to go with it).
- Set __name__ inside the scriptfile runner so python scripts expecting it get it.
- Propagate sys.exit error codes so monkeyrunner will actually return those error codes.
- Better handle PyExceptions thrown by the script to actually terminate monkeyrunner.
- Bubble up installPackage and removePackage error codes so callers can tell if they worked or not.
Change-Id: Ia4717b1ad2c9b4cccd607aba00211f2f85dfb412
Christian Mehlmauer [Tue, 25 May 2010 16:34:41 +0000 (18:34 +0200)]
Replaced Deprecated GestureDetector API Call
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
Bill Napier [Tue, 25 May 2010 16:52:14 +0000 (09:52 -0700)]
Merge "Add in python unit tests and fix up java unit tests."
Bill Napier [Mon, 24 May 2010 22:08:21 +0000 (15:08 -0700)]
Add in python unit tests and fix up java unit tests.
Change-Id: I3930946364d5ca8a5d18e4a2b36a7afa298ef2de
Marco Nelissen [Mon, 24 May 2010 22:19:31 +0000 (15:19 -0700)]
Add missing properties to make the simulator work again.
Change-Id: I9c650360705960630198cb8006a3f83188ddd345
Bill Napier [Mon, 24 May 2010 19:14:40 +0000 (12:14 -0700)]
Merge "Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument. Also make sure that the arguments passed on the command line correctly get set in sys.argv."
Bill Napier [Fri, 21 May 2010 18:08:23 +0000 (11:08 -0700)]
Add in "plugin" support to allow users to add their own plugin's via JAR files and the -plugin command line argument.
Also make sure that the arguments passed on the command line correctly get set in sys.argv.
Change-Id: I35014adc95ac9e5e5c777dc17749ee2b9b155c57
Dirk Dougherty [Mon, 24 May 2010 17:28:24 +0000 (10:28 -0700)]
am
b2d652d1: am
d43be56d: am
3c19d0e0: Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:25:09 +0000 (10:25 -0700)]
am
d43be56d: am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
d43be56d40a813bedf96203c4b58056c6139eec0' into kraken
* commit '
d43be56d40a813bedf96203c4b58056c6139eec0':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:23:08 +0000 (10:23 -0700)]
am
3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '
3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp
* commit '
3c19d0e052fae5f21f8e8592143a24919b106743':
Doc change: increment androidappdocs version.
Dirk Dougherty [Mon, 24 May 2010 17:17:06 +0000 (10:17 -0700)]
Doc change: increment androidappdocs version.
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
Andrew Stadler [Fri, 21 May 2010 21:59:30 +0000 (14:59 -0700)]
add frameworks/base/vcard/java to fix eclipse
Change-Id: I087266f22d8e95bc6d088e07d1da7dc62e32c1eb
Andy McFadden [Fri, 21 May 2010 18:09:55 +0000 (11:09 -0700)]
Andy McFadden [Fri, 21 May 2010 17:58:40 +0000 (10:58 -0700)]
Sim fixes.
Pulled a fix to the simulator app ("long" is 64-bit when 32-bit was
needed) from master. sim-eng is useful for verifying the x86 SMP stuff.
Also quieted a compiler warning.
Change-Id: I399ea4923b7e0650d5f995e056c751374b057fbd
Bill Napier [Fri, 21 May 2010 17:29:40 +0000 (10:29 -0700)]
Merge "Add in stub backend to be used for jython unit tests."
Bill Napier [Thu, 20 May 2010 21:44:14 +0000 (14:44 -0700)]
Add in stub backend to be used for jython unit tests.
Change-Id: Idb7a18ce1ddeb8621c688d5580515d10db6edf19
Bill Napier [Fri, 21 May 2010 17:00:37 +0000 (10:00 -0700)]
Merge "Add in the help command implementation to return the "help" string to the caller."
Romain Guy [Fri, 21 May 2010 05:11:49 +0000 (22:11 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:43 +0000 (22:10 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:15 +0000 (22:10 -0700)]
Merge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:09:03 +0000 (22:09 -0700)]
Merge "Removed unused import"
Bill Napier [Thu, 20 May 2010 21:41:26 +0000 (14:41 -0700)]
Add in the help command implementation to return the "help" string to the caller.
Change-Id: Icb350e4c1cb5ce219ea5ae90272dd7bbaba283e3
Bill Napier [Thu, 20 May 2010 21:32:36 +0000 (14:32 -0700)]
remove DebugBridge as it has been replaced with AdbBackend
Change-Id: I52270f2d4ee137932a32309812a8a20503839035
Christian Mehlmauer [Thu, 20 May 2010 19:07:30 +0000 (21:07 +0200)]
removed unused imports
Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0
Christian Mehlmauer [Thu, 20 May 2010 19:06:37 +0000 (21:06 +0200)]
removed unused imports
Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b
Christian Mehlmauer [Thu, 20 May 2010 19:04:57 +0000 (21:04 +0200)]
removed unused imports
Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27
Christian Mehlmauer [Thu, 20 May 2010 18:35:14 +0000 (20:35 +0200)]
Removed unused import
Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a
Bill Napier [Tue, 18 May 2010 19:21:00 +0000 (12:21 -0700)]
Refactor MonkeyRunner and add in a lot of API operations.
Change-Id: I96ad1da5dc94c86c1e47ff1acf6843d282bb4724
Christian Mehlmauer [Thu, 20 May 2010 18:13:51 +0000 (20:13 +0200)]
Reduced Warnings
Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9
Romain Guy [Thu, 20 May 2010 05:06:53 +0000 (22:06 -0700)]
Merge "Updated deprecated Contacts API to ContactsContract"
Romain Guy [Thu, 20 May 2010 05:06:32 +0000 (22:06 -0700)]
Merge "Updated Sensor Samples to newest API"
Christian Mehlmauer [Wed, 19 May 2010 18:16:43 +0000 (20:16 +0200)]
Updated deprecated Contacts API to ContactsContract
Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94
Dianne Hackborn [Thu, 20 May 2010 02:21:19 +0000 (19:21 -0700)]
Add new fragment demo for changing with config.
This changes the FragmentLayout demo to show how the layout
(and entire UI flow) can easily be changed based on screen configuration
using fragments. Here we have different UI for landscape vs portrait.
The old FragmentLayout demo is renamed to FragmentAnim and extended a
bit.
Various other tweaks to follow fragment API changes.
Change-Id: I8df918dbf32b3617cae2b20f77eb37d8211b8c89
Jaikumar Ganesh [Wed, 19 May 2010 18:57:21 +0000 (11:57 -0700)]
Update Bluetooth documentation.
Change-Id: I64a26e2c44bcff739380fe31ce5f6d1e06722282
Christian Mehlmauer [Tue, 18 May 2010 21:40:33 +0000 (23:40 +0200)]
Updated Sensor Samples to newest API
Change-Id: I88c0ce08232fed34aa99c97385155220e7d9abff
The Android Open Source Project [Wed, 19 May 2010 15:20:53 +0000 (08:20 -0700)]
am
d350cf1b: am
ca81fb41: merge from open-source master
The Android Open Source Project [Wed, 19 May 2010 15:18:13 +0000 (08:18 -0700)]
am
ca81fb41: merge from open-source master
Merge commit '
ca81fb411afd93378f01e3e13ef482693fd35a73' into kraken
* commit '
ca81fb411afd93378f01e3e13ef482693fd35a73':
Corrected StatusBarNotificationSample
The Android Open Source Project [Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)]
merge from open-source master
Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca
Guang Zhu [Wed, 19 May 2010 01:46:43 +0000 (18:46 -0700)]
am
1a3ab7bf: (-s ours) Merge "code coverage improvement (DO NOT MERGE)" into kraken
Guang Zhu [Wed, 19 May 2010 01:44:16 +0000 (18:44 -0700)]
Merge "code coverage improvement (DO NOT MERGE)" into kraken
Dianne Hackborn [Wed, 19 May 2010 01:37:20 +0000 (18:37 -0700)]
am
689868ac: Small fix to surface window sample.
Dianne Hackborn [Wed, 19 May 2010 01:33:05 +0000 (18:33 -0700)]
Small fix to surface window sample.
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
Christian Mehlmauer [Tue, 18 May 2010 21:44:32 +0000 (23:44 +0200)]
Corrected StatusBarNotificationSample
Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8
Vladimir Chtchetkine [Tue, 18 May 2010 21:06:16 +0000 (14:06 -0700)]
Merge "Add Samsung VID/PID to android_winusb.inf fixing bug
2687489"
Vladimir Chtchetkine [Tue, 18 May 2010 20:45:36 +0000 (13:45 -0700)]
Add Samsung VID/PID to android_winusb.inf fixing bug
2687489
Change-Id: I31baae3400ef8ef04270fd17352ee81cd244d779
Dianne Hackborn [Tue, 18 May 2010 19:24:57 +0000 (12:24 -0700)]
am
5ee6d7a1: Merge "Add new demo of taking over a window\'s surface." into kraken
Dianne Hackborn [Tue, 18 May 2010 19:21:39 +0000 (12:21 -0700)]
Merge "Add new demo of taking over a window's surface." into kraken
Bill Napier [Tue, 18 May 2010 18:22:18 +0000 (11:22 -0700)]
Add in method to ScriptRunner to also get a variable result from the interpreter.
Change-Id: Ib14d48992b66371a6702a7dac621bf3a62d1a936
The Android Open Source Project [Tue, 18 May 2010 18:02:06 +0000 (11:02 -0700)]
am
f8402ac0: am
253290a7: merge from open-source master
OSDN Git Service
