Commit Graph

4335 Commits

Author SHA1 Message Date
Dianne Hackborn
11a89ea0bd 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
2010-07-08 12:23:58 -07:00
Yu Shan Emily Lau
d1ca4f3a55 am ec87ca5f: am 34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo
Merge commit 'ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab' into gingerbread-plus-aosp

* commit 'ec87ca5f3abb615d75ee68ad977b3a17c3c7d3ab':
  Add the support for the alarmManager and force the device to wake up.
2010-07-08 11:33:29 -07:00
Yu Shan Emily Lau
ec87ca5f3a 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.
2010-07-08 11:31:07 -07:00
Yu Shan Emily Lau
34ca4b646b Merge "Add the support for the alarmManager and force the device to wake up." into froyo 2010-07-08 11:28:33 -07:00
David 'Digit' Turner
d32d869203 am d15a18bd: Merge "Remove C++ headers from the platform directories." into gingerbread
Merge commit 'd15a18bdd2762524d3aff505eea5bd7714b10a6c' into gingerbread-plus-aosp

* commit 'd15a18bdd2762524d3aff505eea5bd7714b10a6c':
  Remove C++ headers from the platform directories.
2010-07-07 14:22:27 -07:00
David 'Digit' Turner
d15a18bdd2 Merge "Remove C++ headers from the platform directories." into gingerbread 2010-07-07 14:19:10 -07:00
David 'Digit' Turner
ac243e049f am 2708f19b: Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread
Merge commit '2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0' into gingerbread-plus-aosp

* commit '2708f19ba33163b1ac0c5ea2758d0c09d97e8cc0':
  Update API level 9 sysroot to allow static C++ destructors to be called on dlclose().
2010-07-07 14:16:52 -07:00
David 'Digit' Turner
2708f19ba3 Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread 2010-07-07 14:14:47 -07:00
David 'Digit' Turner
74ff6746d1 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
2010-07-07 12:57:25 -07:00
Yu Shan Emily Lau
52bbaa3052 Add the support for the alarmManager and force the device to wake up.
Change-Id: Ib4a2f9cb580eadf6771b103399e14f932d50cb1c
2010-07-07 12:13:32 -07:00
Dianne Hackborn
588bd5e5f7 am 02215b36: Update to use new looper API.
Merge commit '02215b36dde381f0b48ba51bfea405f5a6b01e46' into gingerbread-plus-aosp

* commit '02215b36dde381f0b48ba51bfea405f5a6b01e46':
  Update to use new looper API.
2010-07-07 09:04:08 -07:00
Dianne Hackborn
02215b36dd 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
2010-07-02 18:54:33 -07:00
The Android Open Source Project
b9588806a6 merge from open-source master
Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f
2010-07-02 11:43:17 -07:00
Christian Mehlmauer
3eda8fc385 Cleaned up LunarLander sample
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
2010-07-02 16:20:49 +02:00
Dianne Hackborn
7475d2e7fd am 2c5db16b: Merge "Stub code no longer needed." into gingerbread
Merge commit '2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c' into gingerbread-plus-aosp

* commit '2c5db16ba90b0ec5187dc0a02c4ba9e024cd397c':
  Stub code no longer needed.
2010-07-01 19:36:18 -07:00
Dianne Hackborn
2c5db16ba9 Merge "Stub code no longer needed." into gingerbread 2010-07-01 19:34:50 -07:00
Dianne Hackborn
a32bac113f Stub code no longer needed.
Change-Id: I985acdba1dd1c0acf00d88d2851b5f604475bf4c
2010-07-01 19:27:06 -07:00
Dianne Hackborn
4b81571bc9 am 2b352d76: Native activity now draws!
Merge commit '2b352d76d84817725bf530e7e33f3b47ffb15401' into gingerbread-plus-aosp

* commit '2b352d76d84817725bf530e7e33f3b47ffb15401':
  Native activity now draws!
2010-07-01 19:24:58 -07:00
Dianne Hackborn
2b352d76d8 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
2010-07-01 19:20:44 -07:00
Dianne Hackborn
cddd9de737 am 88510488: Update native_activity sample code to use ANativeWindow.
Merge commit '88510488e99d02e3b778ae530bb6e1e6aee3a226' into gingerbread-plus-aosp

* commit '88510488e99d02e3b778ae530bb6e1e6aee3a226':
  Update native_activity sample code to use ANativeWindow.
2010-07-01 16:00:13 -07:00
Dianne Hackborn
88510488e9 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
2010-07-01 13:38:58 -07:00
Xia Wang
e2166993c9 am 24ff9295: Merge "Add connectivity unit tests to test_defs.xml" into gingerbread
Merge commit '24ff92954baf143c31f7f8e260b2202f96f0663a' into gingerbread-plus-aosp

* commit '24ff92954baf143c31f7f8e260b2202f96f0663a':
  Add connectivity unit tests to test_defs.xml
2010-06-29 17:29:49 -07:00
Xia Wang
24ff92954b Merge "Add connectivity unit tests to test_defs.xml" into gingerbread 2010-06-29 17:25:01 -07:00
Xia Wang
991ffd7f9a Add connectivity unit tests to test_defs.xml
Change-Id: I15ecb95f7c534a9761cc8bbd16cd6ec661f7af5b
2010-06-29 14:59:26 -07:00
Dianne Hackborn
778ebc0473 am 21851dd5: Merge "Update to new native activity APIs." into gingerbread
Merge commit '21851dd54f9b70091e441cfb4a1dea661a3f6a0d' into gingerbread-plus-aosp

