Commit Graph

4424 Commits

Author SHA1 Message Date
Dianne Hackborn
b7879a7755 Update to follow LoaderManager API.
Also renaming the list samples to make it clearer what they are.

Change-Id: I91b209a32ad4dbf82982682884769d1cde8e3bc3
2010-07-09 18:43:38 -07:00
Dianne Hackborn
92de6eb1fa am 807f426a: am 29534f62: Update for improved glue.
Merge commit '807f426accfe5b014d4e516653de0c193da82a1a'

* commit '807f426accfe5b014d4e516653de0c193da82a1a':
  Update for improved glue.
2010-07-09 18:30:19 -07:00
Dianne Hackborn
807f426acc am 29534f62: Update for improved glue.
Merge commit '29534f6275fdc4cba1c732f89f8442b6d887eb50' into gingerbread-plus-aosp

* commit '29534f6275fdc4cba1c732f89f8442b6d887eb50':
  Update for improved glue.
2010-07-09 18:27:47 -07:00
Dianne Hackborn
29534f6275 Update for improved glue.
Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
2010-07-09 18:21:45 -07:00
Dianne Hackborn
8720a9e281 am 3a92d348: am 1aa32188: Add new native-plasma sample code.
Merge commit '3a92d3482964216a9cdab501e2e3deb86f81440a'

* commit '3a92d3482964216a9cdab501e2e3deb86f81440a':
  Add new native-plasma sample code.
2010-07-09 17:05:20 -07:00
Dianne Hackborn
3a92d34829 am 1aa32188: Add new native-plasma sample code.
Merge commit '1aa3218800a9d98c7b62450a3821b99b8b9588e0' into gingerbread-plus-aosp

* commit '1aa3218800a9d98c7b62450a3821b99b8b9588e0':
  Add new native-plasma sample code.
2010-07-09 17:03:10 -07:00
Dianne Hackborn
1aa3218800 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
2010-07-09 16:58:52 -07:00
Ying Wang
b522da92ff am ab8e4871: am 5ce45c93: Fix keycode
Merge commit 'ab8e487188be6d3ce7e14e4893f59ecdea7007fd'

* commit 'ab8e487188be6d3ce7e14e4893f59ecdea7007fd':
  Fix keycode
2010-07-09 15:17:14 -07:00
Ying Wang
ab8e487188 am 5ce45c93: Fix keycode
Merge commit '5ce45c93ad1dc5f3e836be865ca25a043f7f4ced' into gingerbread-plus-aosp

* commit '5ce45c93ad1dc5f3e836be865ca25a043f7f4ced':
  Fix keycode
2010-07-09 15:15:22 -07:00
Ying Wang
5ce45c93ad Fix keycode
4 new key codes were added since gingerbread.
bug: http://b/issue?id=2830562

Change-Id: I91a55ef6ca9244bc053e25b6dd8d514cb3f106e9
2010-07-09 15:07:19 -07:00
The Android Open Source Project
7c05453712 am c5d06301: merge from open-source master
Merge commit 'c5d06301abe18c3fd709b9b37ad64b8d26ad273c'

* commit 'c5d06301abe18c3fd709b9b37ad64b8d26ad273c':
  update 404'd source.android.com URLs
2010-07-09 14:45:18 -07:00
The Android Open Source Project
c5d06301ab merge from open-source master
Change-Id: I8a67eacfb33430d61d738b588955148b2f11994c
2010-07-09 14:42:33 -07:00
David 'Digit' Turner
f7f7c7571c am 9aff3c7d: am f68d6af8: ndk: Add a test to check that prebuilt libraries work as expected.
Merge commit '9aff3c7d58e7ee737033a4da23d5c590e36ed78e'

* commit '9aff3c7d58e7ee737033a4da23d5c590e36ed78e':
  ndk: Add a test to check that prebuilt libraries work as expected.
2010-07-09 10:08:09 -07:00
David 'Digit' Turner
9aff3c7d58 am f68d6af8: ndk: Add a test to check that prebuilt libraries work as expected.
Merge commit 'f68d6af83f8f99714c139d867e8328f558480f28' into gingerbread-plus-aosp

* commit 'f68d6af83f8f99714c139d867e8328f558480f28':
  ndk: Add a test to check that prebuilt libraries work as expected.
2010-07-09 10:06:02 -07:00
David 'Digit' Turner
f68d6af83f ndk: Add a test to check that prebuilt libraries work as expected.
Change-Id: I7c0683ac1ee50bb62cc0f7ac22e839f749ec1cdf
2010-07-09 09:56:31 -07:00
Dianne Hackborn
2159f51690 am 6d452370: am eefb5c2d: Merge "Update native_activity sample to use new glue code." into gingerbread
Merge commit '6d45237078f729f5c7467467406162e723c8ac3c'

* commit '6d45237078f729f5c7467467406162e723c8ac3c':
  Update native_activity sample to use new glue code.
2010-07-08 19:10:21 -07:00
Yu Shan Emily Lau
5f1659a034 am d1ca4f3a: am ec87ca5f: am 34ca4b64: Merge "Add the support for the alarmManager and force the device to wake up." into froyo
Merge commit 'd1ca4f3a55d83298596793cea137f8fcb979bae5'

* commit 'd1ca4f3a55d83298596793cea137f8fcb979bae5':
  Add the support for the alarmManager and force the device to wake up.
2010-07-08 19:09:56 -07:00
Gilles Debunne
a6ed517502 Merge "Improved ImageDownloader code." 2010-07-08 16:29:35 -07:00
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