OSDN Git Service

android-x86/development.git
14 years agoMerge "update runtest due to libcore location change"
Guang Zhu [Sun, 13 Jun 2010 21:54:41 +0000 (14:54 -0700)]
Merge "update runtest due to libcore location change"

14 years agoNew fragment sample code for ListFragment and context menus.
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

14 years agoupdate runtest due to libcore location change
Guang Zhu [Sat, 12 Jun 2010 01:46:56 +0000 (18:46 -0700)]
update runtest due to libcore location change

Change-Id: I2f273c8952ad60b999c964b3c223cae2b52d83bd

14 years agoMerge "fix build (again). Even more sneaky @Overrides"
Bill Napier [Fri, 11 Jun 2010 21:04:41 +0000 (14:04 -0700)]
Merge "fix build (again).  Even more sneaky @Overrides"

14 years agofix build (again). Even more sneaky @Overrides
Bill Napier [Fri, 11 Jun 2010 21:04:02 +0000 (14:04 -0700)]
fix build (again).  Even more sneaky @Overrides

Change-Id: I370a3d6372ac8425959ce71c5e564a2bac04dc03

14 years agoFix build. @Override
Bill Napier [Fri, 11 Jun 2010 20:01:02 +0000 (13:01 -0700)]
Fix build. @Override

Change-Id: Iecc821e610f671f6e08aa98e433a31990af40855

14 years agoMerge "Add in some more useful MonkeyRunner commands:"
Bill Napier [Fri, 11 Jun 2010 16:37:57 +0000 (09:37 -0700)]
Merge "Add in some more useful MonkeyRunner commands:"

14 years agoam 54a02f74: am fcefaf88: Add a sample to demonstrate module exports in the NDK.
David 'Digit' Turner [Fri, 11 Jun 2010 00:41:32 +0000 (17:41 -0700)]
am 54a02f74: am fcefaf88: Add a sample to demonstrate module exports in the NDK.

14 years agoam fcefaf88: Add a sample to demonstrate module exports in the NDK.
David 'Digit' Turner [Fri, 11 Jun 2010 00:39:39 +0000 (17:39 -0700)]
am fcefaf88: Add a sample to demonstrate module exports in the NDK.

14 years agoAdd a sample to demonstrate module exports in the NDK.
David 'Digit' Turner [Thu, 10 Jun 2010 23:53:05 +0000 (16:53 -0700)]
Add a sample to demonstrate module exports in the NDK.

+ add .gitignore

Change-Id: Ifa160316e37cf201099ab0d8d89fdd375ee3eb59

14 years agoAdd in some more useful MonkeyRunner commands:
Bill Napier [Wed, 9 Jun 2010 00:15:18 +0000 (17:15 -0700)]
Add in some more useful MonkeyRunner commands:

 - Add in device "drag" command to simulate a finger moving across the touch screen
 - Add in some pixel operation on MonkeyImage to scripts can do pixel level tests and comparisons.
 - Fix up the help command to no longer loop forever.
 - Start MonkeyRunner in interactive mode if no script file is specified.

Change-Id: Ifd2655d3291dcc9dc355d4c2efa9019dc38bee5d

14 years agoam f2ecc1ea: am d616e8b2: Fix build
David 'Digit' Turner [Thu, 10 Jun 2010 00:52:00 +0000 (17:52 -0700)]
am f2ecc1ea: am d616e8b2: Fix build

14 years agoam d616e8b2: Fix build
David 'Digit' Turner [Thu, 10 Jun 2010 00:50:03 +0000 (17:50 -0700)]
am d616e8b2: Fix build

14 years agoFix build
David 'Digit' Turner [Thu, 10 Jun 2010 00:46:46 +0000 (17:46 -0700)]
Fix build

Also remove unwanted binary files here

Change-Id: I1b52abbbfd3f67670fb5977f5430a1bb4dac22bb

14 years agoam 97af2f76: am c817c521: Copy platforms and samples from ndk/ source tree.
David 'Digit' Turner [Thu, 10 Jun 2010 00:23:52 +0000 (17:23 -0700)]
am 97af2f76: am c817c521: Copy platforms and samples from ndk/ source tree.

14 years agoam c817c521: Copy platforms and samples from ndk/ source tree.
David 'Digit' Turner [Thu, 10 Jun 2010 00:22:29 +0000 (17:22 -0700)]
am c817c521: Copy platforms and samples from ndk/ source tree.

14 years agoCopy platforms and samples from ndk/ source tree.
David 'Digit' Turner [Thu, 10 Jun 2010 00:02:09 +0000 (17:02 -0700)]
Copy platforms and samples from ndk/ source tree.

