Commit Graph

4424 Commits

Author SHA1 Message Date
Dianne Hackborn
17eed68774 am 4b81571b: am 2b352d76: Native activity now draws!
Merge commit '4b81571bc9422a4ed0672431bbb3373b075a41d8'

* commit '4b81571bc9422a4ed0672431bbb3373b075a41d8':
  Native activity now draws!
2010-07-01 19:26:54 -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
088f2fc7ac am cddd9de7: am 88510488: Update native_activity sample code to use ANativeWindow.
Merge commit 'cddd9de737d5670b4898b9b7bc12c7e7bb7f63ee'

* commit 'cddd9de737d5670b4898b9b7bc12c7e7bb7f63ee':
  Update native_activity sample code to use ANativeWindow.
2010-07-01 16:02:09 -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
Jason Parks
872ed49154 Change ExpandableList2 example to use async queries.
Change-Id: Ib3f79227808dcbcf6ec8f5f71c53b38932571ed4
2010-07-01 14:51:30 -05:00
Xia Wang
7f5176b8b2 am e2166993: am 24ff9295: Merge "Add connectivity unit tests to test_defs.xml" into gingerbread
Merge commit 'e2166993c986cecaf84ceee72a900e3a41ecc2f0'

* commit 'e2166993c986cecaf84ceee72a900e3a41ecc2f0':
  Add connectivity unit tests to test_defs.xml
2010-06-29 17:33:00 -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
58bbc3d22e am 778ebc04: am 21851dd5: Merge "Update to new native activity APIs." into gingerbread
Merge commit '778ebc0473d01ced3a6372f5c91ceb11cf9e95c2'

* commit '778ebc0473d01ced3a6372f5c91ceb11cf9e95c2':
  Update to new native activity APIs.
2010-06-29 12:21:12 -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
dd84b83674 am ad486987: am 1bd47c04: am e46d0514: Merge "Doc change: Add index page pointing to downloadable user\'s guide source files." into froyo
Merge commit 'ad48698760ee05a7326cfa786eb4204ef02db9d8'

* commit 'ad48698760ee05a7326cfa786eb4204ef02db9d8':
  Doc change: Add index page pointing to downloadable user's guide source files.
2010-06-29 11:27:12 -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
Dianne Hackborn
3c68928dd8 New fragment sample.
This shows more complicated list interaction: using a loader
to populate the list with results from a cursor.  Makes use
of the new built-in empty message and indeterminant progress
features.

Change-Id: I04afb50879995bade286aab0eedfff40f6a5e304
2010-06-28 15:10:37 -07:00
Brian Muramatsu
9058acd470 Update Android CTS Download Link to 2.1_r3
Change-Id: I168ff538cff0072c5b5fb429a3efe7b1b8067d05
2010-06-28 13:36:58 -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
5b836a44c7 am 9bad20b0: merge from froyo-plus-aosp
Merge commit '9bad20b019424a315c3f9a3d2b0e3a711bb43665'

* commit '9bad20b019424a315c3f9a3d2b0e3a711bb43665':
  Moving SDK howto docs from development.git into sdk.git.
2010-06-25 14:20:57 -07:00
The Android Open Source Project
9bad20b019 merge from froyo-plus-aosp
Change-Id: I1c7b0ce913903088729cce23fa0e8f39c9e8c15d
2010-06-25 09:46:08 -07:00
Bill Napier
e9605aa2a0 Merge "Fix to invalid call to manifest.app_info" 2010-06-25 09:41:03 -07:00
Yu Shan Emily Lau
caef9d484f am 7c8c5d91: 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 '7c8c5d911c670df2c58bf1ece73e6bc576360696'

* commit '7c8c5d911c670df2c58bf1ece73e6bc576360696':
  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 17:16:34 -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
Gilles Debunne
55f4a60aa0 New XmlAdapter sample example.
This sample illustrate the use of the news Xml Adapters definition, as well
as the use on the new XmlDocumentProvider class.

Change-Id: Ie9738b5f0a0f00df2af643890a48573bace19311
2010-06-24 09:44:57 -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
b606d1bea2 am 60c91105: am 9e1400cd: Do not compress resources.arsc in android.jar
Merge commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e'

* commit '60c911051081fb2f2e786df7f45ac60b2bffdd2e':
  Do not compress resources.arsc in android.jar
2010-06-23 13:56:38 -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
5aac0e7624 am 109bc311: am e660fef5: am 81b9c9d8: docs: fix doc link bug
Merge commit '109bc31187f2394ce711bde6043a478bf9e7c1ca'

* commit '109bc31187f2394ce711bde6043a478bf9e7c1ca':
  docs: fix doc link bug
2010-06-23 12:41:27 -07:00
Yu Shan Emily Lau
79cd62a759 am 762e331c: am 259651e2: Merge "add test def for calculator" into gingerbread
Merge commit '762e331c2f302c508e5d28f22d0e537790458ef5'

* commit '762e331c2f302c508e5d28f22d0e537790458ef5':
  add test def for calculator
2010-06-23 10:32:38 -07:00
Dianne Hackborn
fa199bb673 am 36249f33: am 5468d768: Update native APIs for events.
Merge commit '36249f33c42222167d1fc3e8124a00d49928dea2'

* commit '36249f33c42222167d1fc3e8124a00d49928dea2':
  Update native APIs for events.
2010-06-23 10:32:10 -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
Andrew Stadler
443af26a84 Cleanup after bouncycastle moved and common went away
Change-Id: I3be20bb4999d33b5e5f69f4eb00c20429a5d36b3
2010-06-22 11:40:31 -07:00
Dianne Hackborn
36249f33c4 am 5468d768: Update native APIs for events.
Merge commit '5468d768716a4a9de1012067d89908ba4893f9c8' into gingerbread-plus-aosp

* commit '5468d768716a4a9de1012067d89908ba4893f9c8':
  Update native APIs for events.
2010-06-22 11:24:15 -07:00
Scott Main
81b9c9d8ea docs: fix doc link bug
bug: 2788457

Change-Id: Ia4ad8cfcee24db2e7cb509952c606508c2fd01c9
2010-06-22 10:38:04 -07:00