OSDN Git Service

android-x86/development.git
14 years agondk: handle --verbose option in tests/run-all.sh script
David 'Digit' Turner [Fri, 16 Jul 2010 21:31:30 +0000 (14:31 -0700)]
ndk: handle --verbose option in tests/run-all.sh script

Change-Id: Ib99020a8b5c76c34bcbf8244426221bb3b6d2663

14 years agoUpdate NDK for pre-key-dispatching changes.
Dianne Hackborn [Fri, 16 Jul 2010 00:48:05 +0000 (17:48 -0700)]
Update NDK for pre-key-dispatching changes.

The same code now calls the appropriate function as part of
its key processing.

Change-Id: Ie6fbcd802b098b85d8113fe0a49473134721009b

14 years agoMerge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread
David 'Digit' Turner [Thu, 15 Jul 2010 23:30:12 +0000 (16:30 -0700)]
Merge "ndk: add tests/run-all.sh to run all automated tests." into gingerbread

14 years agondk: add tests/run-all.sh to run all automated tests.
David 'Digit' Turner [Thu, 15 Jul 2010 23:20:59 +0000 (16:20 -0700)]
ndk: add tests/run-all.sh to run all automated tests.

For now, this only tries to rebuild all samples from scratch

Change-Id: I0d059b72b68d5abcfb462b897813dd60399612ef

14 years agoMerge "NDK access to the Asset Manager" into gingerbread
Christopher Tate [Thu, 15 Jul 2010 22:00:16 +0000 (15:00 -0700)]
Merge "NDK access to the Asset Manager" into gingerbread

14 years agoam f0f2aba8: Merge "update notepad tutorial to change activity title in NoteEdit...
Scott Main [Thu, 15 Jul 2010 18:25:07 +0000 (11:25 -0700)]
am f0f2aba8: Merge "update notepad tutorial to change activity  title in NoteEdit class" into froyo

Merge commit 'f0f2aba8925b7f88af6c3af479c560e4e6b67ee4' into gingerbread

* commit 'f0f2aba8925b7f88af6c3af479c560e4e6b67ee4':
  update notepad tutorial to change activity  title in NoteEdit class

14 years agoMerge "update notepad tutorial to change activity title in NoteEdit class" into...
Scott Main [Thu, 15 Jul 2010 18:22:52 +0000 (11:22 -0700)]
Merge "update notepad tutorial to change activity  title in NoteEdit class" into froyo

14 years agoMerge "The "current" SDK stubs jar should use the full apk that's exported, not the...
Joe Onorato [Thu, 15 Jul 2010 18:08:07 +0000 (11:08 -0700)]
Merge "The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one." into gingerbread

14 years agoThe "current" SDK stubs jar should use the full apk that's exported, not the product...
Joe Onorato [Thu, 15 Jul 2010 02:56:38 +0000 (19:56 -0700)]
The "current" SDK stubs jar should use the full apk that's exported, not the product-specific one.

The SDK is not dependent on configurations, and also this speeds up the post-installclean build.

Change-Id: I1c075ddf1dd2ca44cc0aa37f23e86ccc593cc2a8

14 years agoMerge "Sample code to illustrate how to use the accelerometer" into gingerbread
Mathias Agopian [Wed, 14 Jul 2010 23:31:10 +0000 (16:31 -0700)]
Merge "Sample code to illustrate how to use the accelerometer" into gingerbread

14 years agoRemove prebuilt static library "libthreaded_app.a".
David 'Digit' Turner [Wed, 14 Jul 2010 00:00:24 +0000 (17:00 -0700)]
Remove prebuilt static library "libthreaded_app.a".

Make the "glue library" part of the NDK as an importable module,
this has several benefits:

- no need to distribute a binary here with no easy way to regenerate it

- no need to explicitely list -lthreaded_app in your LOCAL_LDLIBS
  (this is handled automatically by the module import capability)

- allows easier native debugging of what's really happening.

Note that the header is renamed <threaded_native_app.h>

+ Modify the native-activity sample to use and import the new module
+ Start documenting usage in the header file. We probably need something
  better, and will probably put it under development/ndk/docs/ at some
  point.

After this patch, we should be able to get rid of the code under
framework/base/native/{include.glue}

Change-Id: I6e81d70a225a6ca006beabf6e8b42529e8f371b9

14 years agoSample code to illustrate how to use the accelerometer
Mathias Agopian [Sat, 3 Jul 2010 01:12:04 +0000 (18:12 -0700)]
Sample code to illustrate how to use the accelerometer