The idea is to allow developing the NDK in the open, while
having the platforms and samples under a private branch until
the corresponding release are open-sourced.

Change-Id: Iee995fb6c4d3ee1387dea7486e599e079c9e4c6d

14 years agoam bb6eb408: merge from froyo-plus-aosp
Jean-Baptiste Queru [Wed, 9 Jun 2010 23:03:33 +0000 (16:03 -0700)]
am bb6eb408: merge from froyo-plus-aosp

14 years agomerge from froyo-plus-aosp
Jean-Baptiste Queru [Wed, 9 Jun 2010 23:01:49 +0000 (16:01 -0700)]
merge from froyo-plus-aosp

Change-Id: Ib618f0dc9c71938d111648043ebd2fa2b93beda1

14 years agoAdd API demo for fragment menus.
Dianne Hackborn [Wed, 9 Jun 2010 01:06:33 +0000 (18:06 -0700)]
Add API demo for fragment menus.

Change-Id: I85714938861dea06bb72f39dd7d1465c0d3926e4

14 years agoam b2d64706: am b9531350: am 71027e1b: Provision the backup manager in the SDK System...
Xavier Ducrohet [Wed, 9 Jun 2010 17:37:51 +0000 (10:37 -0700)]
am b2d64706: am b9531350: am 71027e1b: Provision the backup manager in the SDK System image.

14 years agoam b9531350: am 71027e1b: Provision the backup manager in the SDK System image.
Xavier Ducrohet [Wed, 9 Jun 2010 17:36:30 +0000 (10:36 -0700)]
am b9531350: am 71027e1b: Provision the backup manager in the SDK System image.

14 years agoam 71027e1b: Provision the backup manager in the SDK System image.
Xavier Ducrohet [Wed, 9 Jun 2010 17:35:43 +0000 (10:35 -0700)]
am 71027e1b: Provision the backup manager in the SDK System image.

Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into froyo-plus-aosp

* commit '71027e1b75951c90c22c9979a505381fae843ed3':
  Provision the backup manager in the SDK System image.

14 years agoam 71027e1b: Provision the backup manager in the SDK System image.
Xavier Ducrohet [Wed, 9 Jun 2010 17:34:33 +0000 (10:34 -0700)]
am 71027e1b: Provision the backup manager in the SDK System image.

Merge commit '71027e1b75951c90c22c9979a505381fae843ed3' into kraken

* commit '71027e1b75951c90c22c9979a505381fae843ed3':
  Provision the backup manager in the SDK System image.

14 years agoMove vcard to frameworks/opt in eclipse classpath
Andrew Stadler [Tue, 8 Jun 2010 18:41:12 +0000 (11:41 -0700)]
Move vcard to frameworks/opt in eclipse classpath

Change-Id: I959c4b21e174a20d0d9ddb8fece0cdbac6b87a94

14 years agoProvision the backup manager in the SDK System image.
Xavier Ducrohet [Tue, 8 Jun 2010 02:22:29 +0000 (19:22 -0700)]
Provision the backup manager in the SDK System image.

Change-Id: Ib1c9ef22558e71452cf979e36dd1d1fdbf844ce8

14 years agoam cc303b81: merge from froyo-plus-aosp
The Android Open Source Project [Mon, 7 Jun 2010 23:45:07 +0000 (16:45 -0700)]
am cc303b81: merge from froyo-plus-aosp

14 years agomerge from froyo-plus-aosp
The Android Open Source Project [Mon, 7 Jun 2010 23:43:33 +0000 (16:43 -0700)]
merge from froyo-plus-aosp

Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3

14 years agomerge from open-source master
The Android Open Source Project [Mon, 7 Jun 2010 23:30:52 +0000 (16:30 -0700)]
merge from open-source master

Change-Id: Ia3b88d1fc8864903dd67478e972758871730a215

14 years agoMerge "Added Type Arguments to Samples, to reduce Warnings and get a litle bit more...
Jean-Baptiste Queru [Mon, 7 Jun 2010 21:29:24 +0000 (14:29 -0700)]
Merge "Added Type Arguments to Samples, to reduce Warnings and get a litle bit more Compiler Code checking for "new" Android Programmers"

14 years agoMerge "Link to Downloadable CTS Zip"
Brian Muramatsu [Fri, 4 Jun 2010 23:00:58 +0000 (16:00 -0700)]
Merge "Link to Downloadable CTS Zip"

14 years agoMerge "Make Unix commands easier to read by fixing typos. Mostly missing spaces."
Chris Palmer [Fri, 4 Jun 2010 22:52:33 +0000 (15:52 -0700)]
Merge "Make Unix commands easier to read by fixing typos. Mostly missing spaces."

