Commit Graph

4759 Commits

Author SHA1 Message Date
Xavier Ducrohet
ebf586a17b Merge "Remove obsolete Eclipse instruction for dev on tools." 2010-06-01 16:58:34 -07:00
Guang Zhu
16b98fb001 am 68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken 2010-06-01 16:11:18 -07:00
Kenny Root
895fa90b76 am 8aede04b: Add positional parameters to aid in i18n 2010-06-01 16:10:22 -07:00
Yu Shan Emily Lau
ce970403d8 am 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 2010-06-01 16:08:42 -07:00
Konstantin Lopyrev
3ab6c0ca42 Merge "Fix 2673731: Adding support for password history to the Device Admin Sample App." 2010-06-01 15:59:45 -07:00
Guang Zhu
68f37ab918 Merge "Add coverage_targets.xml into test image" into kraken 2010-06-01 15:55:21 -07:00
Guang Zhu
ea7e48c8be Add coverage_targets.xml into test image
This file is needed to get coverage targets definition when running code
coverage

Change-Id: If48ad5d9693eaa5857a308f2d304f388d5d8c4d5
2010-06-01 14:38:23 -07:00
Andrew Stadler
2e974a0ce9 Remove obsolete entries from .classpath
Change-Id: Ia16cfec1af00e935ea2bd9033b5262fd8fccea56
2010-06-01 14:27:29 -07:00
Xavier Ducrohet
46b910832f Remove obsolete Eclipse instruction for dev on tools.
These (updated) will be added to a different section later.

Change-Id: Ib5bc1b768cd95c4bc8fd082a7395a3ebb2c0472e
2010-06-01 14:25:10 -07:00
Kenny Root
8aede04bf2 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
2010-06-01 11:50:47 -07:00
Jack Palevich
a85e0b9ae0 Fix syntax errors in command lines for update-java-alternatives and curl.
Change-Id: Ib5b2be53b5d7f99d48f0c8366174ed94d4bcfa82
2010-05-31 15:34:32 +08:00
Dan Morrill
e72ce256b0 Merge "Fixing accidentally-stripped formatting on the code style guidelines. Also fixing a bunch of @Annotation references, to silence some droiddoc warnings." 2010-05-28 16:18:25 -07:00
Dan Morrill
1aad93f698 Fixing accidentally-stripped formatting on the code style guidelines. Also
fixing a bunch of @Annotation references, to silence some droiddoc warnings.

Change-Id: I810faa6dc25392fc6ec9569876878fe9ac5e6603
2010-05-28 16:16:40 -07:00
Yu Shan Emily Lau
67dfcbf17b 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.
2010-05-28 15:54:27 -07:00
Yu Shan Emily Lau
59b6dce0d5 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.
2010-05-28 15:50:23 -07:00
Yu Shan Emily Lau
39d7a7451b Merge "Added the instrumentation and power log monkey events fro the new power framework." into froyo 2010-05-28 15:38:48 -07:00
Andrew Stadler
0ffca18ad9 Add CalendarProvider and ContactsProvider intermediates
Required for new usage of EventLogTags.

