Jean-Baptiste Queru
d294027b1f
Merge 2fa7b9ff
...
Change-Id: I59b2fd09648909c721af5ebb951bc2287fe9fc1a
2012-04-18 15:04:52 -07:00
Xavier Ducrohet
2fa7b9ffeb
Merge "Move emulator GLES from development.git to sdk.git"
2012-04-18 12:14:25 -07:00
Fred Chung
b54be1a0a4
am ab543501: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit 'ab543501cf06627feb5b381f766ce55b12623aad':
2012-04-18 09:32:01 -07:00
Jesse Hall
80d4ba7716
Move emulator GLES from development.git to sdk.git
...
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.
Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.
Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
2012-04-18 06:26:17 -07:00
Tsu Chiang Chuang
fd16f3927e
Merge "change the way we fetch the test result file."
2012-04-17 17:04:37 -07:00
Eino-Ville Talvala
046270578b
Merge "Add skeleton implementation of a fake v2 camera device."
2012-04-17 10:44:07 -07:00
Dianne Hackborn
ecd7a90bcc
Merge "Add demo for new custom animation."
2012-04-17 10:38:58 -07:00
Eino-Ville Talvala
0819e42a0b
Add skeleton implementation of a fake v2 camera device.
...
Change-Id: Idd2485064548a6036ea318680065b7429463d9cd
2012-04-17 10:05:17 -07:00
Fred Chung
6567b57b0c
am feb433d3: am 20b69d0c: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit 'feb433d381ecf053276e1d93119b230cce6decbb':
2012-04-17 09:54:25 -07:00
Fred Chung
f52efd48fb
am c6095c4a: am 53bb8173: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit 'c6095c4a9ea40aeca0e84534aa74b90908274957':
Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:52:22 -07:00
Fred Chung
feb433d381
am 20b69d0c: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit '20b69d0cd3138fcaf316c51d79181f04ec2724fe':
2012-04-17 09:50:20 -07:00
Fred Chung
c6095c4a9e
am 53bb8173: am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit '53bb817340725cfc6aff4f27544731997192e25d':
Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:49:29 -07:00
Fred Chung
20b69d0cd3
am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit '16266ff7117a5cf65b9fcc52d72a4ba5f6db09c6':
Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:48:42 -07:00
Fred Chung
53bb817340
am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit '16266ff7117a5cf65b9fcc52d72a4ba5f6db09c6':
Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:47:57 -07:00
Fred Chung
ab543501cf
am 16266ff7: Updated "Making your App Location Aware" class to include information on location provider enable check.
...
* commit '16266ff7117a5cf65b9fcc52d72a4ba5f6db09c6':
Updated "Making your App Location Aware" class to include information on location provider enable check.
2012-04-17 09:47:36 -07:00
Eddy Talvala
3cd661a616
Merge "Revert "Revert "Multi-project commit, other commits weren't ready after all. (Revert)"""
2012-04-17 09:14:00 -07:00
Eddy Talvala
ee16c8342b
Revert "Revert "Multi-project commit, other commits weren't ready after all. (Revert)""
...
This reverts commit a1e84accb5
2012-04-17 09:12:39 -07:00
Eddy Talvala
0ef6f51e59
Merge "Revert "Multi-project commit, other commits weren't ready after all. (Revert)""
2012-04-17 08:57:47 -07:00
Jesse Hall
3732614865
Merge "Move emulator GLES from development.git to sdk.git"
2012-04-17 08:42:26 -07:00
Fred Chung
16266ff711
Updated "Making your App Location Aware" class to include information on location provider enable check.
...
Change-Id: I97e0a6b02bccbfbdc5697953d2d8b63cb6089370
2012-04-16 23:26:40 -07:00
satok
e82c864b90
Merge "Get rid of isSentenceSpellCheckSupported corresponding to I0e931b7248f8c65268b60af599c07"
2012-04-16 22:07:38 -07:00
Dianne Hackborn
d1871405ba
Add demo for new custom animation.
...
Change-Id: I4981f47fe9120f1cfaa7ca793d5fed7f41cb83a4
2012-04-16 18:59:12 -07:00
Jesse Hall
b62e28ddde
Move emulator GLES from development.git to sdk.git
...
The emulator GLES support has two interfaces: a host shared library
interface used by QEMU, and a protocol between the platform and the
host. The host library interface is not versioned; QEMU and the GLES
renderer must match. The protocol on the other hand must be backwards
compatible: a new GLES renderer must support an older platform image.
Thus for branching purposes it makes more sense to put the GLES
renderer in sdk.git, which is branched along with qemu.git for SDK
releases. Platform images will be built against the protocol version
in the platform branch of sdk.git.
Change-Id: Ibe2cf8de13520aa3fcbaf72328a15ece261d7b86
2012-04-16 15:53:33 -07:00
Robert Ly
affcdfd7d8
adding media effects sample to sdk
...
Change-Id: I8fc55e1ac5409c0262bfda930e6db3d34ce6ae08
2012-04-16 10:48:24 -07:00
satok
32d906962a
Get rid of isSentenceSpellCheckSupported corresponding to I0e931b7248f8c65268b60af599c07
...
Bug: 6320351
Change-Id: I6dae866d19bc6a22a3e2dc7631f00a0490477239
2012-04-16 19:50:46 +09:00
Andrew Hsieh
e6c0176071
Fixed compilation error #include <android/*h>
...
Fixed compilation error when header in #include <android/*h> is
included alone.
Fix for rect.h already exists in $ANDROID/frameworks/native/include/android
Change-Id: I7c49e044507581c5ad591f26f99cda6870b411c5
2012-04-16 14:17:41 +08:00
Jeff Brown
31446e98dd
Merge "Use new InputDevice.getVibrator() API."
2012-04-13 17:39:24 -07:00
Jeff Brown
eb1b7a61af
Use new InputDevice.getVibrator() API.
...
Bug: 6334179
Change-Id: I1e592fd1a58a8d0789548346aee1aff6ddb9d684
2012-04-13 17:08:35 -07:00
Jeff Brown
edfcc032c3
Merge "Improve GameControllerInput demo with input device listeners."
2012-04-13 17:02:57 -07:00
Dianne Hackborn
6c5e9eb650
Update API demo to show new clip data types and conversions.
...
Change-Id: I32e2951c53ecedc75d1459666ced9f54b54cf6ba
2012-04-13 16:12:01 -07:00
Jeff Brown
a4920b722d
Improve GameControllerInput demo with input device listeners.
...
Improves the demo to use the new InputManager API for receiving
notifications when input devices are added, removed or changed.
For example, a game could listen for when new joysticks are
connected or disconnected.
Change-Id: I8ac35206d4f00011145d74c78e91d720aec8f21c
2012-04-12 18:57:28 -07:00
Jeff Brown
2af3f3067a
Ensure Monkey uses sane timestamps for key events.
...
Bug: 6323659
Change-Id: Idc14c36026bc8d1b612765e2da73e9b618d94ded
2012-04-11 16:13:34 -07:00
Jeff Brown
ee684ebc76
Merge "Use new InputManager API."
2012-04-10 19:06:14 -07:00
Dianne Hackborn
1b9744a99a
Update to follow API change.
...
Change-Id: I092f2a9fde19648f5d47bde091d15f1bb5deb63b
2012-04-10 16:15:15 -07:00
Jeff Brown
99e94c0d0e
Use new InputManager API.
...
Change-Id: Ic521e4134e0aeb4d85e322b0a4f5bc925458b71f
2012-04-09 15:26:17 -07:00
Tsu Chiang Chuang
800fbe1f38
change the way we fetch the test result file.
...
Change-Id: I5b1863ad0a7db877e50e1d38cff4e23b95faa4b0
2012-04-09 10:55:25 -07:00
Jeff Brown
f8681d4c56
Merge "Update libandroidfw test package."
2012-04-06 16:27:14 -07:00
Jeff Brown
6ec6d98533
Update libandroidfw test package.
...
Change-Id: I88b63ad1465d82f78cf326b474858360fdc26c91
2012-04-06 14:50:23 -07:00
Dianne Hackborn
2d69a2c654
Merge "Fix use of fitsSystemWindows, so padding doesn't conflict."
2012-04-06 11:02:34 -07:00
Dianne Hackborn
f6c3400341
Fix use of fitsSystemWindows, so padding doesn't conflict.
...
Change-Id: Ie13358220f971369c54ac570830c6fbff5d3c221
2012-04-06 10:57:57 -07:00
Andrew Hsieh
c0ca379b4f
am 1d979954: am 5d610bfe: am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
...
* commit '1d97995429744e016d0f8296380c85c1167c51c2':
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
2012-04-06 10:17:54 -07:00
Scott Main
7c4a6dca42
am c7f1356b: am 350b2b40: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit 'c7f1356b564ec04087b67df4e172ad25327e15ec':
2012-04-06 10:17:53 -07:00
Trevor Johns
ec215e8e4e
am 692d4d59: am 406c9c71: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit '692d4d59b9052cff226ed1cf16d8298814c1bce8':
2012-04-06 10:17:52 -07:00
Scott Main
4ceddae3ae
am 57843593: am bb3a7738: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit '5784359346aacc6226389932d4d96d85b217deba':
2012-04-06 10:17:52 -07:00
Scott Main
972f803a83
am 55951c14: am b2d2933c: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit '55951c14fccbbb6c196531c8f9a21e7e88dfc5a2':
2012-04-06 10:17:51 -07:00
Andrew Hsieh
1d97995429
am 5d610bfe: am 46ead86b: Merge "Refresh development/ndk/platforms/android-9/arch-x86/include/machine"
...
* commit '5d610bfe13f59cc886db16df91bef81df6c652af':
Refresh development/ndk/platforms/android-9/arch-x86/include/machine
2012-04-06 10:15:30 -07:00
Scott Main
c7f1356b56
am 350b2b40: am cbece732: Merge "Sample app for Android U class: Displaying Bitmaps Efficiently" into ics-mr1
...
* commit '350b2b401dc860cef6f2ba363b5f027dd018a988':
2012-04-06 10:14:50 -07:00
Trevor Johns
692d4d59b9
am 406c9c71: am a539e4e3: Update activity-lifecycle sample: Use unique package name
...
* commit '406c9c7155b76806f7fd6c7b0d79e31e091081be':
2012-04-06 10:14:43 -07:00
Scott Main
5784359346
am bb3a7738: am dfd2ae22: Merge "uploading sample code for AU class on Activity Lifecycle" into ics-mr1
...
* commit 'bb3a773817872e4be651de680086464ca925c04b':
2012-04-06 10:14:39 -07:00
Scott Main
55951c14fc
am b2d2933c: am 96f6139c: Merge "first draft of sample code for AU basic training class on fragments" into ics-mr1
...
* commit 'b2d2933cfd492f3219dc4cb93f29ec9592429b15':
2012-04-06 10:14:38 -07:00