14 years agoLink to Downloadable CTS Zip
Brian Muramatsu [Fri, 4 Jun 2010 18:20:10 +0000 (11:20 -0700)]
Link to Downloadable CTS Zip

Add link to CTS zip and remove references to building CTS directly.

Change-Id: Ice978269ca57fb8ae1faedad7f525e1c800fee19

14 years agoam db974ee7: Dumb.
Dianne Hackborn [Fri, 4 Jun 2010 21:17:17 +0000 (14:17 -0700)]
am db974ee7: Dumb.

14 years agoDumb.
Dianne Hackborn [Fri, 4 Jun 2010 21:13:27 +0000 (14:13 -0700)]
Dumb.

Change-Id: I05f17560ace880c628c94d676bd908c611348029

14 years agoam 2e952670: Add API demo of a heavy-weight application.
Dianne Hackborn [Fri, 4 Jun 2010 21:11:09 +0000 (14:11 -0700)]
am 2e952670: Add API demo of a heavy-weight application.

14 years agoAdd API demo of a heavy-weight application.
Dianne Hackborn [Fri, 4 Jun 2010 01:49:04 +0000 (18:49 -0700)]
Add API demo of a heavy-weight application.

Change-Id: I15e2d1c766af8aa7a62beed3069b8d128338ca11

14 years agoMake Unix commands easier to read by fixing typos. Mostly missing spaces.
Chris Palmer [Fri, 4 Jun 2010 00:49:56 +0000 (17:49 -0700)]
Make Unix commands easier to read by fixing typos. Mostly missing spaces.

Change-Id: Id4ca8b9e84d760b7812982f817ef7d7df52c8397

14 years agoam 4ff90676: am 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.
Dan Egnor [Thu, 3 Jun 2010 21:14:14 +0000 (14:14 -0700)]
am 4ff90676: am 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.

14 years agoam 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.
Dan Egnor [Thu, 3 Jun 2010 21:10:42 +0000 (14:10 -0700)]
am 7e7d75ee: am 27626c03: Add API key to BackupRestore sample code.

Merge commit '7e7d75eefd23debadb67e894bc152e479bdb714f' into kraken

* commit '7e7d75eefd23debadb67e894bc152e479bdb714f':
  Add API key to BackupRestore sample code.

14 years agoam 27626c03: Add API key to BackupRestore sample code.
Dan Egnor [Thu, 3 Jun 2010 21:08:35 +0000 (14:08 -0700)]
am 27626c03: Add API key to BackupRestore sample code.

Merge commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995' into froyo-plus-aosp

* commit '27626c03e4db54d1edfaa28f10bef1ef9ded9995':
  Add API key to BackupRestore sample code.

14 years agoAdd API key to BackupRestore sample code.
Dan Egnor [Thu, 3 Jun 2010 20:38:26 +0000 (13:38 -0700)]
Add API key to BackupRestore sample code.

Change-Id: If80cbceffc213fdc6059fe22bf0e24520fba5f2d
Bug: 2735063

14 years agoFixing an incorrect link to contact the Compat team.
Dan Morrill [Thu, 3 Jun 2010 17:37:31 +0000 (10:37 -0700)]
Fixing an incorrect link to contact the Compat team.

Change-Id: Ie63b3b781404fa997e02101fef74ceb54f438d01

14 years agoam c2b27167: fix earlier change for coverage_targets.xml
Guang Zhu [Thu, 3 Jun 2010 05:23:27 +0000 (22:23 -0700)]
am c2b27167: fix earlier change for coverage_targets.xml

14 years agofix earlier change for coverage_targets.xml
Guang Zhu [Wed, 2 Jun 2010 18:18:14 +0000 (11:18 -0700)]
fix earlier change for coverage_targets.xml

due to previous incorrect change to Makefile, test_defs.xml is missing.
this will add it back in.

Change-Id: I4bd57d24757662477409ba02d3f71122e8e75238

14 years agoMerge "Remove obsolete entries from .classpath"
Andrew Stadler [Wed, 2 Jun 2010 16:40:38 +0000 (09:40 -0700)]
Merge "Remove obsolete entries from .classpath"

14 years agoam 08a42a05: am 9867f949: merge from open-source master
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

14 years agoam 4912afb1: am 2d75ee4a: 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

14 years agoam 9867f949: 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

14 years agoam 2d75ee4a: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:45:47 +0000 (07:45 -0700)]
merge from open-source master

Change-Id: If51f538438a5da22d4f04cb6d251603b4abd08f0

14 years agoam d31ee22f: am aebe000c: merge from open-source master
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

14 years agomerge 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

14 years agoam 4a4484be: am 4bdec4ab: merge from open-source master
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