Change-Id: Ia90af8b791270217a2d2d3cf06b3d772aaaad137
2010-05-28 15:37:30 -07:00
Yu Shan Emily Lau
2952b49c7c Added the instrumentation and power log monkey events fro the new power framework.
Change-Id: I3102e6caaba8763a2197ff80f13c8d127ea42316
2010-05-28 13:48:42 -07:00
Kenny Root
4e1181adc3 am 13cf156b: am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page" into froyo 2010-05-26 15:43:03 -07:00
Kenny Root
13cf156b85 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
2010-05-26 15:39:52 -07:00
Kenny Root
8824549dce 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
2010-05-26 15:38:05 -07:00
Kenny Root
99cb1d16cc Merge "Spelling fix for source download page" into froyo 2010-05-26 15:36:27 -07:00
Konstantin Lopyrev
b00082c73a Fix 2673731: Adding support for password history to the Device Admin Sample App.
Change-Id: I1380ff9475c201d3c2ec2ec449b1103c3d55a3a7
2010-05-26 14:58:15 -07:00
Xavier Ducrohet
97c743606d am d9c6e694: (-s ours) am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2. Do not merge 2010-05-26 13:55:37 -07:00
Xavier Ducrohet
d9c6e6948a 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
2010-05-26 13:52:59 -07:00
Xavier Ducrohet
6e6c1ebd77 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
2010-05-26 13:51:54 -07:00
Xavier Ducrohet
02ad7fc23a Move the rev of the froyo sdk component to 2. Do not merge
Change-Id: I44b05cd40dad2df760d3d259246a714b82ddf9a2
2010-05-26 13:48:10 -07:00
Bill Napier
d42aa3310e - 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
2010-05-25 14:42:32 -07:00
Christian Mehlmauer
58ff1585cd Replaced Deprecated GestureDetector API Call
Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6
2010-05-25 20:17:51 +02:00
Bill Napier
d5b401d376 Merge "Add in python unit tests and fix up java unit tests." 2010-05-25 09:52:14 -07:00
Bill Napier
66cfd4bfe8 Add in python unit tests and fix up java unit tests.
Change-Id: I3930946364d5ca8a5d18e4a2b36a7afa298ef2de
2010-05-25 09:49:42 -07:00
Marco Nelissen
51d41d52a5 Add missing properties to make the simulator work again.
Change-Id: I9c650360705960630198cb8006a3f83188ddd345
2010-05-24 15:23:22 -07:00
Bill Napier
e5fe8b6833 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." 2010-05-24 12:14:40 -07:00
Bill Napier
06a839ddbe 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
2010-05-24 12:12:17 -07:00
Dirk Dougherty
fcb192adf3 am b2d652d1: am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version. 2010-05-24 10:28:24 -07:00
Dirk Dougherty
b2d652d1c0 am d43be56d: am 3c19d0e0: Doc change: increment androidappdocs version.
Merge commit 'd43be56d40a813bedf96203c4b58056c6139eec0' into kraken

* commit 'd43be56d40a813bedf96203c4b58056c6139eec0':
  Doc change: increment androidappdocs version.
2010-05-24 10:25:09 -07:00
Dirk Dougherty
d43be56d40 am 3c19d0e0: Doc change: increment androidappdocs version.
Merge commit '3c19d0e052fae5f21f8e8592143a24919b106743' into froyo-plus-aosp

* commit '3c19d0e052fae5f21f8e8592143a24919b106743':
  Doc change: increment androidappdocs version.
2010-05-24 10:23:08 -07:00
Dirk Dougherty
3c19d0e052 Doc change: increment androidappdocs version.
Change-Id: Ifd517ed5c51cb95fdc4cc83d5521242086d59534
2010-05-24 10:17:06 -07:00
Christian Mehlmauer
63c3bf98d1 Added missing classpathentry for DeskClock App, Bluetooth, obex, Gallery3D, Launcher2, GlobalSearch and Provision
Change-Id: I9754d1049a22e7b677b3537f5c3e9b9f4d239e39
2010-05-23 10:56:48 +02:00
Andrew Stadler
eae3b0df70 add frameworks/base/vcard/java to fix eclipse
Change-Id: I087266f22d8e95bc6d088e07d1da7dc62e32c1eb
2010-05-21 14:59:30 -07:00
Andy McFadden
f5c3fa2cdc am 26dc3612: Sim fixes. 2010-05-21 11:09:55 -07:00
Andy McFadden
26dc36123f 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
2010-05-21 11:00:14 -07:00
Christian Mehlmauer
97d0e8ddb7 Removed unused Imports, Added Type Arguments, removed some Warnings by using unused Methods and Variables
Change-Id: I39a4eb2b17f3411b17fcc49cbbbe396e89fab24a
2010-05-21 19:34:32 +02:00
Bill Napier
4ef0789134 Merge "Add in stub backend to be used for jython unit tests." 2010-05-21 10:29:40 -07:00
Bill Napier
9bfa27ffe6 Add in stub backend to be used for jython unit tests.
Change-Id: Idb7a18ce1ddeb8621c688d5580515d10db6edf19
2010-05-21 10:20:56 -07:00
Bill Napier
ccfc305b5a Merge "Add in the help command implementation to return the "help" string to the caller." 2010-05-21 10:00:37 -07:00
Christian Mehlmauer
a3396e0940 Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers
Change-Id: I25add019e99fec88c8422da14f3e18246ca0f0b5
2010-05-21 07:28:31 +02:00
Romain Guy
91cd277060 Merge "removed unused imports" 2010-05-20 22:11:49 -07:00
Romain Guy
8b676d1916 Merge "removed unused imports" 2010-05-20 22:10:43 -07:00
Romain Guy
72d89196dd Merge "removed unused imports" 2010-05-20 22:10:15 -07:00