this is a small particle + physics system that shows how
to integrate accleration data into positions accurately.

Change-Id: I3bbdc433f52d98464269ac8cb996c4cf037ae8d6

14 years agoNDK access to the Asset Manager
Christopher Tate [Tue, 13 Jul 2010 23:27:45 +0000 (16:27 -0700)]
NDK access to the Asset Manager

Change-Id: Ibe380e352af98f953bfc2398b498a6ccb242bcec

14 years agoCopy over updated NDK APIs and follow other API changes.
Dianne Hackborn [Wed, 14 Jul 2010 00:51:26 +0000 (17:51 -0700)]
Copy over updated NDK APIs and follow other API changes.

Change-Id: Ifec95268c9ade21963eea13357ec2f56fd7968c2

14 years agoAdd initial gamepad support.
Jeff Brown [Tue, 13 Jul 2010 23:45:16 +0000 (16:45 -0700)]
Add initial gamepad support.

Change-Id: Ide1922ea36f8b64100b4dba57e718479b8a0bec5

14 years agoMigrate to new keycode constants in keycodes.h.
Jeff Brown [Tue, 13 Jul 2010 23:14:54 +0000 (16:14 -0700)]
Migrate to new keycode constants in keycodes.h.

Change-Id: I775efb0f73b418db5bf65c218949b164f8e65647

14 years agondk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library
David 'Digit' Turner [Tue, 13 Jul 2010 22:50:46 +0000 (15:50 -0700)]
ndk sample hello-neon: use $(call import-module) to access the 'cpufeatures' library

Change-Id: I29397158de0ccdd89dfe4da72a544fad14a8324e

14 years agoUpdate for improved glue.
Dianne Hackborn [Sat, 10 Jul 2010 01:21:45 +0000 (18:21 -0700)]
Update for improved glue.

Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558

14 years agoAdd new native-plasma sample code.
Dianne Hackborn [Fri, 9 Jul 2010 18:48:23 +0000 (11:48 -0700)]
Add new native-plasma sample code.

This shows direct drawing to an ANativeWindow's bits.

Update the NDK API, and fix a bug in the native-activity app where it
would hang while exiting.

Change-Id: I4fa98d083405eb0d1b22b10a73a2ef18d45fdb59

14 years agoFix keycode
Ying Wang [Fri, 9 Jul 2010 22:04:40 +0000 (15:04 -0700)]
Fix keycode

4 new key codes were added since gingerbread.
bug: http://b/issue?id=2830562

Change-Id: I91a55ef6ca9244bc053e25b6dd8d514cb3f106e9

14 years agondk: Add a test to check that prebuilt libraries work as expected.
David 'Digit' Turner [Fri, 9 Jul 2010 16:56:31 +0000 (09:56 -0700)]
ndk: Add a test to check that prebuilt libraries work as expected.

Change-Id: I7c0683ac1ee50bb62cc0f7ac22e839f749ec1cdf

14 years agoMerge "Update native_activity sample to use new glue code." into gingerbread
Dianne Hackborn [Thu, 8 Jul 2010 19:25:41 +0000 (12:25 -0700)]
Merge "Update native_activity sample to use new glue code." into gingerbread

14 years agoUpdate native_activity sample to use new glue code.
Dianne Hackborn [Wed, 7 Jul 2010 21:33:00 +0000 (14:33 -0700)]
Update native_activity sample to use new glue code.

The native_activity sample is now built with the new threaded_app
glue code, removing all of the boiler-plate code from it.  This
adds the glue code (header and .a) to the NDK.

Change-Id: I2a7be473811f22f948dcda3da8034dd0bd62049d

14 years agoam 34ca4b64: Merge "Add the support for the alarmManager and force the device to...
Yu Shan Emily Lau [Thu, 8 Jul 2010 18:31:07 +0000 (11:31 -0700)]
am 34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo

Merge commit '34ca4b646b20cc209b06fec482e6c77dbc92d220' into gingerbread

* commit '34ca4b646b20cc209b06fec482e6c77dbc92d220':
  Add the support for the alarmManager and force the device to wake up.

14 years agoMerge "Add the support for the alarmManager and force the device to wake up." into...
Yu Shan Emily Lau [Thu, 8 Jul 2010 18:28:33 +0000 (11:28 -0700)]
Merge "Add the support for the alarmManager and force the device to wake up." into froyo