14 years agoam aebe000c: 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

14 years agoam 5482eca1: am 032ae72e: merge from open-source master
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

14 years agoam 4bdec4ab: 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

14 years agoam 032ae72e: merge from open-source master
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

14 years agoam 0f57228b: am 43abe820: merge from open-source master
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

14 years agomerge 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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:35:57 +0000 (07:35 -0700)]
merge from open-source master

Change-Id: I0d2492c58689315f4caaa9bcb908296c26f53ed6

14 years agoam 43abe820: merge from open-source master
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

14 years agoam 74a0b220: am 740c3e2e: merge from open-source master
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

14 years agoam 85c4a21b: am 8cc5a816: 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

14 years agomerge 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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:28:32 +0000 (07:28 -0700)]
merge from open-source master

Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b

14 years agoam 740c3e2e: merge from open-source master
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

14 years agoam 8cc5a816: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:23:24 +0000 (07:23 -0700)]
merge from open-source master

Change-Id: I02c592cc054ac16e494ca7a34673ffb562287b01

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 14:22:11 +0000 (07:22 -0700)]
merge from open-source master

Change-Id: I900ca65f70c1a66781fb5f6f37c45961416d5650

14 years agoAdding a page to the compatibility site referenced by the 2.1 CDD.
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

14 years agoMerge "Remove obsolete Eclipse instruction for dev on tools."
Xavier Ducrohet [Tue, 1 Jun 2010 23:58:34 +0000 (16:58 -0700)]
Merge "Remove obsolete Eclipse instruction for dev on tools."

14 years agoam 68f37ab9: Merge "Add coverage_targets.xml into test image" into kraken
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

14 years agoam 8aede04b: Add positional parameters to aid in i18n
Kenny Root [Tue, 1 Jun 2010 23:10:22 +0000 (16:10 -0700)]
am 8aede04b: Add positional parameters to aid in i18n

14 years agoam 67dfcbf1: am 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power...
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

14 years agoMerge "Fix 2673731: Adding support for password history to the Device Admin Sample...
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."

14 years agoMerge "Add coverage_targets.xml into test image" into kraken
Guang Zhu [Tue, 1 Jun 2010 22:55:21 +0000 (15:55 -0700)]
Merge "Add coverage_targets.xml into test image" into kraken

14 years agoAdd coverage_targets.xml into test image
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

14 years agoRemove obsolete entries from .classpath
Andrew Stadler [Tue, 1 Jun 2010 21:27:29 +0000 (14:27 -0700)]
Remove obsolete entries from .classpath

Change-Id: Ia16cfec1af00e935ea2bd9033b5262fd8fccea56

14 years agoRemove obsolete Eclipse instruction for dev on tools.
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

14 years agoAdd positional parameters to aid in i18n
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

14 years agoFix syntax errors in command lines for update-java-alternatives and curl.
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

14 years agoMerge "Fixing accidentally-stripped formatting on the code style guidelines. Also...
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."

14 years agoFixing accidentally-stripped formatting on the code style guidelines. Also
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

14 years agoam 59b6dce0: am 39d7a745: Merge "Added the instrumentation and power log monkey event...
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.

14 years agoam 39d7a745: Merge "Added the instrumentation and power log monkey events fro the...
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.

14 years agoMerge "Added the instrumentation and power log monkey events fro the new power framew...
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

14 years agoAdd CalendarProvider and ContactsProvider intermediates
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

14 years agoAdded the instrumentation and power log monkey events fro the new power framework.
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

14 years agoam 13cf156b: am 8824549d: am 99cb1d16: Merge "Spelling fix for source download page...
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

14 years agoam 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

14 years agoam 99cb1d16: Merge "Spelling fix for source download page" into froyo
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

14 years agoMerge "Spelling fix for source download page" into froyo
Kenny Root [Wed, 26 May 2010 22:36:27 +0000 (15:36 -0700)]
Merge "Spelling fix for source download page" into froyo

14 years agoFix 2673731: Adding support for password history to the Device Admin Sample App.
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

14 years agoam d9c6e694: (-s ours) am 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo...
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

14 years agoam 6e6c1ebd: (-s ours) am 02ad7fc2: Move the rev of the froyo sdk component to 2...
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

14 years agoam 02ad7fc2: 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

14 years agoMove 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

14 years ago- Improve ScriptRunner command line parsing to actually pass more of the arguments...
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

14 years agoReplaced Deprecated GestureDetector API Call
Christian Mehlmauer [Tue, 25 May 2010 16:34:41 +0000 (18:34 +0200)]
Replaced Deprecated GestureDetector API Call

Change-Id: I36429680b555f834e74ec86c6aa17b696d17d2b6