Commit Graph

4759 Commits

Author SHA1 Message Date
Gilles Debunne
fa640af482 Improved ImageDownloader code.
Integrate comments from the blog article.

Change-Id: If51d27a4ef3eb0df0bc660ea37a85cc39fd18064
2010-07-08 16:25:05 -07:00
Jean-Baptiste Queru
36a38df99c Merge "update 404'd source.android.com URLs" 2010-07-08 16:23:59 -07:00
Dianne Hackborn
6d45237078 am eefb5c2d: Merge "Update native_activity sample to use new glue code." into gingerbread
Merge commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af' into gingerbread-plus-aosp

* commit 'eefb5c2dca087c2b0a0ef90e15db00fb5523d8af':
  Update native_activity sample to use new glue code.
2010-07-08 12:28:33 -07:00
Dianne Hackborn
eefb5c2dca Merge "Update native_activity sample to use new glue code." into gingerbread 2010-07-08 12:25:41 -07:00
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
Dianne Hackborn
fc9a8e6260 Update to use new LoaderManager API.
Change-Id: I76c7e7210979742e4ab2140ee68fcaf2207505e5
2010-07-07 17:30:32 -07:00
David 'Digit' Turner
581f6395f0 am d32d8692: am d15a18bd: Merge "Remove C++ headers from the platform directories." into gingerbread
Merge commit 'd32d86920318f180e0db7b85435f1d5f520bff82'

* commit 'd32d86920318f180e0db7b85435f1d5f520bff82':
  Remove C++ headers from the platform directories.
2010-07-07 14:25:27 -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
a6860dfd98 am ac243e04: am 2708f19b: Merge "Update API level 9 sysroot to allow static C++ destructors to be called on dlclose()." into gingerbread
Merge commit 'ac243e049f13880cbf3daefbdcd3bdbed5296005'

* commit 'ac243e049f13880cbf3daefbdcd3bdbed5296005':
  Update API level 9 sysroot to allow static C++ destructors to be called on dlclose().
2010-07-07 14:18:35 -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
f290e5c6b1 am 588bd5e5: am 02215b36: Update to use new looper API.
Merge commit '588bd5e5f78c6f620a96a1f81931b6cf45219d29'

* commit '588bd5e5f78c6f620a96a1f81931b6cf45219d29':
  Update to use new looper API.
2010-07-07 09:14:10 -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
Bruce Gay
a961b1c069 Merge "Labpretest.sh script is designed to emulate a typical automated test lab session. It puts a device into bootloader mode, reboots into bootloader mode, determines device type, erases user cache, flashes a generic userdata image, updates the boot image, updates the radio image, updates the system image and reboots, sets up for a monkey run and finally runs a random monkey test. It will repeat this based on an optional parameter(-i) or default to 100 times. It will detect if it is in a low battery situation and wait for it to charge again." 2010-07-02 16:55:37 -07:00
Bruce Gay
39229d4a62 Labpretest.sh script is designed to emulate a typical automated
test lab session.  It puts a device into bootloader mode,
reboots into bootloader mode, determines device type, erases
user cache, flashes a generic userdata image, updates the boot
image, updates the radio image, updates the system image and
reboots, sets up for a monkey run and finally runs a random
monkey test. It will repeat this based on an optional
parameter(-i) or default to 100 times. It will detect if it is
in a low battery situation and wait for it to charge
again.

Adding custom flash files for use with nexusone and sholes.
Updating files with review changes

Removing some trailing spaces and fixing a few typos.

Fixed some additional items and changed some of the naming

Fixed a comparison that wasn't correct

removed a default bootpart name, now needs to be added
custom_flash.sh

missing exit added

edited README for typos and wordage.

Change-Id: Ie7dc2139823304ce11b10b6fd65997cf311a2e9c
2010-07-02 16:30:56 -07:00
The Android Open Source Project
c6407b9152 am b9588806: merge from open-source master
Merge commit 'b9588806a6b4fde223afb87575e603a9cb589b65'

* commit 'b9588806a6b4fde223afb87575e603a9cb589b65':
  Cleaned up LunarLander sample
2010-07-02 11:45:36 -07:00
Andrew Stadler
333e3aafe9 Merge "Remove obsolete source path." 2010-07-02 11:44:05 -07:00
Andrew Stadler
7e6f3dadd8 Remove obsolete source path.
The file(s) moved to libcore/luni/src/main/java which was already in the
classpath.

Change-Id: I31a6e743bd3e6fa0c91e230c54034aa6bbab4be1
2010-07-02 11:43:18 -07:00
The Android Open Source Project
b9588806a6 merge from open-source master
Change-Id: I01fc38c3021027fcc3a3cea79b1c6564913caa9f
2010-07-02 11:43:17 -07:00
Brian Muramatsu
6532754012 Merge "Update Android CTS Download Link to 2.1_r3" 2010-07-02 11:28:34 -07:00
Christian Mehlmauer
3eda8fc385 Cleaned up LunarLander sample
Change-Id: If2cc44c8312cebce170d07c34c64ea2ce1e5b7ab
2010-07-02 16:20:49 +02:00
Dianne Hackborn
2c2fcaf3ff am 7475d2e7: am 2c5db16b: Merge "Stub code no longer needed." into gingerbread
Merge commit '7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac'

* commit '7475d2e7fd8ed49cf65d2762a4efda8a4c54cfac':
  Stub code no longer needed.
2010-07-01 19:38:16 -07: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
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