14 years agoMerge "Remove C++ headers from the platform directories." into gingerbread
David 'Digit' Turner [Wed, 7 Jul 2010 21:19:10 +0000 (14:19 -0700)]
Merge "Remove C++ headers from the platform directories." into gingerbread

14 years agoMerge "Update API level 9 sysroot to allow static C++ destructors to be called on...
David 'Digit' Turner [Wed, 7 Jul 2010 21:14:47 +0000 (14:14 -0700)]
Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread

14 years agoRemove C++ headers from the platform directories.
David 'Digit' Turner [Wed, 7 Jul 2010 19:53:45 +0000 (12:53 -0700)]
Remove C++ headers from the platform directories.

We now rely instead on the content of $NDK/sources/cxx-stl/system/include
that is automatically used if a module has C++ sources.

Change-Id: I4319d9260fcf9fb31c59c2f21ca64b536725d4f5

14 years agoAdd the support for the alarmManager and force the device to wake up.
Yu Shan Emily Lau [Fri, 2 Jul 2010 01:34:43 +0000 (18:34 -0700)]
Add the support for the alarmManager and force the device to wake up.

Change-Id: Ib4a2f9cb580eadf6771b103399e14f932d50cb1c

14 years agoUpdate to use new looper API.
Dianne Hackborn [Sat, 3 Jul 2010 01:54:33 +0000 (18:54 -0700)]
Update to use new looper API.

Also need to put back the stub Java class for now, as the
build system still seems to require it.

Change-Id: I31917a1fc7c0bf8cd928969125f94d55c59d42f8

14 years agoMerge "Stub code no longer needed." into gingerbread
Dianne Hackborn [Fri, 2 Jul 2010 02:34:50 +0000 (19:34 -0700)]
Merge "Stub code no longer needed." into gingerbread

14 years agoStub code no longer needed.
Dianne Hackborn [Fri, 2 Jul 2010 02:27:06 +0000 (19:27 -0700)]
Stub code no longer needed.

Change-Id: I985acdba1dd1c0acf00d88d2851b5f604475bf4c

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

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

14 years agoMerge "Add connectivity unit tests to test_defs.xml" into gingerbread
Xia Wang [Wed, 30 Jun 2010 00:25:01 +0000 (17:25 -0700)]
Merge "Add connectivity unit tests to test_defs.xml" into gingerbread

14 years agoAdd connectivity unit tests to test_defs.xml
Xia Wang [Tue, 29 Jun 2010 21:59:26 +0000 (14:59 -0700)]
Add connectivity unit tests to test_defs.xml

Change-Id: I15ecb95f7c534a9761cc8bbd16cd6ec661f7af5b

14 years agoMerge "Update to new native activity APIs." into gingerbread
Dianne Hackborn [Tue, 29 Jun 2010 19:17:28 +0000 (12:17 -0700)]
Merge "Update to new native activity APIs." into gingerbread

14 years agoam e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide...
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.

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

14 years agoDoc change: Add index page pointing to downloadable user's guide source files.
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

14 years agoUpdate to new native activity APIs.
Dianne Hackborn [Mon, 28 Jun 2010 22:38:48 +0000 (15:38 -0700)]
Update to new native activity APIs.

Change-Id: Id2a32fd0ed0de39b2f266216d5b3d903156fb761

14 years agoUpdate API level 9 sysroot to allow static C++ destructors to be called on dlclose().
David 'Digit' Turner [Fri, 25 Jun 2010 23:17:58 +0000 (16:17 -0700)]
Update API level 9 sysroot to allow static C++ destructors to be called on dlclose().

This introduces crtbegin_so.o and crtend_so.o and also requires a corresponding
change in the NDK build scripts to use them.

Also add a small test under 'tests/dlclose-destruction' to check that.
Note that this is not a sample (i.e. Android application) per se.

Change-Id: Icf25836363a3ed59310e579ce990aeca868e70e4

14 years agoam 1a132581: Merge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey...
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.

14 years agoMerge "Add the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow...
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

14 years agoAdd the AUTOTEST_TEST_BEGIN_DELAY keyword to the scripted monkey which allow the...
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

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

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 agoupdate notepad tutorial to change activity title in NoteEdit class
Scott Main [Thu, 17 Jun 2010 17:04:10 +0000 (10:04 -0700)]
update notepad tutorial to change activity  title in NoteEdit class

Change-Id: I58e8919dab1b82696d11e5e578419f30b47b0737

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.