OSDN Git Service

android-x86/development.git
14 years agoam 81b9c9d8: 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

14 years agoMerge "add test def for calculator" into gingerbread
Yu Shan Emily Lau [Tue, 22 Jun 2010 18:41:10 +0000 (11:41 -0700)]
Merge "add test def for calculator" into gingerbread

14 years agodocs: fix doc link bug
Scott Main [Tue, 22 Jun 2010 17:37:30 +0000 (10:37 -0700)]
docs: fix doc link bug

bug: 2788457

Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9

14 years agoUpdate native APIs for events.
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

14 years agoadd test def for calculator
Guang Zhu [Mon, 21 Jun 2010 23:55:00 +0000 (16:55 -0700)]
add test def for calculator

Change-Id: I2501f0699f6eb286037ed314c30be4818a25c643

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

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

14 years agoMerge "Workaround for package-private framework tests in runtest." into gingerbread
Brett Chabot [Tue, 15 Jun 2010 17:46:32 +0000 (10:46 -0700)]
Merge "Workaround for package-private framework tests in runtest." into gingerbread

14 years agoWorkaround for package-private framework tests in runtest.
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

14 years agoMerge "Added test definitions for framework UI and Utils libs." into kraken
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

14 years agoAdded test definitions for framework UI and Utils libs.
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

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 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 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 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 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 agoDumb.
Dianne Hackborn [Fri, 4 Jun 2010 21:13:27 +0000 (14:13 -0700)]
Dumb.

Change-Id: I05f17560ace880c628c94d676bd908c611348029

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

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

14 years agoam 3c19d0e0: 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.

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

14 years agoSim fixes.
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

14 years agoMerge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:11:49 +0000 (22:11 -0700)]
Merge "removed unused imports"

14 years agoMerge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:43 +0000 (22:10 -0700)]
Merge "removed unused imports"

14 years agoMerge "removed unused imports"
Romain Guy [Fri, 21 May 2010 05:10:15 +0000 (22:10 -0700)]
Merge "removed unused imports"

14 years agoMerge "Removed unused import"
Romain Guy [Fri, 21 May 2010 05:09:03 +0000 (22:09 -0700)]
Merge "Removed unused import"

14 years agoremoved unused imports
Christian Mehlmauer [Thu, 20 May 2010 19:07:30 +0000 (21:07 +0200)]
removed unused imports

Change-Id: Ic48743a984bae2140e7e8f1b451be0f3760179f0

14 years agoremoved unused imports
Christian Mehlmauer [Thu, 20 May 2010 19:06:37 +0000 (21:06 +0200)]
removed unused imports

Change-Id: I26fd85aa922e73c49ac319ed2b9f9e31603ced7b

14 years agoremoved unused imports
Christian Mehlmauer [Thu, 20 May 2010 19:04:57 +0000 (21:04 +0200)]
removed unused imports

Change-Id: I1411ee3d0229918a6ff3837894d63f775550da27

14 years agoRemoved unused import
Christian Mehlmauer [Thu, 20 May 2010 18:35:14 +0000 (20:35 +0200)]
Removed unused import

Change-Id: I85a1120ff8f9bc7186cdbc07c78d91a8d136fd5a

14 years agoReduced Warnings
Christian Mehlmauer [Thu, 20 May 2010 18:13:51 +0000 (20:13 +0200)]
Reduced Warnings

Change-Id: I3ce0d27d24e8aad3fdbf8c57cefe39d1a3fd99e9

14 years agoMerge "Updated deprecated Contacts API to ContactsContract"
Romain Guy [Thu, 20 May 2010 05:06:53 +0000 (22:06 -0700)]
Merge "Updated deprecated Contacts API to ContactsContract"

14 years agoMerge "Updated Sensor Samples to newest API"
Romain Guy [Thu, 20 May 2010 05:06:32 +0000 (22:06 -0700)]
Merge "Updated Sensor Samples to newest API"

14 years agoUpdated deprecated Contacts API to ContactsContract
Christian Mehlmauer [Wed, 19 May 2010 18:16:43 +0000 (20:16 +0200)]
Updated deprecated Contacts API to ContactsContract

Change-Id: I1d51b5eba579e841d6024eec08670ae8ff595f94

14 years agoUpdated Sensor Samples to newest API
Christian Mehlmauer [Tue, 18 May 2010 21:40:33 +0000 (23:40 +0200)]
Updated Sensor Samples to newest API

Change-Id: I88c0ce08232fed34aa99c97385155220e7d9abff

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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 19 May 2010 15:13:51 +0000 (08:13 -0700)]
merge from open-source master

Change-Id: I4af8f65d1dfff3912f0057645943df78ddefc7ca

14 years agoMerge "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

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

14 years agoCorrected StatusBarNotificationSample
Christian Mehlmauer [Tue, 18 May 2010 21:44:32 +0000 (23:44 +0200)]
Corrected StatusBarNotificationSample

Change-Id: I892e84198cfe288e673b81e8ffc331525fee09b8

14 years agoMerge "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

14 years agoam 253290a7: merge from open-source master
The Android Open Source Project [Tue, 18 May 2010 17:59:19 +0000 (10:59 -0700)]
am 253290a7: merge from open-source master

Merge commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken

* commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
  Removed bad BuildPaths (not existing Directories after checkout)

14 years agomerge from open-source master
The Android Open Source Project [Tue, 18 May 2010 17:56:24 +0000 (10:56 -0700)]
merge from open-source master

Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41