* commit '21851dd54f9b70091e441cfb4a1dea661a3f6a0d':
  Update to new native activity APIs.
2010-06-29 12:18:54 -07:00
Dianne Hackborn
21851dd54f Merge "Update to new native activity APIs." into gingerbread 2010-06-29 12:17:28 -07:00
Dirk Dougherty
ad48698760 am 1bd47c04: am e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide source files." into froyo
Merge commit '1bd47c04baa9c5b435bc7677eb7663a4fa19e6ac' into gingerbread-plus-aosp

* commit '1bd47c04baa9c5b435bc7677eb7663a4fa19e6ac':
  Doc change: Add index page pointing to downloadable user's guide source files.
2010-06-29 11:24:56 -07:00
Dirk Dougherty
1bd47c04ba 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.
2010-06-29 11:22:16 -07:00
Dirk Dougherty
e46d051439 Merge "Doc change: Add index page pointing to downloadable user's guide source files." into froyo 2010-06-29 11:19:12 -07:00
Dirk Dougherty
d796dd3ae0 Doc change: Add index page pointing to downloadable user's guide source files.
Change-Id: Ia02cb211fc24f1293b66310c80e18d4ad8185173
2010-06-29 10:50:55 -07:00
Dianne Hackborn
bbdfd7c347 Update to new native activity APIs.
Change-Id: Id2a32fd0ed0de39b2f266216d5b3d903156fb761
2010-06-28 23:37:49 -07:00
Chris Peterson
b1e0c9653e update 404'd source.android.com URLs
Change-Id: I088f32ca3a8b8568230e068a78b78dee7d6e4924
2010-06-25 17:32:07 -07:00
David 'Digit' Turner
d155de2400 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
2010-06-25 16:17:58 -07:00
The Android Open Source Project
9bad20b019 merge from froyo-plus-aosp
Change-Id: I1c7b0ce913903088729cce23fa0e8f39c9e8c15d
2010-06-25 09:46:08 -07:00
Christian Mehlmauer
3a3e3ab2df Replaced deprecated Contacts Api with ContactsContract
Change-Id: I4816781c7b48b27ec64a63d51db02646c3d6c1a5
2010-06-25 18:39:40 +02:00
Madan Ankapura
39529c673a Activity/provider used is restricted to the application's Package, but can be spread across other packages as well.
A better way to construct the activity name should be by getting the substring from the fully qualified classname
itself and not using the PackageInfo.
Credit:Ritu Srivastava

Change-Id: I9ff5a27d828d5d3836bb55101cb947f670ea5941
2010-06-24 15:55:55 -07:00
Yu Shan Emily Lau
7c8c5d911c am 3bacdf93: 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 '3bacdf93002237f35530c1e756481db429285a96' into gingerbread-plus-aosp

* commit '3bacdf93002237f35530c1e756481db429285a96':
  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.
2010-06-24 15:43:28 -07:00
Yu Shan Emily Lau
a96f73a683 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 froyo-plus-aosp

* 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.
2010-06-24 15:42:29 -07:00
Yu Shan Emily Lau
3bacdf9300 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.
2010-06-24 15:41:10 -07:00
Yu Shan Emily Lau
1a132581a5 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 2010-06-24 15:30:29 -07:00
Yu Shan Emily Lau
07aeb8c358 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
2010-06-24 14:20:16 -07:00
The Android Open Source Project
52cc9b9911 merge from open-source master
Change-Id: Ie72de601744653bcd7e9fa3debe71d3c8f2fe591
2010-06-24 14:02:21 -07:00
Raphael Moll
d63615fa69 Moving SDK howto docs from development.git into sdk.git.
See Change I7827d3f3cc6b8ba96822170949618dc75d879d28 for
the CL that adds them back in sdk.git

Change-Id: I37a5b27875fc3ed6b52202ab8435888d38644ca5
2010-06-23 16:00:58 -07:00
Kenny Root
60c9110510 am 9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '9e1400cdae7f3732808120db8b83de7b252340ca' into gingerbread-plus-aosp

* commit '9e1400cdae7f3732808120db8b83de7b252340ca':
  Do not compress resources.arsc in android.jar
2010-06-23 13:54:32 -07:00
Kenny Root
9e1400cdae 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
2010-06-23 13:40:41 -07:00
Scott Main
109bc31187 am e660fef5: am 81b9c9d8: docs: fix doc link bug
Merge commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d' into gingerbread-plus-aosp

* commit 'e660fef5523dc8ac3ee57fb4503ca53b922a531d':
  docs: fix doc link bug
2010-06-22 18:43:35 -07:00
Scott Main
e655ff2ce1 am 81b9c9d8: docs: fix doc link bug
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into froyo-plus-aosp

* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
  docs: fix doc link bug
2010-06-22 18:42:23 -07:00
Scott Main
e660fef552 am 81b9c9d8: docs: fix doc link bug
Merge commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590' into gingerbread

* commit '81b9c9d8ea3f6b13f03249b437ab5d51cdcb5590':
  docs: fix doc link bug
2010-06-22 18:41:36 -07:00
Yu Shan Emily Lau
762e331c2f am 259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '259651e2de730b513003cb0c2f966f53b9dffb5e' into gingerbread-plus-aosp

* commit '259651e2de730b513003cb0c2f966f53b9dffb5e':
  add test def for calculator
2010-06-22 11:42:26 -07:00
Yu Shan Emily Lau
259651e2de Merge "add test def for calculator" into gingerbread 2010-06-22 11:41:10 -07:00