14 years agocode coverage improvement (DO NOT MERGE)
Guang Zhu [Thu, 15 Apr 2010 17:48:26 +0000 (10:48 -0700)]
code coverage improvement (DO NOT MERGE)

* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards

Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e

14 years agoAdd new demo of taking over a window's surface.
Dianne Hackborn [Mon, 10 May 2010 18:30:38 +0000 (11:30 -0700)]
Add new demo of taking over a window's surface.

Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037

14 years agoam c043a97c: merge from open-source master
The Android Open Source Project [Tue, 18 May 2010 16:31:32 +0000 (09:31 -0700)]
am c043a97c: merge from open-source master

Merge commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken

* commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
  Removed Calls to deprecated API
  Removed Duplicate Build Paths

14 years agomerge from open-source master
The Android Open Source Project [Tue, 18 May 2010 16:27:19 +0000 (09:27 -0700)]
merge from open-source master

Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87

14 years agoRemoved bad BuildPaths (not existing Directories after checkout)
Christian Mehlmauer [Tue, 18 May 2010 04:53:36 +0000 (06:53 +0200)]
Removed bad BuildPaths (not existing Directories after checkout)

Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641

14 years agoMerge "Removed Duplicate Build Paths"
Jean-Baptiste Queru [Mon, 17 May 2010 22:02:56 +0000 (15:02 -0700)]
Merge "Removed Duplicate Build Paths"

14 years agoRemoved Calls to deprecated API
Christian Mehlmauer [Mon, 17 May 2010 18:36:01 +0000 (20:36 +0200)]
Removed Calls to deprecated API

Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c

14 years agoRemoved Duplicate Build Paths
Christian Mehlmauer [Sun, 16 May 2010 20:46:34 +0000 (22:46 +0200)]
Removed Duplicate Build Paths

Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea

14 years agoam 99096976: merge from open-source master
The Android Open Source Project [Wed, 12 May 2010 16:36:11 +0000 (09:36 -0700)]
am 99096976: merge from open-source master

Merge commit '99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken

* commit '99096976d0ed8436c0eacdefae0ffb606bd573c5':
  Added missing --pct-syskeys to processOptions in Monkey

14 years agomerge from open-source master
The Android Open Source Project [Wed, 12 May 2010 16:27:49 +0000 (09:27 -0700)]
merge from open-source master

Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349

14 years agoam 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix...
Dirk Dougherty [Tue, 11 May 2010 17:23:32 +0000 (10:23 -0700)]
am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

Merge commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken

* commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

14 years agoam 56c8df1b: sdk change: add index for tictactoe library and app. fix output path...
Dirk Dougherty [Tue, 11 May 2010 17:18:43 +0000 (10:18 -0700)]
am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp

* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

14 years agoAdded missing --pct-syskeys to processOptions in Monkey
Johan Alfven [Tue, 11 May 2010 07:05:28 +0000 (09:05 +0200)]
Added missing --pct-syskeys to processOptions in Monkey

According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.

Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838

14 years agosdk change: add index for tictactoe library and app. fix output path for spinner...
Dirk Dougherty [Sun, 9 May 2010 00:15:10 +0000 (17:15 -0700)]
sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.

Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3

14 years agoam 46ea5655: am 6807387d: change searchable dictionary folder name back to normal...
Scott Main [Mon, 10 May 2010 20:48:59 +0000 (13:48 -0700)]
am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)

Merge commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken

* commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac':
  change searchable dictionary folder name back to normal (exclude "v2", which

14 years agoam e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample...
Scott Main [Mon, 10 May 2010 20:48:57 +0000 (13:48 -0700)]
am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)

Merge commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken

* commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6':
  add version code and name to searchable dictionary sample (make it v2)

14 years agoam 6807387d: change searchable dictionary folder name back to normal (exclude "v2...
Scott Main [Mon, 10 May 2010 20:47:14 +0000 (13:47 -0700)]
am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)

Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp

* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
  change searchable dictionary folder name back to normal (exclude "v2", which

14 years agoam 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Scott Main [Mon, 10 May 2010 20:47:12 +0000 (13:47 -0700)]
am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)

Merge commit '1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp

* commit '1b2c80841221bb69ca0384974fab462156cfc07d':
  add version code and name to searchable dictionary sample (make it v2)

14 years agochange searchable dictionary folder name back to normal (exclude "v2", which
Scott Main [Mon, 10 May 2010 15:04:51 +0000 (08:04 -0700)]
change searchable dictionary folder name back to normal (exclude "v2", which
should instead be used only for HTML titles)

Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65

14 years agoadd version code and name to searchable dictionary sample (make it v2)
Scott Main [Fri, 7 May 2010 22:10:14 +0000 (15:10 -0700)]
add version code and name to searchable dictionary sample (make it v2)

Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb

14 years agoam 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo
Xavier Ducrohet [Mon, 10 May 2010 16:47:30 +0000 (09:47 -0700)]
am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo

Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample

14 years agoam ca2327f1: Merge "Fix target for library sample" into froyo
Xavier Ducrohet [Mon, 10 May 2010 16:43:08 +0000 (09:43 -0700)]
am ca2327f1: Merge "Fix target for library sample" into froyo

Merge commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6' into froyo-plus-aosp

* commit 'ca2327f1d44fcd66c4a9396e4e70471f1075eae6':
  Fix target for library sample

14 years agoMerge "Fix target for library sample" into froyo
Xavier Ducrohet [Fri, 7 May 2010 17:58:32 +0000 (10:58 -0700)]
Merge "Fix target for library sample" into froyo